gentoo resync : 17.05.2018

46 files changed, 507 insertions, 2269 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5311748ee41c..372d9312d959 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index d82734f5450a..704ca456567a 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,5 +1,7 @@
 DIST aria2-1.30.0.tar.xz 1497124 BLAKE2B 99bce103f1bd89b94e202cb7b2d9dc427398e0dec3517b25a3870515433b7be35fe2841b5ace049771181e6ce44acb82f8715c72347e7069acd6b003e33522ac SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38
 DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a
+DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
 EBUILD aria2-1.30.0.ebuild 4270 BLAKE2B a3dd69cd5a6dce0c86e48c3abad321d16223834508778e2a850aa89fdfc2871b8f6b7d21ed15af9fd0572f4875119f23766e8fb4844f8ceb4008e551afcfc975 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a
 EBUILD aria2-1.33.1.ebuild 4277 BLAKE2B 8fe6f7b2df6988e9e89ae3da97d7d6561b28ac0fe4d3891147c04915158acfa806706fbb3152edb21a92ab6b7c6eb1413cdb36b03512ec45e4477e93591fc44d SHA512 5b79fa4264165da13935a75b20edb66edf315e7cb37180e0f02723209190d1c455b950844464557b7d5461d3048559a30835a8d7d067ab37cbf62d4227f221f3
+EBUILD aria2-1.34.0.ebuild 4279 BLAKE2B 9cf69f77d7c677d9e16e4df5cd996b9b890442458942f9233b012570118e45d5bc62f1b912e5f3eac2d803c9d330300d9f0ee95e6920622265ef97a86acbf2b4 SHA512 19294b11d91156db6aaea36fea044b40f76687d1fd25f6b5271a6984f441e0ab463b3e8af7ea6b9e51d000b8247a96f133da6a9e101bfbc616f99f1e88016902
 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
diff --git a/net-misc/aria2/aria2-1.34.0.ebuild b/net-misc/aria2/aria2-1.34.0.ebuild
new file mode 100644
index 000000000000..330ad0add544
--- /dev/null
+++ b/net-misc/aria2/aria2-1.34.0.ebuild
@@ -0,0 +1,152 @@
+# 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() {
+	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/curl/Manifest b/net-misc/curl/Manifest
index a7ee63ce58d0..7b0721c3b668 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,8 +5,10 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
 DIST curl-7.58.0.tar.bz2 2891868 BLAKE2B d13efab3e3e677804c0821257958eb6f4260234e3d939092e7de862a12ab84500aa50073e37610774b3be9e5a2910c3ba703a716296d31f799916c3046dc214b SHA512 853b945fbfe87e8dcf2186d8cc6609681b9ed3727f9f075bb434d5df07dcccc633fdf30795f6d5956e3355a5cf94a3780e4a3603b08cbd0368e44103de27085b
 DIST curl-7.59.0.tar.bz2 2904158 BLAKE2B c44d9985a19cb7b1e273f868181b0017c7b00683c195fd2c6696b9976e3c6a80d8b80490379c2dce653a9b2d698d1be33fce71a0e61844f38c12c44594909c35 SHA512 9b5586f443a3c9fed947debce86861a8dea0fbf59bf8838cfd72a0884f13073630cf9d369b5535a059d122decd738c652705567752517f5cb11148cc16f693fb
+DIST curl-7.60.0.tar.bz2 2938400 BLAKE2B 1c80e63094b6c0e8c63265ed7a62f75aac2ba13cf86ba201d69837f32c6b0011599a33507e65234cf3dccc5aa08ee558ff9c52998c50f0288738ba3992b6bc65 SHA512 c7566bbe7289cd75d34a65b457905d54b5d07543b9fed5a762c889eb09114ad66de62c3edafd1973e87bc8e303a434e77b4e40eea1718801e79ae9256531abe9
 EBUILD curl-7.57.0-r1.ebuild 7103 BLAKE2B eb3b2a5181284c2e63d57d45e20692adf3e07d01e7f171379b8a1b96e8d030415aadca98a8ae475fc356b196987ae49a98baf70176169abf5c401aa3d940860a SHA512 a2aed3c0fd1c3c25eb1c2250d33ccbe8dd00c6e349cea3f1ccdcb054409872d78f8ffc5ce5b88e8da1b10a70ce6c44d08d56010083b0cdbb704e83ac00565a73
 EBUILD curl-7.57.0.ebuild 7050 BLAKE2B ac2b9ef326caec4e07e89ea30f07140856a4ae62177c1ef7fef78a5a968f8095dbbb82e455d0f309ac35dfbbf57720d013fcb411bbaa523964da124bf0e3f140 SHA512 3b496a5d3159150b6ab7b45fe5145b97a64a9f8909f05f09604634aaf5750ed560941c17be249d7cc5c27a0e03ab353fb913795d47f285ccda7c5e3ad48c786a
 EBUILD curl-7.58.0.ebuild 7093 BLAKE2B 98eaa108a6d55f5a969fe0898e31f0a2af4b7fcb15ca993eb3d238d0a73c6a60d010ada1b1c5d6cd21b117832f8bab1e43fd9e3ff2072457144e4f5df254fc3d SHA512 a31269371ccf0948b1413cd256d6ad4df609b89c40c44a54cc1b83282353b45ea314322fc12fba279c27bfc7513a8c5ced8c09df065230ff833c7b13eebc87a5
 EBUILD curl-7.59.0.ebuild 7267 BLAKE2B 4fadca87badfa6435f391f19508a8a8818b47bf755746f9cb9597858923ea2205daa9661cf1af5cfc65e479205c03662524e18e0ef9d1dd2d2187226f5f93117 SHA512 eaf229ab649e47e2743f1d1217309df883d3513e4f3f0b7be9d1e1a5fbc04f9b0491b6be0a43c6202b0cb17dd03a3381185f5d8f9c256576173cf282dd91c411
+EBUILD curl-7.60.0.ebuild 7200 BLAKE2B 5880855f7fe64911101e26049f2c7255c69a5c442d08126c8135031497ff51c4bec27c208929532aff4b13ffb57f988798edea93725d1206ef36bf7c7ab0d98c SHA512 9383e09d01e5f5f87695f45dd3dd0931e48709d725718a176bc574c74028c8f6b89f4b1b508daccfadf37e56a2f620b091db473b9f0128a77a7c6362ba4f4d16
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.60.0.ebuild b/net-misc/curl/curl-7.60.0.ebuild
new file mode 100644
index 000000000000..62c5d32f633e
--- /dev/null
+++ b/net-misc/curl/curl-7.60.0.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:= )
+	ssl? (
+		curl_ssl_axtls? (
+			net-libs/axtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin17 ]] ; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=637252
+		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
+			configure || die
+	fi
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			myconf+=( --with-axtls )
+		elif use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index a390cf53dbba..930ab84aee99 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,6 +2,7 @@ AUX 1.2.1-gstreamer.patch 3675 BLAKE2B 7e9ead69d46288a96e060451ed17e445e0feb2788
 AUX 2.0.0-rc0-libressl.patch 3404 BLAKE2B 0365d3235e939917d4bc53ae4561d2085c4b7a99b8c585eddb8e5dea26a5038ea0a7f09b7ce1571516a4ce9e93b29113f2d35a1ff535a9a40a484352867bcb23 SHA512 b7b1018da4469de6c688e5894b200ec6846090e7e04ccd3e8e38b6f500832e75ffb30eef84845628eb26ed9ca64a4768dfd5c6a2f44d1fd13ad58b60074be21b
 AUX 2.0.0-rc1-CredSSP-protocol-version.patch 1474 BLAKE2B de37ed627f146807b6aa1a61c766d2909fe056ce0da5e5012d1a6503c6c92a5fc5ba03f82edaa4259d16e55bf8556eb7b9758663b672c5eae17b82034a441693 SHA512 c25f07d162817de0666bf9cfa296580c74b19b3326e1a009123dcf133fb67a876d3bcc99c23b09e96e3072f2811bec236f619b9eec0189b31dcb1e51c8ea1102
 AUX 2.0.0-rc1-libressl.patch 1196 BLAKE2B 73d75cb75f2ec3b7e4fe8a4f410f76ec69be4bae256dbed641796000a023c9f9516ec0815d3bdf968fab0fb92a12a8756221afd528280074aa7e96a8b39e8827 SHA512 e1404580a644253ef681a51c187fd8a3e983aa406276bf8420af7b5bdff2a42446e6ebd3c922d08fe0481ad1f7edf1a648d4be6eaa0fb6f2be4af8fd27aad7e0
+AUX 2.0.0-rc2-primitives.patch 1493 BLAKE2B 6799a594c5e88ef92893d490137be0d5414b4f5856b64899b14c97a76d685c8a663211aca51018e77cd3c8ba30e24203dcc895dcdb830f324353a2b8edc43aae SHA512 01a4d68493709352faf62d222b62e0368fca368f2b6e9ffff648af999d419675ab02fad2c8a9a9fb6149abca9bedbe35a35018dbeb82784d993fd09e3df62ab2
 AUX freerdp-Fix-gstreamer-1.0-detection.patch 989 BLAKE2B 97989faf7984ed4b2f5720e45c590fb2f7751b6ebb18b244bf4e328d46856fc954020842aba49af75ac4bc2759f34687d95177ae8d7d7dfdef64a09f024f8315 SHA512 50fb859ce7dfb2af89efe5f40f0cf318da3fd32503b51e133e296420bde16bbc090f0aa10f6df09dce5ff9769e79fcabc1535f89413d962b7b06f6461dfcfb77
 AUX freerdp-armfp.patch 2930 BLAKE2B 33f324a88bcaa0f5340e9becdbc4c50589d8ecbc57c2f74da471b1b472e3b9895b8d26884df2b7d559c1b51b7e1d49450e710587d8b9a529755501af67e3c25f SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48
 AUX freerdp-ffmpeg29.patch 1778 BLAKE2B a34acaa93eb59c01623151989ef8dd97e0aecc394219249d33ab6815b295e105a5d7db4baeca44a4a43f53665919a65466f9423b002e40648b02aaf6c1ea879b SHA512 c58acc5ddab34fe664d38649b7271ad793430cb1c9ad8e6b78f1924a8b70e1b8d76c426fb633cf6dd97fe3277664649fd7254e2e4377330c64234d23f1b26fd1
@@ -12,6 +13,6 @@ DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e
 EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 BLAKE2B fe5e87301c14a9f29b33ca4994abd5deeded6938631ed184139d452b49b98b957f03c57e709a4df6cda2627a773e6cc0bb7699bcba522aba7aa8548b4cafade9 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900
 EBUILD freerdp-2.0.0_rc0.ebuild 2907 BLAKE2B 1c4ff670b1e7db50ca56af231ce54a080095f8fce142bcb96cabf2908ff71ff11159e691a7e21fab5fd7e436f28ad644af6f710958c92a1908b77dfc7deb9407 SHA512 dc9b9e146822c84ed51e2221f10ba500ec51392f21f9d75fa3c10f1408c6f3fc266fdbc5f11bbf5dde566699e0e01ffd7bb0e85c072baa774e2933338fd2e9f2
 EBUILD freerdp-2.0.0_rc1-r1.ebuild 2892 BLAKE2B db7a01064767e64c2a7a70da24f61c41a02f0eb471f0f54092401a8b15865fcea61e9cde7e92e811a38e91ac90442523fc507ebb12a5df49c3fc82d94442fde1 SHA512 20910eaf36b9a4eb38231f96dc30443e760eae0f794d28a98f3187e424500e651f715ff79edb05400fea962a9d99cbc4c2ac32955391ac762e822eec666452fa
-EBUILD freerdp-2.0.0_rc2.ebuild 2615 BLAKE2B 6987e6d5cb42d17359e6403b61bd44417da1e61be7fe4495e6aec26306a75f1d53faad0f89a2ffe632a63c486988c4e8991196dc7ddb28dcf936870e6b289259 SHA512 e5215b3905e2cfc280d9b6f44a026b65df7cafdb9d50611dd857e09c796556eafeebeb1f38c582c6afa9083508ef571887dc8c9668b9d69ceb59cda86169518f
+EBUILD freerdp-2.0.0_rc2-r1.ebuild 2668 BLAKE2B 7e4516cd2143ff3b2145f8114161ee85f7e8b25d74027f859885b6d211aecc075edb55a6deeca34426b3793a1a88dba0793c84ab876055c7874a951f2464d243 SHA512 e89ce798ce46eb2722656d9d1d563f1fe1ef40a690a10f0a6d4024d06ca4c443aa18b42bea79c4a367a517b14cd0c54916c1650f4c8fcfa19e455ab5c05c1ac5
 EBUILD freerdp-9999.ebuild 2615 BLAKE2B 6987e6d5cb42d17359e6403b61bd44417da1e61be7fe4495e6aec26306a75f1d53faad0f89a2ffe632a63c486988c4e8991196dc7ddb28dcf936870e6b289259 SHA512 e5215b3905e2cfc280d9b6f44a026b65df7cafdb9d50611dd857e09c796556eafeebeb1f38c582c6afa9083508ef571887dc8c9668b9d69ceb59cda86169518f
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch b/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
new file mode 100644
index 000000000000..a82dec1ad0fc
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
@@ -0,0 +1,41 @@
+From 9460f4292b130fcca58519a1c52b9aaef3265042 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 16 May 2018 16:15:50 -0400
+Subject: [PATCH] primitives: ensure primitives_get() returns a populated
+ struct
+
+Fixes: https://github.com/FreeRDP/FreeRDP/issues/4658
+---
+ libfreerdp/primitives/primitives.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c
+index fd236df6e7..d25c5b41dc 100644
+--- a/libfreerdp/primitives/primitives.c
++++ b/libfreerdp/primitives/primitives.c
+@@ -28,10 +28,12 @@
+ #include "prim_internal.h"
+ 
+ /* Singleton pointer used throughout the program when requested. */
+-static primitives_t pPrimitives = { 0 };
+ static primitives_t pPrimitivesGeneric = { 0 };
+ static INIT_ONCE generic_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
++#if defined(HAVE_OPTIMIZED_PRIMITIVES)
++static primitives_t pPrimitives = { 0 };
+ static INIT_ONCE primitives_InitOnce = INIT_ONCE_STATIC_INIT;
++#endif
+ 
+ 
+ /* ------------------------------------------------------------------------- */
+@@ -74,8 +76,10 @@ primitives_t* primitives_get(void)
+ 	InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic, NULL, NULL);
+ #if defined(HAVE_OPTIMIZED_PRIMITIVES)
+ 	InitOnceExecuteOnce(&primitives_InitOnce, primitives_init, NULL, NULL);
+-#endif
+ 	return &pPrimitives;
++#else
++	return &pPrimitivesGeneric;
++#endif
+ }
+ 
+ primitives_t* primitives_get_generic(void)
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
index 48abe1a3fc71..c1282f4c1edf 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc2.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="alpha ~amd64 ~arm ~ppc ~ppc64 x86"
 else
 	inherit git-r3
 	SRC_URI=""
@@ -87,6 +87,10 @@ DEPEND="${RDEPEND}
 	) ) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/2.0.0-rc2-primitives.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 84dd40742358..d544b4d39c0c 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,37 +1,10 @@
-AUX 021109-uclibc-no-ether_ntohost.patch 635 BLAKE2B 12960fc767799c2c16bb109b70504078ac6df4dc5834c425f6e22f62ac1ccbbf78cd1d5612b82746ad9ee49f03e06bd03800416fb6422c7037bb4aa2a98cb5e9 SHA512 29ccbbf19bd40e9c929af403227f49586a4cb79d7ef948710b34b0813d116017530ef1bf0082b093b4179edff1daa275906cfb9a565f61dd5bed10f24b66fd38
-AUX iputils-20071127-nonroot-floodping.patch 497 BLAKE2B e38c87fef88fc66393eeaffca0c0d18a3404a7340ac254c5572056d4ce422ed8fba2b4f4332214508f53d6907e85c8955491f731c12f82d225ac6dfea02e9394 SHA512 96ea32977cdb2e3c98341b75214a35e88296600d14bc929f7691951325be8e90e8ff6ccf83fb2419db3c910a8169fb2a4348000fab33679039ec5cf2d07a3ee8
-AUX iputils-20100418-so_mark.patch 597 BLAKE2B 91956f0871f6c067623140c1b078909aeb42accd3f677d33ac73f5e7421e4d50ffe0d8c6576f9dfc12f5a7fdbfff10b72bd1702a490c5652f1b57590a889ac32 SHA512 453ef3f8c53e2c2cef54f19219b892e51a83a6109f73a4f10712aec729509f02e6b830ab7ca85843a70f3d9c9860f084b256290f638741d573a5205ba89fe469
-AUX iputils-20121221-crypto-build.patch 1325 BLAKE2B 1b00e6f9509c724922a154b96259e55f4599ee3c41748c71d9936aa0d0b8552c5a1b5b7c38fbc6d4903f867d23a33843f6ecb022eda2db00162317e2699ba6e7 SHA512 922daa01f00c19f8237515b2d3ab73b87daa957cfc491382def2ce1c098ffed943ad4952c94134f3155570f64353abf5348523ea773ce7eb457578f975cc92d2
-AUX iputils-20121221-makefile.patch 1791 BLAKE2B 60d717538cf4a454375235bab09c6944532237c8ef69eecd6af8d8e349b52887f00e59890d6152c9a60de67298445f3a80952c0d8ca0b53f1a4bd64f02a1cc92 SHA512 5899942b73d4d13e0ff85f22a81e9107b2a04c82cac6b59559a521c5d0bf25007e34b61b2dfdb40c21b221a108f6ba72c1a51fa59359a400ad045c9394c176db
-AUX iputils-20121221-openssl.patch 2378 BLAKE2B 8626ad7cd1545410faa9f84b8e75997ef41a61760d22c3add9a8e2db920003aa5da3288563946de89773c9d0c787e275e6b08647fd03b0d7ad001586010da178 SHA512 05240c00d0a1f9f878a9826d54cbd0128c2ed5ce7cab4685907956156c3cf2131ccd563812b64490bf915a75f52851396966a590027fc4c1886b2d19f421718b
-AUX iputils-20121221-owl-pingsock.diff 6374 BLAKE2B 8d2254485789a927597cc5c3d7d8b0a8f93ea5cc17660c06becdc71c3d65007829f6a32a05128b0b307afdd9a1545bcb03b4cdba985796730f999f345f5e06e3 SHA512 2f2577230d8bc864adc562c4c5bf33cde3bbabfde633406165b2b61df4e13e2dba74c8561f70d88c3932fc49a41a0276533b715ade208c8608348e4d065c8395
-AUX iputils-20121221-parallel-doc.patch 2042 BLAKE2B c71edcc3577b6d88fc52b2e7acf56284c7297915139257d55864a81be939906f809bc29c8f61468294e8a867ee1c0935abf6fff5f606be251c9e6abe333c78c4 SHA512 cc3a0416c1380d4b799412769270f8fa522a8f931706b318f33add4b02b82e76b177ae6c976408405a83a6c84036f918a41cb3008ee17bf39ea30e8d1f5dc46d
-AUX iputils-20121221-printf-size.patch 1671 BLAKE2B 93d1020af0fcb80529b566e6aff54ca3973e2b2446ea20e04fc244941cf68594b348699b47fd43faec853e03c7f27458c6297c80f89324c847b24052a583dbfd SHA512 ff5491ad5a0396bee41fcbfc1384699d396c24da093bd2209dead67f52efcec462dbfb4a43008083742d0139da7bd52e922499b5f7eae028384c74930453dd33
-AUX iputils-20121221-strtod.patch 1133 BLAKE2B 04487540e571b7f5a0aa79751808da52f9e19445b0635a3e3a2ee13f1a1740b4bac21a386e5cb2ef84d7c97e2523893ed943ca1be0e5d3492945caa493a9a24e SHA512 2e4dc1bdc8192c7c028bacb7f82fc13de2529f1dfdba71bbb05f04b468a609b343f8e1798bf991a1326d03a701428256960b2c0b7601bc84b50076b64c5ee946
-AUX iputils-20121221-tftpd-setid.patch 815 BLAKE2B 776accee005ffb700e9de75efbf53fd61837305d0394b541e74fadad24b15e7d99e8c728c5eab40f8f6f2355805c40a7a97c95175bf35082d827d9d6808f6175 SHA512 55f7fe0d7312429dd1ec3a9232a4e6436b1115b1b555d5af52f5ee04fe54fdf782dbb018d0dbae1c2e38913057bfa42261a2e57d90c0063b8259029adfa08123
-AUX iputils-20121221-tftpd-syslog.patch 1075 BLAKE2B 4cabbe92352ca60feee52bcd7182793afb8ff6b428637f541749d37ed2b05612a3b6b7ddb0697ae133a52ca5ced504a1d9e59122e25b7025a6bdc21154797a1a SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188
 AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34
 AUX iputils-99999999-musl.patch 1799 BLAKE2B d178697fd3f3dad9977b15d5a48f3742408f8d3d72fd3883ad512b11a16a719ce56c81ca00281bf754d934192dc3d980998f9947d66974dd3993ba0ed8760be0 SHA512 d3e4cd51591d1c1bb96b58aedd131bbadf6c4f523ce6ec0aebd991d4396fcd516a1aa3af180510efd8484852caf5301cfe4b0936a449b62caffb251d78794c54
-AUX iputils-99999999-openssl.patch 2532 BLAKE2B f2e60a8c6090a59638b463d3f212a1ed0aa4b9dcf639c2ca0c03f5924e13620ac445dea7181a176683492c568027aeb31f80d709e5d8c73ecd6bf47a0871de27 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb
-AUX iputils-99999999-tftpd-syslog.patch 1075 BLAKE2B 4cabbe92352ca60feee52bcd7182793afb8ff6b428637f541749d37ed2b05612a3b6b7ddb0697ae133a52ca5ced504a1d9e59122e25b7025a6bdc21154797a1a SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188
 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-20160308.tar.gz 195348 BLAKE2B d034454921a117307c5092c5b44c250cb90ab96d4b0331cf0c7645523159d3f615746edf6c70faf5b13a2a58761fcb4dbe09043cd486ddc56586a9716f98ca5a SHA512 6b4d6e58ab8f1218f3ab52da695f252bd3e0004ffce755f2378b44fc3b4fbf9beb9beef51ff12f14348a07f6fe8525e64dba7f5d7b70997423d2c98c5ff7dde2
-DIST iputils-20161105.tar.gz 195879 BLAKE2B 3aacbe2a507415d43e524329df269d8a435b529c2e0bdd5387f4711a63ede46968f285dbf78491341013188b3c929e2e717898fed44c5c211fe15946bfe214a4 SHA512 1593077b6eff1e57eb8a32897dd9624a745d0c87db1501a96436b168b109ef22d41ee69406a4a2154d8d72c823c1df723b4c52eeec8d82ba2762fb01dc0d4797
 DIST iputils-20171016_pre.tar.gz 195254 BLAKE2B 1170db29d53dd8285b11d4df7b7da2ea3bd2be3599a3f0df85ca7e64247f2a534d03e43a2b6267ba4b9c0b65fcc58045151833ae2c1035a839ed728a389804af SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99
 DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd7a045063c289c244ba8fb4dc43caf2a8d52032b57ee6d86ee4dffd5351faa3124d4c83a33ca3365866568c2164b374eed9d70ec0 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9
-DIST iputils-s20121221-manpages.tar.bz2 23778 BLAKE2B 6b781f7df17b272bf19ba41a7d9a1449526b60f5f596c2201dcf489caf776b74e6a9de2bfff67fada2e9e0480b49a2dce341ce8e5d13c82d6ffd2a0b65bf2c49 SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c
-DIST iputils-s20121221.tar.bz2 155344 BLAKE2B bef1fc6e0484fa43fe34b3c50e9060b0bb2a76cc4912e306143a5b74ff6c42d4cfd1db890548d8d684540f0aabf949def521e2562d7878a7042095e7b19cfd9c SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4
-DIST iputils-s20151218-manpages.tar.xz 22336 BLAKE2B ea19d5bc399cadc73c137badbe304383be0b0b0794db1b655fe766c87684b760664e986ed513a5717e5cfd4b068b0800ba188f10dca5a75215891754b1208e62 SHA512 964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3
-DIST iputils-s20151218.tar.bz2 157187 BLAKE2B d739fdc696b3592ec49ee98163a31bac364fc6cd9136510c34ecddd789d0ebdd76c92ed740fe6e2f098db086aa2885e9f48b94b8f43badd208ddcb6f9332a5dd SHA512 4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c
-DIST iputils-s20160308-manpages.tar.xz 22684 BLAKE2B 4c9a8278640b55ffce0cbb929b89fe528716905bcb119d949ad4bc41b8fe74c6b6822d2a623e377c71ca0a82ee48d7fadb770e395a9acdbfedd43da0790ff910 SHA512 fe55ee334f1a99c6d93f4d18d97666d307676ced77175b73139f888af8f4f0ddc0f1d0511ab71d234f57909def606bf5c3aede2db28a0f73eb5628b9c8e16cac
-DIST iputils-s20161105-manpages.tar.xz 22660 BLAKE2B ae764e66ebbd3e77a0583b7191532a0d8774fc5713c239f00f35c624868a9d6ea8507175153f1025ffb01d854d96ba3c542006d3966119e4fd021899ec114ad1 SHA512 10cf22e1c2bf4ab90818e2120638d250ccefd65f19545cc9662537a31ab525089309b505759a347f09f1439800e291d7fa22f38bdec5460d41bd40f323412279
-EBUILD iputils-20121221-r1.ebuild 2806 BLAKE2B 81d72aff91bdd3f87e3ba82bf4c40f9c87025ce9ee2cdb74f0ebbfe5d7a60fbab3cd0a32068d543ecb044dc9d7f763ee08cab39a335f1e46d5b64342833a7744 SHA512 2779c0a778c877c9c57a0bf35f79ab5cf042aff5ebe3bcc76170135ccf602f9b44afc6823951fc86938fb1bc112482e4cd4eb7e1bc0151b5a31c599168535856
-EBUILD iputils-20121221-r2.ebuild 4049 BLAKE2B 76dcef37e9373592de19b2dd5d515ed84a07df643ee8dc52abfc9d33776fb72e21bc0309833800e72816cfb2e9a46962db2413ea5f9046e97d105cc951bbb8f3 SHA512 33d09a45872a632f39a70e481220a1b7c1df622b792b49de1db54fc24b69490809ef2674e2d8dff1f4be218ccbef8309358812ca0015a234ae122df7c9fdbb1c
-EBUILD iputils-20151218.ebuild 3981 BLAKE2B 8949deba4c38fa504d6f087dbd1fcbf7e0505d63f0e54ad28253c1dd7e24055ec09ce76e3ca5cb3a53a5f166f663867982d2e78ba164f91043eb852f6a2454be SHA512 08246dcd46c5eb2e9e02eb6fab880717f76f1d28e58a3cde522644a462e9e53250959385d04a7283a13ab5859ae363b5d8ba92afe90ea199af02c152c6984ca9
-EBUILD iputils-20160308.ebuild 3839 BLAKE2B 88fd40a916daa326e2251411b53c549a09e44f5bab8cd9953ab3d0620894297afdb8667173cd8fbcf86d4a52ee63ad96aebafc3d735e50bad0354d4978386be2 SHA512 79a29a57830234493dad8ecd7d9c84e0654ccae11731d1c7119751a5e2f3867fd60c787fee33b333b3b94e6f2bbe03c55852c1abdd13ef9c89a2c96ed3366cd1
-EBUILD iputils-20161105.ebuild 3871 BLAKE2B e6f89efa90125312d980687dda83694906dcdd22f31171ad29452ce706079faa9b383284634064e45ac15483b616cfdf8eeeb4b4b129f53e3f9c32d1c0d3b7f1 SHA512 6b4e5ec940b44759015cb2011330be1898bc3a5228e295958ac4529b28b376b047a065a36c8d52f61f91c3666fda60dd8ab603267e772c64b76c92d024779755
 EBUILD iputils-20171016_pre-r1.ebuild 4045 BLAKE2B 8762cc82fd5c71865106bf2e9763fa5150a8228b292e617654279e517e5a3f4bebc50f312133740d4c54d0ef0a75abac2e42775cd9d865d41b5444e75f56769a SHA512 397bd386cfff8a3551af24ac67677de021e56bf75908e6495e9e4b7eeb6bb2435b7c72101b78523da7e502d1a7fac92d5640d45a1da463986f01ec5230273c95
 EBUILD iputils-20171016_pre.ebuild 4083 BLAKE2B 61875f5e10d286863e236a678f462f4e4231d0e572090c043549143a85a60149cd783f8ec0ca04bd02cd1eea603394a802c56895adbb8633a7d404adee871d47 SHA512 d5e72c510f6e7245288a05f47dd4d7ec5f7b5563fd291ceab7da61dacf308e586f48bca00d93d9e1bd987e4c499784214b60d15f10f1c8bc3a82880a28af65b3
 EBUILD iputils-99999999.ebuild 3861 BLAKE2B 49cda306c5a9d1bc7200b1f1256f3ef867b0b573aa9b0620f98ec77f679e0599883fdff56de559fb06f0510d5d13960bb0bb998bfe0d42b737f08484066cf1e6 SHA512 26607fbcf1fc36f8c44ab10922866d6cc076dba5cb08dc3c0ffb7921dec0e188b7e680f61148616d172a73e27029413834aae431a87c9163e06837fc904a0b83
diff --git a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch b/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
deleted file mode 100644
index e790d2b51038..000000000000
--- a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- iputils/rarpd.c.mps	2004-06-10 15:27:01.000000000 +0200
-+++ iputils/rarpd.c	2004-06-10 15:26:29.000000000 +0200
-@@ -42,7 +42,9 @@ int listen_arp;
- char *ifname;
- char *tftp_dir = "/etc/tftpboot";
- 
-+#ifndef __UCLIBC__
- extern int ether_ntohost(char *name, unsigned char *ea);
-+#endif
- void usage(void) __attribute__((noreturn));
- 
- struct iflink
-@@ -305,7 +307,11 @@ struct rarp_map *rarp_lookup(int ifindex
- 				6,
- 			};
- 
-+#ifndef __UCLIBC__
- 			if (ether_ntohost(ename, lladdr) != 0 ||
-+#else
-+			if (
-+#endif
- 			    (hp = gethostbyname(ename)) == NULL) {
- 				if (verbose)
- 					syslog(LOG_INFO, "not found in /etc/ethers");
diff --git a/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
deleted file mode 100644
index cae87791dc21..000000000000
--- a/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iputils-s20071127/ping_common.h.orig	2008-06-10 11:16:06.000000000 +0100
-+++ iputils-s20071127/ping_common.h	2008-06-10 11:16:18.000000000 +0100
-@@ -28,7 +28,7 @@
- 
- #define	MAXWAIT		10		/* max seconds to wait for response */
- #define MININTERVAL	10		/* Minimal interpacket gap */
--#define MINUSERINTERVAL	200		/* Minimal allowed interval for non-root */
-+#define MINUSERINTERVAL	0		/* Minimal allowed interval for non-root */
- 
- #define SCHINT(a)	(((a) <= MININTERVAL) ? MININTERVAL : (a))
- 
diff --git a/net-misc/iputils/files/iputils-20100418-so_mark.patch b/net-misc/iputils/files/iputils-20100418-so_mark.patch
deleted file mode 100644
index ad92254d6f8d..000000000000
--- a/net-misc/iputils/files/iputils-20100418-so_mark.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/335347
-
-fix building with older linux headers that don't define SO_MARK
-
---- ping_common.c
-+++ ping_common.c
-@@ -485,6 +485,7 @@
- 			fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n");
- 	}
- #endif
-+#ifdef SO_MARK
- 	if (options & F_MARK) {
- 		if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK,
- 				&mark, sizeof(mark)) == -1) {
-@@ -494,6 +495,7 @@
- 			fprintf(stderr, "Warning: Failed to set mark %d\n", mark);
- 		}
- 	}
-+#endif
- 
- 	/* Set some SNDTIMEO to prevent blocking forever
- 	 * on sends, when device is too slow or stalls. Just put limit
diff --git a/net-misc/iputils/files/iputils-20121221-crypto-build.patch b/net-misc/iputils/files/iputils-20121221-crypto-build.patch
deleted file mode 100644
index 1ec3c101d525..000000000000
--- a/net-misc/iputils/files/iputils-20121221-crypto-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001
-From: Arjan van de Ven <arjanvandeven@gmail.com>
-Date: Wed, 16 Jan 2013 03:12:15 +0900
-Subject: [PATCH [iputils]] ping6: Fix build command line argument with gnutls.
-
-The ping6 command can use either openssl or gnutls...
-and the Makefile has a bunch of setup for defining which of the two to use.
-
-Unfortunately, the final -D define on the commandline to enable gnutls
-inside the ping6.c file didn't actually make it onto the gcc
-commandline.
-This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap.
-
-Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com>
-Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index c62d9df..89249f5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP)
- DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
- DEF_ping  = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
- LIB_ping  = $(LIB_CAP) $(LIB_IDN)
--DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
-+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO)
- LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
- 
- ping: ping_common.o
--- 
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-makefile.patch b/net-misc/iputils/files/iputils-20121221-makefile.patch
deleted file mode 100644
index 66424c85cf8e..000000000000
--- a/net-misc/iputils/files/iputils-20121221-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c66609d2c830d6fe06f48f5d38c54eb5cc6f2975 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:36:16 -0500
-Subject: [PATCH [iputils]] fix handling of CFLAGS
-
-This defaults CFLAGS to -O3 without clobbering settings people have set
-up in the environment already.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2c49940..ecabac3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,6 @@
- # Configuration
- #
- 
--# CC
--CC=gcc
- # Path to parent kernel include files directory
- LIBC_INCLUDE=/usr/include
- # Libraries
-@@ -48,11 +46,10 @@ ENABLE_RDISC_SERVER=no
- 
- # -------------------------------------
- # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
--# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
--CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g
--CCOPTOPT=-O3
--GLIBCFIX=-D_GNU_SOURCE
--DEFINES=
-+# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
-+CFLAGS?=-O3 -g
-+CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
-+CPPFLAGS+=-D_GNU_SOURCE
- LDLIB=
- 
- FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2))
-@@ -113,7 +110,6 @@ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
- IPV6_TARGETS=tracepath6 traceroute6 ping6
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
- 
--CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
- LDLIBS=$(LDLIB) $(ADDLIB)
- 
- UNAME_N:=$(shell uname -n)
-@@ -132,6 +128,7 @@ all: $(TARGETS)
- 	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@
- %.o: %.c
- 	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
-+LINK.o += $(CFLAGS)
- $(TARGETS): %: %.o
- 	$(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@
- 
--- 
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-openssl.patch b/net-misc/iputils/files/iputils-20121221-openssl.patch
deleted file mode 100644
index 1c6ba81dab8b..000000000000
--- a/net-misc/iputils/files/iputils-20121221-openssl.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From b57d77dcfa5cb363b7eba5b331324669a8505ac4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:32:39 -0500
-Subject: [PATCH [iputils]] ping6: allow disabling of openssl support
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile |  5 ++++-
- ping6.c  | 14 +++++++++++++-
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 89249f5..2c49940 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
- 
- # GNU TLS library for ping6 [yes|no|static]
- USE_GNUTLS=yes
--# Crypto library for ping6 [shared|static]
-+# Crypto library for ping6 [shared|static|no]
- USE_CRYPTO=shared
- # Resolv library for ping6 [yes|static]
- USE_RESOLV=yes
-@@ -63,7 +63,10 @@ ifneq ($(USE_GNUTLS),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GNUTLS),$(LDFLAG_GNUTLS))
- 	DEF_CRYPTO = -DUSE_GNUTLS
- else
-+ifneq ($(USE_CRYPTO),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
-+	DEF_CRYPTO = -DUSE_OPENSSL
-+endif
- endif
- 
- # USE_RESOLV: LIB_RESOLV
-diff --git a/ping6.c b/ping6.c
-index c39864d..f2f90af 100644
---- a/ping6.c
-+++ b/ping6.c
-@@ -168,8 +168,10 @@ static int icmp_sock;
- 
- #ifdef USE_GNUTLS
- # include <gnutls/openssl.h>
--#else
-+# define USE_CRYPTO
-+#elif defined USE_OPENSSL
- # include <openssl/md5.h>
-+# define USE_CRYPTO
- #endif
- 
- /* Node Information query */
-@@ -326,6 +328,7 @@ static void niquery_init_nonce(void)
- #if !PING6_NONCE_MEMORY
- static int niquery_nonce(__u8 *nonce, int fill)
- {
-+# ifdef USE_CRYPTO
- 	static __u8 digest[MD5_DIGEST_LENGTH];
- 	static int seq = -1;
- 
-@@ -348,6 +351,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
- 			return -1;
- 		return ntohsp((__u16 *)nonce);
- 	}
-+# else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+# endif
- }
- #endif
- 
-@@ -502,6 +509,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
- 
- static int niquery_option_subject_name_handler(int index, const char *arg)
- {
-+#ifdef USE_CRYPTO
- 	static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
- 	unsigned char *dnptrs[2], **dpp, **lastdnptr;
- 	int n;
-@@ -627,6 +635,10 @@ errexit:
- 	free(idn);
- 	free(name);
- 	exit(1);
-+#else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+#endif
- }
- 
- int niquery_option_help_handler(int index, const char *arg)
--- 
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff b/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
deleted file mode 100644
index 283aa989f322..000000000000
--- a/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
+++ /dev/null
@@ -1,224 +0,0 @@
-http://openwall.info/wiki/people/segoon/ping
-
---- iputils-s20101006/ping.c
-+++ iputils-s20101006/ping.c
-@@ -88,6 +88,7 @@ struct sockaddr_in whereto;	/* who to pi
- int optlen = 0;
- int settos = 0;			/* Set TOS, Precendence or other QOS options */
- int icmp_sock;			/* socket file descriptor */
-+int using_ping_socket = 0;
- u_char outpack[0x10000];
- int maxpacket = sizeof(outpack);
- 
-@@ -123,7 +124,11 @@ main(int argc, char **argv)
- 	char *target, hnamebuf[MAX_HOSTNAMELEN];
- 	char rspace[3 + 4 * NROUTES + 1];	/* record route space */
- 
--	icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
-+	icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
-+	if (icmp_sock != -1)
-+		using_ping_socket = 1;
-+	else
-+		icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
- 	socket_errno = errno;
- 
- 	uid = getuid();
-@@ -377,13 +382,35 @@ main(int argc, char **argv)
- 		}
- 	}
- 
--	if ((options&F_STRICTSOURCE) &&
--	    bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
--		perror("bind");
--		exit(2);
-+	if (!using_ping_socket) {
-+		if ((options&F_STRICTSOURCE) &&
-+		    bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
-+			perror("bind");
-+			exit(2);
-+		}
-+	} else {
-+		struct sockaddr_in sa;
-+		socklen_t sl;
-+
-+		sa.sin_family = AF_INET;
-+		sa.sin_port = 0;
-+		sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ?
-+			source.sin_addr.s_addr : 0;
-+		sl = sizeof(sa);
-+
-+		if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) {
-+			perror("bind");
-+			exit(2);
-+		}
-+
-+		if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) {
-+			perror("getsockname");
-+			exit(2);
-+		}
-+		ident = sa.sin_port;
- 	}
- 
--	if (1) {
-+	if (!using_ping_socket) {
- 		struct icmp_filter filt;
- 		filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
- 			      (1<<ICMP_DEST_UNREACH)|
-@@ -398,6 +425,12 @@ main(int argc, char **argv)
- 	hold = 1;
- 	if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold, sizeof(hold)))
- 		fprintf(stderr, "WARNING: your kernel is veeery old. No problems.\n");
-+	if (using_ping_socket) {
-+		if (setsockopt(icmp_sock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
-+			perror("WARNING: setsockopt(IP_RECVTTL)");
-+		if (setsockopt(icmp_sock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
-+			perror("WARNING: setsockopt(IP_RETOPTS)");
-+	}
- 
- 	/* record route option */
- 	if (options & F_RROUTE) {
-@@ -566,6 +599,7 @@ int receive_error_msg()
- 		nerrors++;
- 	} else if (e->ee_origin == SO_EE_ORIGIN_ICMP) {
- 		struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
-+		int error_pkt;
- 
- 		if (res < sizeof(icmph) ||
- 		    target.sin_addr.s_addr != whereto.sin_addr.s_addr ||
-@@ -576,9 +610,18 @@ int receive_error_msg()
- 			goto out;
- 		}
- 
--		acknowledge(ntohs(icmph.un.echo.sequence));
-+		error_pkt = (e->ee_type != ICMP_REDIRECT &&
-+			     e->ee_type != ICMP_SOURCE_QUENCH);
-+		if (error_pkt) {
-+			acknowledge(ntohs(icmph.un.echo.sequence));
-+			net_errors++;
-+			nerrors++;
-+		}
-+		else {
-+			saved_errno = 0;
-+		}
- 
--		if (!working_recverr) {
-+		if (!using_ping_socket && !working_recverr) {
- 			struct icmp_filter filt;
- 			working_recverr = 1;
- 			/* OK, it works. Add stronger filter. */
-@@ -589,15 +632,14 @@ int receive_error_msg()
- 				perror("\rWARNING: setsockopt(ICMP_FILTER)");
- 		}
- 
--		net_errors++;
--		nerrors++;
- 		if (options & F_QUIET)
- 			goto out;
- 		if (options & F_FLOOD) {
--			write_stdout("\bE", 2);
-+			if (error_pkt)
-+				write_stdout("\bE", 2);
- 		} else {
- 			print_timestamp();
--			printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
-+			printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
- 			pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
- 			fflush(stdout);
- 		}
-@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc, 
- 	struct iphdr *ip;
- 	int hlen;
- 	int csfailed;
-+	struct cmsghdr *cmsg;
-+	int ttl;
-+	__u8 *opts;
-+	int optlen;
- 
- 	/* Check the IP header */
- 	ip = (struct iphdr *)buf;
--	hlen = ip->ihl*4;
--	if (cc < hlen + 8 || ip->ihl < 5) {
--		if (options & F_VERBOSE)
--			fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
--				pr_addr(from->sin_addr.s_addr));
--		return 1;
-+	if (!using_ping_socket) {
-+		hlen = ip->ihl*4;
-+		if (cc < hlen + 8 || ip->ihl < 5) {
-+			if (options & F_VERBOSE)
-+				fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
-+					pr_addr(from->sin_addr.s_addr));
-+			return 1;
-+		}
-+		ttl = ip->ttl;
-+		opts = buf + sizeof(struct iphdr);
-+		optlen = hlen - sizeof(struct iphdr);
-+	} else {
-+		hlen = 0;
-+		ttl = 0;
-+		opts = buf;
-+		optlen = 0;
-+		for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-+			if (cmsg->cmsg_level != SOL_IP)
-+				continue;
-+			if (cmsg->cmsg_type == IP_TTL) {
-+				if (cmsg->cmsg_len < sizeof(int))
-+					continue;
-+				ttl = *(int *) CMSG_DATA(cmsg);
-+			} else if (cmsg->cmsg_type == IP_RETOPTS) {
-+				opts = (__u8 *) CMSG_DATA(cmsg);
-+				optlen = cmsg->cmsg_len;
-+			}
-+		}
- 	}
- 
- 	/* Now the ICMP part */
-@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc, 
- 			return 1;			/* 'Twas not our ECHO */
- 		if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
- 				      ntohs(icp->un.echo.sequence),
--				      ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
-+				      ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
- 				      pr_echo_reply))
- 			return 0;
- 	} else {
-@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc, 
- 	}
- 
- 	if (!(options & F_FLOOD)) {
--		pr_options(buf + sizeof(struct iphdr), hlen);
-+		pr_options(opts, optlen + sizeof(struct iphdr));
- 
- 		if (options & F_AUDIBLE)
- 			putchar('\a');
-@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
- 			printf("Redirect, Bad Code: %d", code);
- 			break;
- 		}
--		if (icp)
--			printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway));
-+		printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info));
- 		if (icp && (options & F_VERBOSE))
- 			pr_iph((struct iphdr*)(icp + 1));
- 		break;
-@@ -1217,7 +1284,7 @@ void install_filter(void)
- 		insns
- 	};
- 
--	if (once)
-+	if (once || using_ping_socket)
- 		return;
- 	once = 1;
- 
---- iputils-s20101006/ping_common.c
-+++ iputils-s20101006/ping_common.c
-@@ -515,7 +515,8 @@ void setup(int icmp_sock)
- 			*p++ = i;
- 	}
- 
--	ident = htons(getpid() & 0xFFFF);
-+	if (!ident)
-+		ident = htons(getpid() & 0xFFFF);
- 
- 	set_signal(SIGINT, sigexit);
- 	set_signal(SIGALRM, sigexit);
diff --git a/net-misc/iputils/files/iputils-20121221-parallel-doc.patch b/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
deleted file mode 100644
index 22bfb8811ed3..000000000000
--- a/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4e322b85a12ba3ef5e8118724e3442b2ebb0f6d6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 1 Aug 2012 11:43:34 -0400
-Subject: [PATCH iputils] doc: fix parallel build of html/man pages
-
-The use of the same tempdir prevents building of these files in parallel.
-So build all of them in unique tempdirs so we can do them in parallel.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- doc/Makefile | 37 ++++++++++++++++++++++++-------------
- 1 file changed, 24 insertions(+), 13 deletions(-)
-
-diff --git a/doc/Makefile b/doc/Makefile
-index 7ec4f1c..4f930a3 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -12,29 +12,40 @@ man: $(MANFILES)
- # lots of some strange temporary junk directories and files.
- # So, scope it to a temporary dir and clean all after each run.
- 
--$(HTMLFILES): index.db
--	@-rm -rf tmp.db2html
--	@mkdir tmp.db2html
--	@set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html ..
--	@-rm -rf tmp.db2html
-+SETUP_TMPDIR = \
-+	t="tmp.db2html.$@"; \
-+	rm -rf $$t; \
-+	mkdir $$t; \
-+	cd $$t
-+CLEAN_TMPDIR = \
-+	cd ..; \
-+	rm -rf $$t
-+
-+MAKE_HTML = \
-+	@set -e; \
-+	$(SETUP_TMPDIR); \
-+	docbook2html ../$<; \
-+	mv *.html ..; \
-+	$(CLEAN_TMPDIR)
- 
-+$(HTMLFILES): index.db
-+	$(MAKE_HTML)
- iputils.html: iputils.db
--	@-rm -rf tmp.db2html
--	@mkdir tmp.db2html
--	@set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ ..
--	@-rm -rf tmp.db2html
-+	$(MAKE_HTML)
- 
- # docbook2man produces utterly ugly output and I did not find
- # any way to customize this but hacking backend perl script a little.
- # Well, hence...
- 
- $(MANFILES): index.db
--	@-mkdir tmp.db2man
--	@set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ;	mv $@ ..
--	@-rm -rf tmp.db2man
-+	@set -e; \
-+	$(SETUP_TMPDIR); \
-+	nsgmls ../$< | sgmlspl ../docbook2man-spec.pl; \
-+	mv $@ ..; \
-+	$(CLEAN_TMPDIR)
- 
- clean:
--	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man
-+	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html* tmp.db2man*
- 
- snapshot:
- 	@date "+%y%m%d" > snapshot.db
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-20121221-printf-size.patch b/net-misc/iputils/files/iputils-20121221-printf-size.patch
deleted file mode 100644
index 6d6c3b7d2580..000000000000
--- a/net-misc/iputils/files/iputils-20121221-printf-size.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 23fcb10ae15a96aa9e5a823cfe0b612d9522691c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 14 Aug 2010 01:16:42 -0400
-Subject: [PATCH [iputils]] tracepath: re-use printf return in print_host
-
-Since the printf funcs already return the length of chars displayed,
-use that value instead of re-calculating the length with strlen.
-
-This also fixes the handling of the strlen return -- it's a size_t,
-not an int.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tracepath.c  | 11 ++++-------
- tracepath6.c | 11 ++++-------
- 2 files changed, 8 insertions(+), 14 deletions(-)
-
-diff --git a/tracepath.c b/tracepath.c
-index 8a08f1d..f155816 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -73,13 +73,10 @@ void data_wait(int fd)
- 
- void print_host(const char *a, const char *b, int both)
- {
--	int plen = 0;
--	printf("%s", a);
--	plen = strlen(a);
--	if (both) {
--		printf(" (%s)", b);
--		plen += strlen(b) + 3;
--	}
-+	int plen;
-+	plen = printf("%s", a);
-+	if (both)
-+		plen += printf(" (%s)", b);
- 	if (plen >= HOST_COLUMN_SIZE)
- 		plen = HOST_COLUMN_SIZE - 1;
- 	printf("%*s", HOST_COLUMN_SIZE - plen, "");
-diff --git a/tracepath6.c b/tracepath6.c
-index 126fadf..bee95c3 100644
---- a/tracepath6.c
-+++ b/tracepath6.c
-@@ -86,13 +86,10 @@ void data_wait(int fd)
- 
- void print_host(const char *a, const char *b, int both)
- {
--	int plen = 0;
--	printf("%s", a);
--	plen = strlen(a);
--	if (both) {
--		printf(" (%s)", b);
--		plen += strlen(b) + 3;
--	}
-+	int plen;
-+	plen = printf("%s", a);
-+	if (both)
-+		plen += printf(" (%s)", b);
- 	if (plen >= HOST_COLUMN_SIZE)
- 		plen = HOST_COLUMN_SIZE - 1;
- 	printf("%*s", HOST_COLUMN_SIZE - plen, "");
--- 
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-strtod.patch b/net-misc/iputils/files/iputils-20121221-strtod.patch
deleted file mode 100644
index 303acf5c42c4..000000000000
--- a/net-misc/iputils/files/iputils-20121221-strtod.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/472592
-
-From dd0aa192626f94d08e399fc2a743ee72c50853fb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 24 Apr 2015 20:41:31 -0400
-Subject: [PATCH iputils] ping: fix -i number parsing in locales
-
-Always use #.# format for the -i flag even when the current locale uses
-a different separator.  Locale de_DE which uses #,# normally.
-
-Simple testcase:
-$ make USE_IDN=1
-$ LANG=de_DE.UTF8 ./ping -i 0.5 localhost
-
-Reported-by: Sergey Fionov <fionov@gmail.com>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- ping_common.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/ping_common.c b/ping_common.c
-index 62f53a6..0a37e09 100644
---- a/ping_common.c
-+++ b/ping_common.c
-@@ -269,9 +269,17 @@ void common_options(int ch)
- 		double dbl;
- 		char *ep;
- 
-+#ifdef USE_IDN
-+		setlocale(LC_ALL, "C");
-+#endif
-+
- 		errno = 0;
- 		dbl = strtod(optarg, &ep);
- 
-+#ifdef USE_IDN
-+		setlocale(LC_ALL, "");
-+#endif
-+
- 		if (errno || *ep != '\0' ||
- 		    !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000 - 1.0) {
- 			fprintf(stderr, "ping: bad timing interval\n");
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch b/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch
deleted file mode 100644
index 0ea56685d26d..000000000000
--- a/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d81a44625b04d487c895473aa77af13420b7afdd Mon Sep 17 00:00:00 2001
-From: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
-Date: Thu, 19 Jun 2014 17:25:49 +0900
-Subject: [PATCH iputils] tftpd: Exit if setuid()/setgid() failed.
-
-Signed-off-by: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
----
- tftpd.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/tftpd.c b/tftpd.c
-index 2a39ec4..e3af2f4 100644
---- a/tftpd.c
-+++ b/tftpd.c
-@@ -111,8 +111,14 @@ int main(int ac, char **av)
- 
- 	/* Sanity. If parent forgot to setuid() on us. */
- 	if (geteuid() == 0) {
--		setgid(65534);
--		setuid(65534);
-+		if (setgid(65534)) {
-+			syslog(LOG_ERR, "setgid");
-+			exit(1);
-+		}
-+		if (setuid(65534)) {
-+			syslog(LOG_ERR, "setuid");
-+			exit(1);
-+		}
- 	}
- 
- 	ac--; av++;
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch b/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch
deleted file mode 100644
index ad34f3b5f646..000000000000
--- a/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 19 Apr 2014 10:39:39 -0400
-Subject: [PATCH iputils] tftpd: fix syslog setup
-
-Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking
-the set*id calls, but would call syslog() before it had called openlog().
-Move the call up earlier to fix that.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tftpd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tftpd.c b/tftpd.c
-index e3af2f4..7ddc8eb 100644
---- a/tftpd.c
-+++ b/tftpd.c
-@@ -109,6 +109,8 @@ int main(int ac, char **av)
- 	register int n = 0;
- 	int on = 1;
- 
-+	openlog("tftpd", LOG_PID, LOG_DAEMON);
-+
- 	/* Sanity. If parent forgot to setuid() on us. */
- 	if (geteuid() == 0) {
- 		if (setgid(65534)) {
-@@ -125,7 +127,6 @@ int main(int ac, char **av)
- 	while (ac-- > 0 && n < MAXARG)
- 		dirs[n++] = *av++;
- 
--	openlog("tftpd", LOG_PID, LOG_DAEMON);
- 	if (ioctl(0, FIONBIO, &on) < 0) {
- 		syslog(LOG_ERR, "ioctl(FIONBIO): %m\n");
- 		exit(1);
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-99999999-openssl.patch b/net-misc/iputils/files/iputils-99999999-openssl.patch
deleted file mode 100644
index 13f5639a6fb6..000000000000
--- a/net-misc/iputils/files/iputils-99999999-openssl.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 321d64b9f94653322e678e34ac214ddb73a71db8 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:32:39 -0500
-Subject: [PATCH iputils] ping6: allow disabling of openssl support
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile         |  5 ++++-
- iputils_md5dig.h |  4 +++-
- ping6.c          | 10 ++++++++++
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 54e5a6d..7147f08 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
- 
- # Libgcrypt (for MD5) for ping6 [yes|no|static]
- USE_GCRYPT=yes
--# Crypto library for ping6 [shared|static]
-+# Crypto library for ping6 [shared|static|no]
- USE_CRYPTO=shared
- # Resolv library for ping6 [yes|static]
- USE_RESOLV=yes
-@@ -63,7 +63,10 @@ ifneq ($(USE_GCRYPT),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT))
- 	DEF_CRYPTO = -DUSE_GCRYPT
- else
-+ifneq ($(USE_CRYPTO),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
-+	DEF_CRYPTO = -DUSE_OPENSSL
-+endif
- endif
- 
- # USE_RESOLV: LIB_RESOLV
-diff --git a/iputils_md5dig.h b/iputils_md5dig.h
-index 4cec866..d6c4d46 100644
---- a/iputils_md5dig.h
-+++ b/iputils_md5dig.h
-@@ -5,8 +5,10 @@
- # include <stdlib.h>
- # include <gcrypt.h>
- # define IPUTILS_MD5DIG_LEN	16
--#else
-+# define USE_CRYPTO
-+#elif defined(USE_OPENSSL)
- # include <openssl/md5.h>
-+# define USE_CRYPTO
- #endif
- 
- #ifdef USE_GCRYPT
-diff --git a/ping6.c b/ping6.c
-index 7085f31..7b7c1af 100644
---- a/ping6.c
-+++ b/ping6.c
-@@ -324,6 +324,7 @@ static void niquery_init_nonce(void)
- #if !PING6_NONCE_MEMORY
- static int niquery_nonce(__u8 *nonce, int fill)
- {
-+# ifdef USE_CRYPTO
- 	static __u8 digest[MD5_DIGEST_LENGTH];
- 	static int seq = -1;
- 
-@@ -346,6 +347,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
- 			return -1;
- 		return ntohsp((__u16 *)nonce);
- 	}
-+# else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+# endif
- }
- #endif
- 
-@@ -500,6 +505,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
- 
- static int niquery_option_subject_name_handler(int index, const char *arg)
- {
-+#ifdef USE_CRYPTO
- 	static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
- 	unsigned char *dnptrs[2], **dpp, **lastdnptr;
- 	int n;
-@@ -625,6 +631,10 @@ errexit:
- 	free(idn);
- 	free(name);
- 	exit(1);
-+#else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+#endif
- }
- 
- int niquery_option_help_handler(int index, const char *arg)
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch b/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
deleted file mode 100644
index ad34f3b5f646..000000000000
--- a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 19 Apr 2014 10:39:39 -0400
-Subject: [PATCH iputils] tftpd: fix syslog setup
-
-Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking
-the set*id calls, but would call syslog() before it had called openlog().
-Move the call up earlier to fix that.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tftpd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tftpd.c b/tftpd.c
-index e3af2f4..7ddc8eb 100644
---- a/tftpd.c
-+++ b/tftpd.c
-@@ -109,6 +109,8 @@ int main(int ac, char **av)
- 	register int n = 0;
- 	int on = 1;
- 
-+	openlog("tftpd", LOG_PID, LOG_DAEMON);
-+
- 	/* Sanity. If parent forgot to setuid() on us. */
- 	if (geteuid() == 0) {
- 		if (setgid(65534)) {
-@@ -125,7 +127,6 @@ int main(int ac, char **av)
- 	while (ac-- > 0 && n < MAXARG)
- 		dirs[n++] = *av++;
- 
--	openlog("tftpd", LOG_PID, LOG_DAEMON);
- 	if (ioctl(0, FIONBIO, &on) < 0) {
- 		syslog(LOG_ERR, "ioctl(FIONBIO): %m\n");
- 		exit(1);
--- 
-2.3.5
-
diff --git a/net-misc/iputils/iputils-20121221-r1.ebuild b/net-misc/iputils/iputils-20121221-r1.ebuild
deleted file mode 100644
index 15da76e4a2e0..000000000000
--- a/net-misc/iputils/iputils-20121221-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-
-EAPI="4"
-
-inherit flag-o-matic eutils toolchain-funcs fcaps
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
-	inherit git-2
-else
-	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-		mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? ( ssl? (
-		gnutls? (
-			net-libs/gnutls[openssl(+)]
-			net-libs/gnutls[static-libs(+)]
-		)
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
-	) )"
-RDEPEND="!net-misc/rarpd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-	"
-fi
-
-S=${WORKDIR}/${PN}-s${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-	epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
-	epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch
-	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
-	epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
-	epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
-	epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_IDN=$(usex idn) \
-		USE_GNUTLS=$(usex gnutls) \
-		USE_CRYPTO=$(usex ssl) \
-		$(use ipv6 || echo IPV6_TARGETS=)
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake -j1 html man
-	fi
-}
-
-ipv6() { usex ipv6 "$*" '' ; }
-
-src_install() {
-	into /
-	dobin arping ping $(ipv6 ping6)
-	into /usr
-	dobin clockdiff
-	dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6)
-
-	dodoc INSTALL RELNOTES
-	use ipv6 \
-		&& dosym ping.8 /usr/share/man/man8/ping6.8 \
-		|| rm -f doc/*6.8
-	rm -f doc/{setkey,traceroute6}.8
-	doman doc/*.8
-
-	use doc && dohtml doc/*.html
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/{ar,}ping \
-		$(ipv6 bin/ping6) \
-		usr/bin/clockdiff
-}
diff --git a/net-misc/iputils/iputils-20121221-r2.ebuild b/net-misc/iputils/iputils-20121221-r2.ebuild
deleted file mode 100644
index f81a3dd9c1c2..000000000000
--- a/net-misc/iputils/iputils-20121221-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-
-EAPI="4"
-
-inherit flag-o-matic eutils toolchain-funcs fcaps
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
-	inherit git-2
-else
-	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-		mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gnutls idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? ( ssl? (
-		gnutls? (
-			net-libs/gnutls[openssl(+)]
-			net-libs/gnutls[static-libs(+)]
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl[static-libs(+)] )
-			libressl? ( dev-libs/libressl[static-libs(+)] )
-		)
-	) )"
-RDEPEND="arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
-	traceroute? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-	"
-fi
-
-S=${WORKDIR}/${PN}-s${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-	epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
-	epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch
-	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
-	epatch "${FILESDIR}"/${PN}-20121221-tftpd-setid.patch
-	epatch "${FILESDIR}"/${PN}-20121221-tftpd-syslog.patch
-	epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
-	epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch
-	epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
-	epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
-	epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	IPV4_TARGETS=(
-		ping
-		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
-	)
-	IPV6_TARGETS=(
-		ping6
-		$(usex tracepath 'tracepath6' '')
-		$(usex traceroute 'traceroute6' '')
-	)
-	use ipv6 || IPV6_TARGETS=()
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_IDN=$(usex idn) \
-		USE_GNUTLS=$(usex gnutls) \
-		USE_CRYPTO=$(usex ssl) \
-		IPV4_TARGETS="${IPV4_TARGETS[*]}" \
-		IPV6_TARGETS="${IPV6_TARGETS[*]}"
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake html man
-	fi
-}
-
-src_install() {
-	into /
-	dobin ping $(usex ipv6 'ping6' '')
-	use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8
-	doman doc/ping.8
-
-	if use arping ; then
-		dobin arping
-		doman doc/arping.8
-	fi
-
-	into /usr
-
-	local u
-	for u in clockdiff rarpd rdisc tftpd tracepath ; do
-		if use ${u} ; then
-			case ${u} in
-			clockdiff) dobin ${u};;
-			*) dosbin ${u};;
-			esac
-			doman doc/${u}.8
-		fi
-	done
-
-	if use tracepath && use ipv6 ; then
-		dosbin tracepath6
-		dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8
-	fi
-
-	if use traceroute && use ipv6 ; then
-		dosbin traceroute6
-		doman doc/traceroute6.8
-	fi
-
-	if use rarpd ; then
-		newinitd "${FILESDIR}"/rarpd.init.d rarpd
-		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
-	fi
-
-	dodoc INSTALL RELNOTES
-
-	use doc && dohtml doc/*.html
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex ipv6 'bin/ping6' '') \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20151218.ebuild b/net-misc/iputils/iputils-20151218.ebuild
deleted file mode 100644
index ab556ec060e3..000000000000
--- a/net-misc/iputils/iputils-20151218.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-
-EAPI=5
-
-inherit flag-o-matic eutils toolchain-funcs fcaps
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
-	inherit git-2
-else
-	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? ( ssl? (
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-		!gcrypt? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
-	) )"
-RDEPEND="arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
-	traceroute? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-	"
-fi
-
-S=${WORKDIR}/${PN}-s${PV}
-
-PATCHES=(
-	"${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-	"${FILESDIR}"/${PN}-99999999-openssl.patch #335436
-	"${FILESDIR}"/${PN}-99999999-tftpd-syslog.patch
-	"${FILESDIR}"/${PN}-20121221-makefile.patch
-	"${FILESDIR}"/${PN}-20121221-parallel-doc.patch
-	"${FILESDIR}"/${PN}-20121221-strtod.patch #472592
-)
-
-src_prepare() {
-	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch )
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	IPV4_TARGETS=(
-		ping
-		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
-	)
-	IPV6_TARGETS=(
-		ping6
-		$(usex tracepath 'tracepath6' '')
-		$(usex traceroute 'traceroute6' '')
-	)
-	use ipv6 || IPV6_TARGETS=()
-}
-
-ldflag_resolv() {
-	# See if the system includes a libresolv. #584132
-	echo "main(){}" > "${T}"/resolv.c
-	if ${CC} ${CFLAGS} ${LDFLAGS} "${T}"/resolv.c -lresolv -o "${T}"/resolv 2>/dev/null ; then
-		echo -lresolv
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_IDN=$(usex idn) \
-		USE_GCRYPT=$(usex gcrypt) \
-		USE_CRYPTO=$(usex ssl) \
-		LDFLAG_RESOLV=$(ldflag_resolv) \
-		IPV4_TARGETS="${IPV4_TARGETS[*]}" \
-		IPV6_TARGETS="${IPV6_TARGETS[*]}"
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake html man
-	fi
-}
-
-src_install() {
-	into /
-	dobin ping $(usex ipv6 'ping6' '')
-	use ipv6 && dosym ping.8 /usr/share/man/man8/ping6.8
-	doman doc/ping.8
-
-	if use arping ; then
-		dobin arping
-		doman doc/arping.8
-	fi
-
-	into /usr
-
-	local u
-	for u in clockdiff rarpd rdisc tftpd tracepath ; do
-		if use ${u} ; then
-			case ${u} in
-			clockdiff) dobin ${u};;
-			*) dosbin ${u};;
-			esac
-			doman doc/${u}.8
-		fi
-	done
-
-	if use tracepath && use ipv6 ; then
-		dosbin tracepath6
-		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-	fi
-
-	if use traceroute && use ipv6 ; then
-		dosbin traceroute6
-		doman doc/traceroute6.8
-	fi
-
-	if use rarpd ; then
-		newinitd "${FILESDIR}"/rarpd.init.d rarpd
-		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
-	fi
-
-	dodoc INSTALL RELNOTES
-
-	use doc && dohtml doc/*.html
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex ipv6 'bin/ping6' '') \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20160308.ebuild b/net-misc/iputils/iputils-20160308.ebuild
deleted file mode 100644
index 44e4b8cef396..000000000000
--- a/net-misc/iputils/iputils-20160308.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-# Required packages for doc generation:
-# app-text/docbook-sgml-utils
-
-EAPI=5
-
-inherit flag-o-matic eutils toolchain-funcs fcaps
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? ( ssl? (
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-		nettle? ( dev-libs/nettle[static-libs(+)] )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl[static-libs(+)] )
-		)
-	) )"
-RDEPEND="arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
-	traceroute? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-	"
-fi
-
-REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
-
-S=${WORKDIR}/${PN}-s${PV}
-
-PATCHES=(
-	"${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	TARGETS=(
-		ping
-		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
-	)
-	if use ipv6 ; then
-		TARGETS+=(
-			$(usex tracepath 'tracepath6' '')
-			$(usex traceroute 'traceroute6' '')
-		)
-	fi
-
-	myconf=(
-		USE_CRYPTO=no
-		USE_GCRYPT=no
-		USE_NETTLE=no
-	)
-
-	if use ipv6 && use ssl ; then
-		myconf=(
-			USE_CRYPTO=$(usex openssl)
-			USE_GCRYPT=$(usex gcrypt)
-			USE_NETTLE=$(usex nettle)
-		)
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_IDN=$(usex idn) \
-		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
-		TARGETS="${TARGETS[*]}" \
-		${myconf[@]}
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake html man
-	fi
-}
-
-src_install() {
-	into /
-	dobin ping
-	dosym ping /bin/ping4
-	if use ipv6 ; then
-		dosym ping /bin/ping6
-		dosym ping.8 /usr/share/man/man8/ping6.8
-	fi
-	doman doc/ping.8
-
-	if use arping ; then
-		dobin arping
-		doman doc/arping.8
-	fi
-
-	into /usr
-
-	local u
-	for u in clockdiff rarpd rdisc tftpd tracepath ; do
-		if use ${u} ; then
-			case ${u} in
-			clockdiff) dobin ${u};;
-			*) dosbin ${u};;
-			esac
-			doman doc/${u}.8
-		fi
-	done
-
-	if use tracepath && use ipv6 ; then
-		dosbin tracepath6
-		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-	fi
-
-	if use traceroute && use ipv6 ; then
-		dosbin traceroute6
-		doman doc/traceroute6.8
-	fi
-
-	if use rarpd ; then
-		newinitd "${FILESDIR}"/rarpd.init.d rarpd
-		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
-	fi
-
-	dodoc INSTALL RELNOTES
-
-	use doc && dohtml doc/*.html
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20161105.ebuild b/net-misc/iputils/iputils-20161105.ebuild
deleted file mode 100644
index 729a49fd3eb6..000000000000
--- a/net-misc/iputils/iputils-20161105.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-# Required packages for doc generation:
-# app-text/docbook-sgml-utils
-
-EAPI=5
-
-inherit flag-o-matic eutils toolchain-funcs fcaps
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? ( ssl? (
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-		nettle? ( dev-libs/nettle[static-libs(+)] )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl[static-libs(+)] )
-		)
-	) )"
-RDEPEND="arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
-	traceroute? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-	"
-fi
-
-REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
-
-S="${WORKDIR}/${PN}-s${PV}"
-
-PATCHES=(
-	"${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	TARGETS=(
-		ping
-		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
-	)
-	if use ipv6 ; then
-		TARGETS+=(
-			$(usex tracepath 'tracepath6' '')
-			$(usex traceroute 'traceroute6' '')
-		)
-	fi
-
-	myconf=(
-		USE_CRYPTO=no
-		USE_GCRYPT=no
-		USE_NETTLE=no
-	)
-
-	if use ipv6 && use ssl ; then
-		myconf=(
-			USE_CRYPTO=$(usex openssl)
-			USE_GCRYPT=$(usex gcrypt)
-			USE_NETTLE=$(usex nettle)
-		)
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_IDN=$(usex idn) \
-		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
-		TARGETS="${TARGETS[*]}" \
-		${myconf[@]}
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake html man
-	fi
-}
-
-src_install() {
-	into /
-	dobin ping
-	dosym ping /bin/ping4
-	if use ipv6 ; then
-		dosym ping /bin/ping6
-		dosym ping.8 /usr/share/man/man8/ping6.8
-	fi
-	doman doc/ping.8
-
-	if use arping ; then
-		dobin arping
-		doman doc/arping.8
-	fi
-
-	into /usr
-
-	local u
-	for u in clockdiff rarpd rdisc tftpd tracepath ; do
-		if use ${u} ; then
-			case ${u} in
-			clockdiff) dobin ${u};;
-			*) dosbin ${u};;
-			esac
-			doman doc/${u}.8
-		fi
-	done
-
-	if use tracepath && use ipv6 ; then
-		dosbin tracepath6
-		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-	fi
-
-	if use traceroute && use ipv6 ; then
-		dosbin traceroute6
-		doman doc/traceroute6.8
-	fi
-
-	if use rarpd ; then
-		newinitd "${FILESDIR}"/rarpd.init.d rarpd
-		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
-	fi
-
-	dodoc INSTALL.md RELNOTES
-
-	if use doc ; then
-		docinto html
-		dodoc doc/*.html
-	fi
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 35f547ceac54..604b343efcf9 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -13,5 +13,5 @@ AUX systemd/ripngd.service 364 BLAKE2B e79e086c0bbe3ceb12fadc711a1c88a3403478080
 AUX systemd/zebra.service 354 BLAKE2B e22f8e321c5116179937e9c681482e779436092a10548ea4e564a0005f102a8d6dbba17fe5ef2a3952752f1ca6b1539841ccfee25b4a7b03b9e9faca1618004b SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a
 DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8
 DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd
-EBUILD quagga-1.2.4.ebuild 3674 BLAKE2B eab26230d2d2618cb6ab4299f8a1835f1d5725376ead5e1ba9b1c93ad0ad048e7be75bde6b92d0f444648c8d10fcc360559996f47b74386c36b8dcfd9a610dfb SHA512 bd25a5a2aa7db9b7d2548bbcc7dbcee2674ad97c0c993528fcb3fe933665b12997ab05e86d6907ccc1c72c2888f5681e81ec8ff9ff2d366cea6dc22bf167da01
+EBUILD quagga-1.2.4.ebuild 3679 BLAKE2B cca0279f07bd1ba907cafc5e0f99cd59ae122f832579874f16768dd7b32de490b6673123a4bb42e007037229601cfdd796f2b88d7ccda072fbd9b39111a6e577 SHA512 3abb62c91f195d7a96c063dbfe6ca204c3f908259ab52287a2d790937b33902c439d7e865238dd2fd9397924af4debdd5a86a6b9c4a75710d26bf4cb64962b94
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.2.4.ebuild b/net-misc/quagga/quagga-1.2.4.ebuild
index 3a3e8df26952..bac79f4ac542 100644
--- a/net-misc/quagga/quagga-1.2.4.ebuild
+++ b/net-misc/quagga/quagga-1.2.4.ebuild
@@ -8,7 +8,7 @@ CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
 inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles user
 
 DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
-HOMEPAGE="http://quagga.net/"
+HOMEPAGE="https://www.quagga.net/"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
 
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 0b1fac288684..a20b30489cf8 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -6,6 +6,6 @@ DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11
 DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-EBUILD tigervnc-1.8.0-r3.ebuild 4315 BLAKE2B 56b674782a875e1f4af3981c23f109fcfb7cffbccdc0a59715c3ec61d54087baf7c5adbc72f7e134293087f3126b14673fc49e9c4ca174d38e1cc56a9eee7454 SHA512 949fd2971d88585979c470d7e5114c1b1ff282896f8a5a8087e8d128edc3ec0f221799d64a8690bd45648f89894be1b85ad3e4fb9d9d83ec952f889043c82df7
+EBUILD tigervnc-1.8.0-r3.ebuild 4313 BLAKE2B b5cf3b801f35420d061734f14d929d2a5c359a18a76433ed5c27a7ba3361e5d17e4ec0b3b4c1ab5f4ec772d8163ef079250a3437465584c09e3967b0dbff559a SHA512 70c4d0033990a649c85ccfe9e5925a0cc2ee088a372319415cf12b76de6aa0eedd8ee328df69ce14a8fde7551dd5cf017a19824d08c2ce305ae835f8b63659a3
 EBUILD tigervnc-1.8.0.ebuild 4541 BLAKE2B 69e2048ec440910bf941f0d60826243d1ee3c156d614c2abb1a0bb32b62887119fad4d02e6babd0888f339864bf1ca054cb93f4f5bd034ce958e752b48eb770d SHA512 24fc22d60a36d37c5c62df2cf2e20f0852c4797285baf4ab50d5a97395ee7129cfde1758fe280101f3664320e14aceb7548d4265cefbb48351ac3cd0526a8d45
 MISC metadata.xml 725 BLAKE2B 9ea0092828f41c3ef3617f10918436795dd5af0397288f0b0c20debc5aded651c5fa6d2afc5c7b011b5480ea820d42c567cd6b22c822dd16895ce9445310981d SHA512 65f32dbbc20c53f154f87a01bf88bc0e73493921ff73c2b3b482e1c9fc7a3159cf6a94d1d7cb830bb60fd8da2b8ef77cbdd2a3cad329634ea82dd4f288f69deb
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
index aa056d82d424..cd43aa942965 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
 IUSE="+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3"
 
 CDEPEND="virtual/jpeg:0
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index ff14fc150340..723b0136f9ae 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,12 +1,3 @@
-AUX wget-1.19.1-CRLF_injection.patch 1051 BLAKE2B 8dccc89083422bc8646e5a12efa8ff9d37d38334505241acd258d85f1d0f9df448f6bbff36888a389b1d79a8bd3c8d3b311f61c086c75e74b8937ae31c54763e SHA512 fd36c9225c567e9958f030449f40cb747c0a23b7023fd4eee4e982c867d96be1562377a2d9b80150d9dc714bdbdc2bd509a8a244c4969c731002bdf6434d9cf8
-AUX wget-1.19.1-CVE-2017-13089.patch 1093 BLAKE2B a268a832b13ba6e08c8cf7889e49983cd2328c578ba28ae18c14850a44cb8aa18877766403dbcea711cc2e4ed0aec09f42cb47ec6eade6206eab7033248b27d5 SHA512 c3f44138aa105fa6572b3083671a95f4c819a65667d3d0ba1489a043390a184c5b442f5c134ab868360b01c6662b4bfb52588242273af5012d76099cb5511c77
-AUX wget-1.19.1-CVE-2017-13090.patch 1167 BLAKE2B 384c34c1999d564cf769998eaaef7aff9939e13144ce1848753a41dedbf267d50276925b888cf98f4e60f869f4bd6d4fe16dd5a6380bcb212ec828e845e895a4 SHA512 b9aa7972ff6523bf32810d3fca46ba1bb0c65b0075945c61d8009f39dc87202432ae1e0b9e4a861652001203ec8935078f0db171eda518cc01b72863c8c5ac36
-AUX wget-1.19.1-fix-Perl-warnings-in-tests.patch 3666 BLAKE2B ac176a5172f000ab32f62bfb8b6ff9c661b23b4d7525aaa37cf4018a7c1d9fe6b25359d1e46e9d83774a9b27dbf398f4040b9bf0fe0bb89438006a88158541bd SHA512 9f1b7ffded3422c995a51e346e3957024f4b5435cf51d491f3d4816620376539bffe2d3a7d7dcd03ca99828f06a21ebaa846b3a1755cd020a29f166c0fa2f7d9
-AUX wget-1.19.1-fix-Python-test-suite.patch 8721 BLAKE2B 7109cd205ae2ef07da8954093f8a3b7583944ba1dc965529b702e4db7c11df6c7d0765b8e22e231432f38d04f1d4c6a9b7521b65c050cabf0cff71f44130527d SHA512 e7905dc70c59e9c6b2fcc6c1a058fe98e8681492f034f2cd00aac5f1674d7dca0520bcf30d8b2563983bcb4388c6e35f66e772f833a364810f523784f8de3b19
-DIST wget-1.19.1.tar.xz 2111756 BLAKE2B e5dcaa791f78bb2d7de19a6f689430cd692e1232b7392102936e5f3b4e3592861bcfc78e27df0c4b02a9002ce4c755e765a0a51749670464789fc9f07f8787f7 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5
-DIST wget-1.19.4.tar.gz 4310657 BLAKE2B 3f2e5a32e897101761d449f079bf9df38e60b68284230553b03280a6262e60b3d0b5af3bd9fdd334d09cac5ed3417c3a7e8736b1710f3a7402a123b4633b95e4 SHA512 e84b0c40235b160ade69e18f2f139c782eb2387edc97a847c11dbb906c0273daf6d0ef5afe20360ba965c7da8b5e109f5a45e39ea93d20ec945575203235943a
 DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
-EBUILD wget-1.19.1-r2.ebuild 3365 BLAKE2B b0fb802be67226322409b35fa6c99814e2747ae85fbfdd95344a49b1aacd8b8c0208848b24cffdd663d4bf0475b41474aa151d4f4bffd3caf1d937cd3e8d144a SHA512 ae46574e6e5bf12161278346fc32eb93c7dd4fc2e776ddebaed9bd857639d9a3c234a818000ba6361a82262d5ee3b05c390efeebd4ec1bf2b7a219e06449ff26
-EBUILD wget-1.19.4.ebuild 3187 BLAKE2B fdd1edc8d6721bfadedd62c3afe979dc111e8950242dd77aa314aa207f012452d6dde1cb9dca2d8366b6a58d3184657034deaf4faf1367127bf638d31753712d SHA512 12ea494dabd74b3f2532952fe07cc6c00753f0ea91b1606c9d4e6b96a7f6595da60be2bb4f8f8e227af4129c736fb72c62fedcbecb56a8ee0c3cc9c1c6a25a32
-EBUILD wget-1.19.5.ebuild 3180 BLAKE2B 40b3ff5dee106891c8261447cdb5e64d058c8e3b15f94a9c18b610d64de0700b055df9d3d1eaaf6e2c59ac2b432eb2d6bb304778615ab95fe3ce87cf1f0f1094 SHA512 a7764a29d02792cafc3fea1084a33f1d242da015705a5d6a2cebc2a1956f5b3adf0f2cc9fdfc7da834685848ee327982becf359686b1619372a94867432c435d
+EBUILD wget-1.19.5.ebuild 3174 BLAKE2B a17a950d485a5e0e7ab4467687f6a11b149ef746006eca83902c682e9babf62c66d7c21213108d8c74617be78ae87aab0d2521d4a3d9de62017b415066847e82 SHA512 e35deb63e5d9f9d176e4b7ae3125b8b1e9db63a9fb1bacb3bc01f485d9b6aa559f948ac8ace85ec816dc180fb328a69fd45a0c6ac79051ea6245b4692247d6db
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch b/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch
deleted file mode 100644
index aa4e978cfda9..000000000000
--- a/net-misc/wget/files/wget-1.19.1-CRLF_injection.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Mon, 6 Mar 2017 10:04:22 +0100
-Subject: Fix CRLF injection in Wget host part
-
-* src/url.c (url_parse): Reject control characters in host part of URL
-
-Reported-by: Orange Tsai
----
- src/url.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/url.c b/src/url.c
-index 8f8ff0b..7d36b27 100644
---- a/src/url.c
-+++ b/src/url.c
-@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode)
-       url_unescape (u->host);
-       host_modified = true;
- 
-+      /* check for invalid control characters in host name */
-+      for (p = u->host; *p; p++)
-+        {
-+          if (c_iscntrl(*p))
-+            {
-+              url_free(u);
-+              error_code = PE_INVALID_HOST_NAME;
-+              goto error;
-+            }
-+        }
-+
-       /* Apply IDNA regardless of iri->utf8_encode status */
-       if (opt.enable_iri && iri)
-         {
--- 
-cgit v1.0-41-gc330
-
diff --git a/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch b/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch
deleted file mode 100644
index f961741aa288..000000000000
--- a/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3dbc2e06ad487862c2fcc64d4891ff8aeb254bad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Fri, 20 Oct 2017 10:59:38 +0200
-Subject: [PATCH 1/2] Fix stack overflow in HTTP protocol handling
- (CVE-2017-13089)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* src/http.c (skip_short_body): Return error on negative chunk size
-
-Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint
-Reported-by: Juhani Eronen from Finnish National Cyber Security Centre
----
- src/http.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/http.c b/src/http.c
-index 55367688..dc318231 100644
---- a/src/http.c
-+++ b/src/http.c
-@@ -973,6 +973,9 @@ skip_short_body (int fd, wgint contlen, bool chunked)
-               remaining_chunk_size = strtol (line, &endl, 16);
-               xfree (line);
- 
-+              if (remaining_chunk_size < 0)
-+                return false;
-+
-               if (remaining_chunk_size == 0)
-                 {
-                   line = fd_read_line (fd);
--- 
-2.15.0.rc1
-
diff --git a/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch b/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch
deleted file mode 100644
index 4e600fe784ff..000000000000
--- a/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 28925c37b72867c0819799c6f35caf9439080f83 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Fri, 20 Oct 2017 15:15:47 +0200
-Subject: [PATCH 2/2] Fix heap overflow in HTTP protocol handling
- (CVE-2017-13090)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* src/retr.c (fd_read_body): Stop processing on negative chunk size
-
-Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint
-Reported-by: Juhani Eronen from Finnish National Cyber Security Centre
----
- src/retr.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/retr.c b/src/retr.c
-index a27d58af..723ac725 100644
---- a/src/retr.c
-+++ b/src/retr.c
-@@ -378,6 +378,12 @@ fd_read_body (const char *downloaded_filename, int fd, FILE *out, wgint toread,
-               remaining_chunk_size = strtol (line, &endl, 16);
-               xfree (line);
- 
-+              if (remaining_chunk_size < 0)
-+                {
-+                  ret = -1;
-+                  break;
-+                }
-+
-               if (remaining_chunk_size == 0)
-                 {
-                   ret = 0;
--- 
-2.15.0.rc1
-
diff --git a/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch b/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch
deleted file mode 100644
index 334bcef8659b..000000000000
--- a/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 7ffe93cabb181f39ad5091c31ab9f61bd940a55f Mon Sep 17 00:00:00 2001
-From: Anton Yuzhaninov <citrin+github@citrin.ru>
-Date: Wed, 5 Apr 2017 19:06:42 +0300
-Subject: [PATCH] Fix perl warnings in tests
-
-* tests/FTPServer.pm: Escape '{' in RE to fix warnings
-* tests/FTPTest.pm: Likewise
-* tests/HTTPServer.pm: Likewise
-* tests/HTTPTest.pm: Likewise
-* tests/Test-proxied-https-auth-keepalive.px: Likewise
-* tests/Test-proxied-https-auth.px: Likewise
-Escape '{' in RE to fix warnings:
-Unescaped left brace in regex is deprecated, passed through in regex;
-marked by <-- HERE in m/{{ <-- HERE port}}/
----
- tests/FTPServer.pm                         | 2 +-
- tests/FTPTest.pm                           | 2 +-
- tests/HTTPServer.pm                        | 2 +-
- tests/HTTPTest.pm                          | 2 +-
- tests/Test-proxied-https-auth-keepalive.px | 2 +-
- tests/Test-proxied-https-auth.px           | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tests/FTPServer.pm b/tests/FTPServer.pm
-index a5185d66..cac80942 100644
---- a/tests/FTPServer.pm
-+++ b/tests/FTPServer.pm
-@@ -589,7 +589,7 @@ sub new
-     foreach my $file (keys %{$self->{_input}})
-     {
-         my $ref = \$self->{_input}{$file}{content};
--        $$ref =~ s/{{port}}/$self->sockport/eg;
-+        $$ref =~ s/\Q{{port}}/$self->sockport/eg;
-     }
- 
-     return $self;
-diff --git a/tests/FTPTest.pm b/tests/FTPTest.pm
-index 50385ad0..0a1c768c 100644
---- a/tests/FTPTest.pm
-+++ b/tests/FTPTest.pm
-@@ -53,7 +53,7 @@ sub _substitute_port
- {
-     my $self = shift;
-     my $ret  = shift;
--    $ret =~ s/{{port}}/$self->{_server}->sockport/eg;
-+    $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg;
-     return $ret;
- }
- 
-diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm
-index dd8ec043..78609f65 100644
---- a/tests/HTTPServer.pm
-+++ b/tests/HTTPServer.pm
-@@ -310,7 +310,7 @@ sub _substitute_port
- {
-     my $self = shift;
-     my $ret  = shift;
--    $ret =~ s/{{port}}/$self->sockport/eg;
-+    $ret =~ s/\Q{{port}}/$self->sockport/eg;
-     return $ret;
- }
- 
-diff --git a/tests/HTTPTest.pm b/tests/HTTPTest.pm
-index 00f079f8..6225c7f1 100644
---- a/tests/HTTPTest.pm
-+++ b/tests/HTTPTest.pm
-@@ -47,7 +47,7 @@ sub _substitute_port
- {
-     my $self = shift;
-     my $ret  = shift;
--    $ret =~ s/{{port}}/$self->{_server}->sockport/eg;
-+    $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg;
-     return $ret;
- }
- 
-diff --git a/tests/Test-proxied-https-auth-keepalive.px b/tests/Test-proxied-https-auth-keepalive.px
-index 049bebec..2a18ccfd 100755
---- a/tests/Test-proxied-https-auth-keepalive.px
-+++ b/tests/Test-proxied-https-auth-keepalive.px
-@@ -153,7 +153,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
-     . " --password=Dodgson -e https_proxy=localhost:{{port}}"
-     . " --no-check-certificate"
-     . " https://no.such.domain/needs-auth.txt";
--$cmdline =~ s/{{port}}/$SOCKET->sockport()/e;
-+$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e;
- 
- if (defined $srcdir) {
-     $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';
-diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px
-index ce4e736c..878114e7 100755
---- a/tests/Test-proxied-https-auth.px
-+++ b/tests/Test-proxied-https-auth.px
-@@ -152,7 +152,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
-     . " --password=Dodgson -e https_proxy=localhost:{{port}}"
-     . " --no-check-certificate"
-     . " https://no.such.domain/needs-auth.txt";
--$cmdline =~ s/{{port}}/$SOCKET->sockport()/e;
-+$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e;
- 
- if (defined $srcdir) {
-     $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';
--- 
-2.14.3
-
diff --git a/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch b/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch
deleted file mode 100644
index 11736675dcc8..000000000000
--- a/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-Fix python test suite for GnuTLS 3.5.12+
-
-Backport of f42229b1fdf30ee30c6e13b01eb0c4ebd9ea9169
-
---- a/testenv/Test--rejected-log.py
-+++ b/testenv/Test--rejected-log.py
-@@ -14,7 +14,7 @@ mainpage = """
- </head>
- <body>
-   <p>
--    Recurse to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>.
-+    Recurse to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>.
-   </p>
- </body>
- </html>
-@@ -27,8 +27,8 @@ secondpage = """
- </head>
- <body>
-   <p>
--    Recurse to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>.
--    Try the blacklisted <a href="http://127.0.0.1:{{port}}/index.html">main page</a>.
-+    Recurse to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>.
-+    Try the blacklisted <a href="http://localhost:{{port}}/index.html">main page</a>.
-   </p>
- </body>
- </html>
-@@ -41,7 +41,7 @@ thirdpage = """
- </head>
- <body>
-   <p>
--    Try a hidden <a href="http://127.0.0.1:{{port}}/dummy.txt">dummy file</a>.
-+    Try a hidden <a href="http://localhost:{{port}}/dummy.txt">dummy file</a>.
-     Try to leave to <a href="http://no.such.domain/">another domain</a>.
-   </p>
- </body>
-@@ -55,9 +55,9 @@ Disallow: /dummy.txt
- 
- log = """\
- REASON\tU_URL\tU_SCHEME\tU_HOST\tU_PORT\tU_PATH\tU_PARAMS\tU_QUERY\tU_FRAGMENT\tP_URL\tP_SCHEME\tP_HOST\tP_PORT\tP_PATH\tP_PARAMS\tP_QUERY\tP_FRAGMENT
--BLACKLIST\thttp%3A//127.0.0.1%3A{{port}}/index.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tindex.html\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/secondpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tsecondpage.html\t\t\t
--ROBOTS\thttp%3A//127.0.0.1%3A{{port}}/dummy.txt\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tdummy.txt\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t
--SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t
-+BLACKLIST\thttp%3A//localhost%3A{{port}}/index.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tindex.html\t\t\t\thttp%3A//localhost%3A{{port}}/secondpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tsecondpage.html\t\t\t
-+ROBOTS\thttp%3A//localhost%3A{{port}}/dummy.txt\tSCHEME_HTTP\tlocalhost\t{{port}}\tdummy.txt\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t
-+SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t
- """
- 
- dummyfile = "Don't care."
---- a/testenv/Test--spider-r.py
-+++ b/testenv/Test--spider-r.py
-@@ -14,8 +14,8 @@ mainpage = """
- </head>
- <body>
-   <p>
--    Some text and a link to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>.
--    Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>.
-+    Some text and a link to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>.
-+    Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>.
-   </p>
- </body>
- </html>
-@@ -29,8 +29,8 @@ secondpage = """
- </head>
- <body>
-   <p>
--    Some text and a link to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>.
--    Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>.
-+    Some text and a link to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>.
-+    Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>.
-   </p>
- </body>
- </html>
-@@ -43,8 +43,8 @@ thirdpage = """
- </head>
- <body>
-   <p>
--    Some text and a link to a <a href="http://127.0.0.1:{{port}}/dummy.txt">text file</a>.
--    Also, another <a href="http://127.0.0.1:{{port}}/againnonexistent">broken link</a>.
-+    Some text and a link to a <a href="http://localhost:{{port}}/dummy.txt">text file</a>.
-+    Also, another <a href="http://localhost:{{port}}/againnonexistent">broken link</a>.
-   </p>
- </body>
- </html>
---- a/testenv/certs/server-cert.pem
-+++ b/testenv/certs/server-cert.pem
-@@ -1,21 +1,21 @@
- -----BEGIN CERTIFICATE-----
--MIIDgDCCAmigAwIBAgIIVGI73zrIeeMwDQYJKoZIhvcNAQELBQAwMDERMA8GA1UE
--AxMIR05VIFdnZXQxDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTAiGA8yMDE0
--MTExMTE2NDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAxMRIwEAYDVQQDEwkxMjcuMC4w
--LjExDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTCCASIwDQYJKoZIhvcNAQEB
--BQADggEPADCCAQoCggEBAMjC3Gt55EfStl6mE371+pD3/cpR5MLxkdbBss5MlIP2
--TDhiPOItLXml8oxs4BjUm3wfn3GV9iJLmbzbIWL+0kbRkQ2LCPKUf+Cln3z2ZE+r
--XwdWlT8gVfv51Opfkp2lLDVUqLfNKRGQgivjSCmLqY2LqeB0SaVNvuaD3EpqZyIH
--0E5SZgjqBHgRRtvGkcy0rOmp5SI2NASLugUioXa9OLWjpYDwodsd3ERlL0DJ1aJW
--8TC8Tqix4i0osWzar+LXBIin0Qvar9/uRHN0p1kq3p0XgNHKqWpiTT54+WYx7Pem
--v4qRXz11swiJzUL+Pw1DurQ9smbzDgAsz7V2FJnUeCcCAwEAAaOBmDCBlTAMBgNV
--HRMBAf8EAjAAMB8GA1UdEQQYMBaCCTEyNy4wLjAuMYIJbG9jYWxob3N0MBMGA1Ud
--JQQMMAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFJfm323L
--JbKTM/tMKSt0qlUqewbnMB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tU
--MA0GCSqGSIb3DQEBCwUAA4IBAQCDmuSD4IGmn0UQ5jhGQquh92Iu59j64Rrg7EIM
--zoppciyYR8gDUutOI9CEisxJz6umvAdOo5L981gcFaBv6hHWaE/krAZccR+ZXZP6
--fI9btO8My8O63fYcd2KkLEFqvKDF43i01S2LrqXdPo3uELbFZwxCmUKsexFGsoW1
--CbXbRjnS7w/f72myRmvBeDiNMuGfe1lb4IflybH3DMlKC7i0AN1JKglp+IKn5XAE
--neWR03i3UaYJsibIxj0DkTS+hVPu5MXQ9RlF5CkRdFKjGinLE/u70XyAyx0/IeAN
--e7c2MJvpdfRmTXm2ew4sNyK9RXo7Bv0Yqkl65iMscF8LNnxL
-+MIIDdzCCAl+gAwIBAgIMWWD1GB1UFkEICdQvMA0GCSqGSIb3DQEBCwUAMDAxETAP
-+BgNVBAMTCEdOVSBXZ2V0MQ0wCwYDVQQLEwRXZ2V0MQwwCgYDVQQKEwNHTlUwIBcN
-+MTcwNzA4MTUwNzA0WhgPOTk5OTEyMzEyMzU5NTlaMDExEjAQBgNVBAMTCTEyNy4w
-+LjAuMTENMAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VMIIBIjANBgkqhkiG9w0B
-+AQEFAAOCAQ8AMIIBCgKCAQEAyMLca3nkR9K2XqYTfvX6kPf9ylHkwvGR1sGyzkyU
-+g/ZMOGI84i0teaXyjGzgGNSbfB+fcZX2IkuZvNshYv7SRtGRDYsI8pR/4KWffPZk
-+T6tfB1aVPyBV+/nU6l+SnaUsNVSot80pEZCCK+NIKYupjYup4HRJpU2+5oPcSmpn
-+IgfQTlJmCOoEeBFG28aRzLSs6anlIjY0BIu6BSKhdr04taOlgPCh2x3cRGUvQMnV
-+olbxMLxOqLHiLSixbNqv4tcEiKfRC9qv3+5Ec3SnWSrenReA0cqpamJNPnj5ZjHs
-+96a/ipFfPXWzCInNQv4/DUO6tD2yZvMOACzPtXYUmdR4JwIDAQABo4GNMIGKMAwG
-+A1UdEwEB/wQCMAAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MBMGA1UdJQQMMAoGCCsG
-+AQUFBwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFJfm323LJbKTM/tMKSt0
-+qlUqewbnMB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tUMA0GCSqGSIb3
-+DQEBCwUAA4IBAQC1a0NQfmqT8Ky/BFo5H+G+GoQTlqi3J83ujAMdLUD57zYCEyDL
-+XzAhMPfrOSLPDcQb0ooD1Ie+Rz8Xs1h00cD2OGKwH479+nisF5ksqJVJ4fn/aNFE
-+6W2Xb3MCB+4FRdmy0UeDDA6N2OpVskCM30s9tmovlBLVK46HogdLvy/O1o7z/gbx
-+vV8luevxobnevZ3NdWLyVE3BJZiThBHmZUvL1XNy4KAR4wDAkbCwoTN/JkehTu0i
-+WR6DaG7N7M6psc7rctfzRqimlAkxnoAUwc8LwNLTB3v613xXX8iSUsLKsh6pQfZR
-+e5wnYQIS4MzowvDx8WevTPMRKlN72d8HHuv9
- -----END CERTIFICATE-----
---- a/testenv/certs/server-crl.pem
-+++ b/testenv/certs/server-crl.pem
-@@ -1,12 +1,12 @@
- -----BEGIN X509 CRL-----
--MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN
--MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VGA8yMDE0MTExMTE2NDU1NFoYDzk5
--OTkxMjMxMjM1OTU5WjAdMBsCCFRiO986yHnjGA8yMDE0MTExMTE2NDU1NFqgNjA0
--MB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tUMBEGA1UdFAQKAghUYj1E
--KHs9ijANBgkqhkiG9w0BAQsFAAOCAQEAZgwqs1VOFG39dFHHMXvBr4eJfhwiG4bC
--cL6IvLhvl9ikcyQMHrpOBtNjkCtgclSbJjjTDdera1+zuCWE0WBOJ4mojYdAIOhR
--QvSwp4NwAtibu2F/fjeXoo+LEpcRKtLvAotB30eCZ1OPrijsa/HxFILOLlayjns8
--wM4RmQC4o43y1G/1jqM8hGDg4Wz0j1URVuyP+pU55JpubV5LlExy3gIRwevD2lam
--q3hiighenJYFO3HGZkYT2SIoSpXZnQqKPJ4HwRBSg/cjOpc1y1lIIvKhmk+Cut6M
--+S5HL4pIk8vGYg57nTfOOkj1goqFkfU0DBqvVAZj02ay/VIDu61T1g==
-+MIIB1jCBvwIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN
-+MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VFw0xNzA3MDgxNTA3MDRaFw0xODA3
-+MDgxNTA3MDRaMB8wHQIMWWD1GB1UFkEICdQvFw0xNzA3MDgxNTA3MDRaoDowODAf
-+BgNVHSMEGDAWgBTzPk44hEqpvsFvx2GjUNpuKYvrVDAVBgNVHRQEDgIMWWD1GB4C
-+YfERSnyEMA0GCSqGSIb3DQEBCwUAA4IBAQAAKu+Lum1l/XtcCJ43WveouPK97iOE
-+bjUZWaGYx8Ys/iBdhTa1GXG+E+JuyqgyHTW0HrWJi1D+GiYmsjPJXoEgVgtxXEQ7
-+8b3NyIQ8OCsSTTlVCmLECN9R0xlsitzH+HXOaIEs5sbmIxCnxu+brqno9gQocmCv
-+LHYvoSxsSsOCkkmodbYtKssl2dBonvQPSijN/z3NhZ259e2U3Yv4V7/MrEoTvOxg
-+M0GC0u0Nx86EWbq0sWeiUu270Qk9En5YGNtRhkeq0bXerJswmMAmvrtuKdyfouny
-+4WMvtn30xsO3WwWSV2oyrDSN/IQdDbcmul/bg8ewqlnN77cVf2m70c/W
- -----END X509 CRL-----
---- a/testenv/certs/server-template.cfg
-+++ b/testenv/certs/server-template.cfg
-@@ -68,7 +68,6 @@ expiration_days = -1
- # X.509 v3 extensions
- 
- # A dnsname in case of a WWW server.
--dns_name = "127.0.0.1"
- dns_name = "localhost"
- 
- # A subject alternative name URI
---- a/testenv/test/base_test.py
-+++ b/testenv/test/base_test.py
-@@ -90,7 +90,7 @@ class BaseTest:
-             # ports and etc.
-             # so we should record different domains respect to servers.
-             domain = self.get_domain_addr(instance.server_address)
--            self.domains.append(domain[0])
-+            self.domains.append('localhost')
-             self.ports.append(domain[1])
- 
-     def exec_wget(self):
diff --git a/net-misc/wget/wget-1.19.1-r2.ebuild b/net-misc/wget/wget-1.19.1-r2.ebuild
deleted file mode 100644
index ee66293872f6..000000000000
--- a/net-misc/wget/wget-1.19.1-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CRLF_injection.patch
-	"${FILESDIR}"/${PN}-1.19.1-fix-Perl-warnings-in-tests.patch
-	"${FILESDIR}"/${PN}-1.19.1-fix-Python-test-suite.patch
-	"${FILESDIR}"/${PN}-1.19.1-CVE-2017-13089.patch
-	"${FILESDIR}"/${PN}-1.19.1-CVE-2017-13090.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# revert some hack that breaks linking, bug #585924
-	if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then
-		sed -i \
-			-e 's/^  LIBICONV=$/:/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-
-	# There is no flag that controls this.  libunistring-prefix only
-	# controls the search path (which is why we turn it off below).
-	# Further, libunistring is only needed w/older libidn2 installs,
-	# and since we force the latest, we can force off libunistring. #612498
-	ac_cv_libunistring=no \
-	econf \
-		--disable-assert \
-		--disable-rpath \
-		--without-included-libunistring \
-		--without-libunistring-prefix \
-		$(use_enable debug) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable ssl digest) \
-		$(use_enable ssl opie) \
-		$(use_with idn libidn) \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info \
-		|| die
-}
diff --git a/net-misc/wget/wget-1.19.4.ebuild b/net-misc/wget/wget-1.19.4.ebuild
deleted file mode 100644
index a4cc423b95ac..000000000000
--- a/net-misc/wget/wget-1.19.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="
-	idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# revert some hack that breaks linking, bug #585924
-	if [[ ${CHOST} == *-darwin* ]] \
-	|| [[ ${CHOST} == *-solaris* ]] \
-	|| [[ ${CHOST} == *-uclibc* ]] \
-	|| [[ ${CHOST} == *-cygwin* ]] \
-	; then
-		sed -i \
-			-e 's/^  LIBICONV=$/:/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-
-	# There is no flag that controls this.  libunistring-prefix only
-	# controls the search path (which is why we turn it off below).
-	# Further, libunistring is only needed w/older libidn2 installs,
-	# and since we force the latest, we can force off libunistring. #612498
-	local myeconfargs=(
-		--disable-assert
-		--disable-rpath
-		--without-included-libunistring
-		--without-libunistring-prefix
-		$(use_enable debug)
-		$(use_enable idn iri)
-		$(use_enable ipv6)
-		$(use_enable nls)
-		$(use_enable ntlm)
-		$(use_enable pcre)
-		$(use_enable ssl digest)
-		$(use_enable ssl opie)
-		$(use_with idn libidn)
-		$(use_with ssl ssl $(usex gnutls gnutls openssl))
-		$(use_with uuid libuuid)
-		$(use_with zlib)
-	)
-	ac_cv_libunistring=no \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED%/}"/etc/wgetrc \
-		"${ED%/}"/usr/share/man/man1/wget.1 \
-		"${ED%/}"/usr/share/info/wget.info \
-		|| die
-}
diff --git a/net-misc/wget/wget-1.19.5.ebuild b/net-misc/wget/wget-1.19.5.ebuild
index c822bbda43e0..a73abf153f6b 100644
--- a/net-misc/wget/wget-1.19.5.ebuild
+++ b/net-misc/wget/wget-1.19.5.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 ~arm-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 ~arm-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/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 4705c5d366c2..442713035334 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.05.01.tar.gz 2956847 BLAKE2B d1f5a07cfb92ec5d1b7ef075cf7c9de7ce7621b54a186a8e3a14ba0504090b1fc2ad6475b06b62355c383d31ba1905a7b7b6d9276eccdf545290ed4a11f5b293 SHA512 656a15a65d05bd59b188e95126325f9391800adb4b30a858549f190ab4f8b188b6e495456ebdde58c0997b0723e6effd4181183b9afbac11f7799171c4e3875d
 DIST youtube-dl-2018.05.09.tar.gz 2962389 BLAKE2B bcdf235ce91cd2ac7ddf98d36112d9e23d8d181f5998e5e9bb2638d6acd1aff010f390dc7ae2c9d558c07b20f9d5ea1183444ead6a6a797ef980d8dc10c8b927 SHA512 cf62dff3f8427f0d31dceeebd7b6d8748ba004cd1077076b72f02c2779a8147ce07a7a40cd356a51d0f0dea3008a83f20dea73f6de5c1150cae311c552457a31
+DIST youtube-dl-2018.05.18.tar.gz 2963277 BLAKE2B 4e33f5c97ee20313bad1a4b0ccba55be08177e3c47342f163a04e23e3ce22bbf4e15e620bd5c5c1e1e7a0e3f2e422dc9cc2c213af27a25b40194e3ea93fa98c1 SHA512 99527e5aabf12018037c39d5ce4e3ca67b8848f84106409b8d5fd5271eb6ed53b49abbe5939ab5558ed981a5aeff730b2e27589bbc22d3d616061415154ab9bb
 EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.05.01.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-2018.05.09.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
+EBUILD youtube-dl-2018.05.18.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.05.01.ebuild b/net-misc/youtube-dl/youtube-dl-2018.05.18.ebuild
index 37bffad45c8e..37bffad45c8e 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.05.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.05.18.ebuild
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 8d1bc62abd71..02234c5ec153 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,6 +1,8 @@
 AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
 DIST zerotier-1.2.4.tar.gz 7963254 BLAKE2B 0c79533429e7aab8dc0a93d46ace132b168b6d83276e72cd66c72660d4e44a5336a91c011404690301de0b5ef4b45f857b340f38cd195d6479b480d3a62b7abf SHA512 82adb110208d24ae2745e3839810afcac87955de050ebfe0517a7dc2a875881dafd40c1b16a041742d8c4d0f6513abcc71d6ea3e06c2fb89b47be2630a500363
+DIST zerotier-1.2.8.tar.gz 6009764 BLAKE2B 740b58888f6ce2808608867618df517996d423c61d2ab71f387405bb2528ac5edc6a890b9a7249eebe5d62be58e237362692c13725f0c5313b45102f5fc4824a SHA512 a97a8ff0e5050294fd8d56e74b5dd320b77822242ed4d43919c62a361ccbe1837417cba07d4114c91e277816f60bf47d226f37f816278bfd96505b752ef5d5ff
 EBUILD zerotier-1.2.4-r1.ebuild 900 BLAKE2B 78b4d45a2dbe5577f63193199125fa70298cf498300611f429771767fe165df4ac44a783104e3003628ecf1fa97c9b0de132fc021c759caed25be5ab93fb78b1 SHA512 3311a4b3431450384e08910fac3838b1221c1f6e46debb967e6d98b775aa433de588b6fbd03ca5cb0ae4c8ae28780344806891e5b421f5a90426045189b39434
 EBUILD zerotier-1.2.4.ebuild 910 BLAKE2B 1702a5bdbc81996fbc8503b88cc2149793d8391d80e736e57b6ded5556f0fd6f2d3a90c6d4105e453e4395de9b6cdd2fed835e99bb66361549ff89a82e7bd5c4 SHA512 0b0e295145b5c3b149a41a3645f080e644ca336e151a0dd7c7f6be4c8bfb508414616415b1c95e1f8f4dd34a00cec87ecec6cb67ad1a1642d833e6531a472d67
-MISC metadata.xml 458 BLAKE2B b1d56145169a0127e486422114e0ebbd25097b5f3bc31df609addf4e23229ba3b99b2e5b5bd2b092d45b7bcfae9a30bae29b521441f7732758a4d1f484e9df30 SHA512 3f947bfba0281756bd4b8eb0b91af7cdc263b9dcc2b13c4a186897e7789424c088e9317c58ef35be2ba55880030cf81b11dc0f4d3e4dbf19cd275e139c2d7d73
+EBUILD zerotier-1.2.8.ebuild 905 BLAKE2B 15730c3a9c069e8519998e1fcfcc1c44b38b6e9ec94cf3885562a08c4ad7212af5333dbcd021326f7e606f7c5c9312e0821944b523b6afa7c96ba1409f859aae SHA512 6b504bee732d704b692b00fa18fdc8c47054a1b38a082aa83d4335d2773308c0d12886327d4454a7d95ce43f37e931940c84d082f2e88e5c5e1bfea7002ac6ae
+MISC metadata.xml 551 BLAKE2B f23a3b355a8f7a28b94328a4501c505ba1418426fbd0e97b1787ca085a416f664a3a2a065612d1371c8e79902445465bc2a308a8bffd60e8b767a50f4759b260 SHA512 5fae12e1943c36525f6d9206753cf59a9a27cd895872da9f9ebb31b1d07542b5a76dcf9295f20d2360fa0d56a3f3328cccbd2e2030a6494359c6c69e0c015a9f
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index a4b0e41d3e76..9ba830b73cc2 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
+		<changelog>https://github.com/zerotier/ZeroTierOne/raw/master/RELEASE-NOTES.md</changelog>
 		<remote-id type="github">zerotier/ZeroTierOne</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/zerotier/zerotier-1.2.8.ebuild b/net-misc/zerotier/zerotier-1.2.8.ebuild
new file mode 100644
index 000000000000..7d2f788b42ec
--- /dev/null
+++ b/net-misc/zerotier/zerotier-1.2.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic systemd toolchain-funcs
+
+HOMEPAGE="https://www.zerotier.com/"
+DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
+SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/ZeroTierOne-${PV}"
+
+RDEPEND="
+	dev-libs/json-glib:=
+	net-libs/http-parser:=
+	net-libs/libnatpmp:=
+	net-libs/miniupnpc:="
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md AUTHORS.md )
+
+src_compile() {
+	append-ldflags -Wl,-z,noexecstack
+	emake CXX="$(tc-getCXX)" STRIP=: one
+}
+
+src_test() {
+	emake selftest
+	./zerotier-selftest || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}".init "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}".service
+	doman doc/zerotier-{cli.1,idtool.1,one.8}
+}