gentoo resync : 01.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
commit: 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree: 844bea44d85dc7218f54970af1c42cc9d55c3f1a /net-misc
parent: 89c6c06b8c42107dd231687a1012354e7d3039fc (diff)
52 files changed, 994 insertions, 1137 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d08a883d471e..cf59d9a343a8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index d6040e52ab39..c659c2de6ae2 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -20,4 +20,4 @@ DIST gentoo-asterisk-patchset-4.05.tar.bz2 2889 SHA256 2d5d90777c896065d1f1ab7e4
 EBUILD asterisk-11.25.1.ebuild 9618 BLAKE2B 9eda0a7ea0e9494b993756971c668712bd29f3471e46ddf172d6108a18ebdfca6c066057a2e7655c8681a0590b45d5e81ea9fb5846f6629b071be088b5357d8c SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0
 EBUILD asterisk-11.25.3.ebuild 9618 BLAKE2B 9eda0a7ea0e9494b993756971c668712bd29f3471e46ddf172d6108a18ebdfca6c066057a2e7655c8681a0590b45d5e81ea9fb5846f6629b071be088b5357d8c SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0
 EBUILD asterisk-13.17.2.ebuild 9724 BLAKE2B 51e9c924c2dadd043c5c259a9ccb6a6041e4d2ac3b477dee4c41a3db57f821494d24e30970cd18bbe20abd0112e5c5f8787e41fcc8483ffd66c0418eca446974 SHA512 a3f8b96be8dab1b8a28177dcef963463122c1fc459419550d2329c8e054b08c9ea27bc5147c60cd6ac47ebacaa8b040691bb2a401de342b31a3073a79ba9043e
-MISC metadata.xml 1162 BLAKE2B 83cd28a4e95c25936adc6b66969e31ab664e62e8980821a9fddee9a9ba11d309af3fc04b8876959021f6abd914d10bfc2fd1e34abeac593e08991f102372ac0f SHA512 eb0d44396c7e0749634869096211ae246f15314764892018cd1a7c04bb2f10e94cb41111455365e4437e02cf259a209022a152920fa725d014f2f1f019d5269a
+MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 4617312494c9..7790ac2d905f 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <use>
-    <flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
-    <flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
-    <flag name="span">Enable support for the spandsp codec</flag>
-    <flag name="samples">Install sample sound and configuration files (default: on)</flag>
-    <flag name="srtp">Enable support for encrypted voice transmission (secure RTP)</flag>
-    <flag name="gtalk">Enable support for Google Talk services</flag>
-    <flag name="osplookup">Support secure peering using the Open Settlement Protocol</flag>
-    <flag name="http">Enable embedded web server</flag>
-    <flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
-    <flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
-	<flag name="pjproject">Enable support for pjproject (pjsip)</flag>
-  </use>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<use>
+		<flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
+		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
+		<flag name="span">Enable support for the spandsp codec</flag>
+		<flag name="samples">Install sample sound and configuration files (default: on)</flag>
+		<flag name="srtp">Enable support for encrypted voice transmission (secure RTP)</flag>
+		<flag name="gtalk">Enable support for Google Talk services</flag>
+		<flag name="osplookup">Support secure peering using the Open Settlement Protocol</flag>
+		<flag name="http">Enable embedded web server</flag>
+		<flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
+		<flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
+		<flag name="pjproject">Enable support for pjproject (pjsip)</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 0139525e5442..8f8dc4aaa5cc 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,10 +2,12 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
 AUX curl-7.55.1-fix-build.patch 604 BLAKE2B bf8967460ddab3f0626c93a48d345aa1451dcf1bfa1b69179dd66e0df7869e00cd110daf01c45fa98949e114a1f8799fc5e1a7c9b045fd4abd76559affb5c73a SHA512 9c0aa85219052d7f85be45510f66e49d2dc344b6652d4e8d9c3e2ef583fa90b0e857b285a336a318ca8402b998556bdbc9cdec08973cc4f57c4b9fed1789fdcf
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.55.1.tar.bz2 2786830 SHA256 e5b1a92ed3b0c11f149886458fa063419500819f1610c020d62f25b8e4b16cfb SHA512 bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b WHIRLPOOL 287f6f4f5464a780c338755e4e9870381937768c9f4c9545436856ea690ae6bf4d3f886dd816cf080d2ee84e2a3fbf1a0a5a78e5fbc9d9d18bde428458819a8e
-DIST curl-7.56.0.tar.bz2 2838517 SHA256 de60a4725a3d461c70aa571d7d69c788f1816d9d1a8a2ef05f864ce8f01279df SHA512 ba17a9fdc4b540d6053fa542bd875f321d009b9ba0cb56b16fe6c217f3856ab061f2a6c735771a0eadc28338889d071884680b4d4c243b4179872abb29915e3b WHIRLPOOL 89bdd5fdf4c99fd30bd7a63ad19d2285591b19134911160c94bf46bb4cdf6156544142b47e29d7c0c9cf06536215604cfc6bc59a5ba570dc16b23626fd1b44b2
-DIST curl-7.56.1.tar.bz2 2824548 SHA256 2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90 SHA512 f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68 WHIRLPOOL 428a2f90657cbe3fdc8a837b28f7ad7d80a1c1321a6976e885f79bc3a428c187e1fbc2c6ec48ffa99773aecb27647a46867c35b2fc0c29dbb6fb7f4e7d13f442
+DIST curl-7.55.1.tar.bz2 2786830 BLAKE2B 8de6a383b0ad850c88dce78ef68ec320001b6dd20749293395872d8c87ba79a16b4c0da91299afb0368ebff83c1becb360b402cfe3308374eeeb5e71e443f39b SHA512 bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b
+DIST curl-7.56.0.tar.bz2 2838517 BLAKE2B efe2c213f27ffd1f80a45eed67898b2d9c01192fd3abbe65436fd74afe5235e645905a32dd9b3a01872742b152bdb43ff785ea20f317503d634fd68d31449c89 SHA512 ba17a9fdc4b540d6053fa542bd875f321d009b9ba0cb56b16fe6c217f3856ab061f2a6c735771a0eadc28338889d071884680b4d4c243b4179872abb29915e3b
+DIST curl-7.56.1.tar.bz2 2824548 BLAKE2B 8c191db379dc3f66d03b46158bf9da936c12b72c7361f4c36ff12a3af818322bb777b6f23eb9b95cfd576704f2e9b73ca87d7327734b2d3e6268b9079d718a7a SHA512 f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68
+DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
 EBUILD curl-7.55.1.ebuild 7028 BLAKE2B b7650982b49d90dc8db372c817c3608e1ed5201eaedababa27b9ab43c207221bf3693d5cfd26bce63301ca4bf156afff0488d4c310a6ad4b652d6456409f7b27 SHA512 84861e9e5edb6622c58c1a68f44365026ce328fbf26cab05948fdb7e6b7975328b0f46cbf18a2f749dfdb93727981d1147680d5235af0a36aebd6be74da666c6
 EBUILD curl-7.56.0.ebuild 6968 BLAKE2B ba29862a22558fe61a7bbab98fec997873b98d59f51ebe3f5a5907e16ab58ccab51a5aa95a26e73bc1e8bfde20012c645616b3d101350355d20b3e69a63b6e94 SHA512 a5d04df77ee897e1f516a9ae885dc76a5a575ab29afa6d5396d6667e5a081399c3dd6f2961464eb0a50dfa1cfdc72f4ae4eaf30b9fa9d85e152516aed39f2df5
-EBUILD curl-7.56.1.ebuild 7142 BLAKE2B cb662b1ea3e3282e5c630b952b45d8571fabc27b6a7054a3806664036b33a80306f957ec5b2ca3567003d5eadbfb649b5dd6c8dd62df8c8735c06e254a7fcdab SHA512 dd84359259926963ad1f041775570b3abbfc1665040fbe9aab75030dbe17e02564d40c92f01696c4cd5105d45a6f0651bde8fc239b807dda54c3ec95c3daec41
+EBUILD curl-7.56.1.ebuild 7164 BLAKE2B 6229f6e3323ef17bde7aa5b6b3228d62e2ea8f47de7de4e6d7b744f976ab6820255ca6af749101e426f1c8222aaf15921726759e38f05fdcbfa263961828ea95 SHA512 1514f78468f071e65eca8895b6c0a4bbafd4675a75f7a11738758f8a71b95d9f0d405310ea556c732656622629102207c71afe121654f1c280d553737a293914
+EBUILD curl-7.57.0.ebuild 7189 BLAKE2B 6f28ba28f5ec472cabfdb16154373d8d5f4d6a910518dfb24616ba051136e1d54b69320319e7a815f01556d5eb81af866a19774f1dedfe04a28a6d7719911594 SHA512 3649c670b9e98e502f0a90bbd94cc69f91971f84686e3a3675bb21c1a40d7f7eab16ad5b78785491fcffc2655c76adb988ae2af61aa221013b64b0a187bf2069
 MISC metadata.xml 837 BLAKE2B 1f3436d7a90c4807a7399367c051aa644604daa46f9090f3cf4b12b4159a5f34d566e660288da7849ec7e8a51661fc71109ae3370d1b87e41842ca3713f7f076 SHA512 27e75529e492f897705e249135c7ed661de04eef216fe62669fce544b8c318e44c5435b884fb8f206433293be894bbe1b6214b6cf1a394c9cb907dad48db00a0
diff --git a/net-misc/curl/curl-7.56.1.ebuild b/net-misc/curl/curl-7.56.1.ebuild
index c4d51765f20c..fabca45feca4 100644
--- a/net-misc/curl/curl-7.56.1.ebuild
+++ b/net-misc/curl/curl-7.56.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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="adns 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"
diff --git a/net-misc/curl/curl-7.57.0.ebuild b/net-misc/curl/curl-7.57.0.ebuild
new file mode 100644
index 000000000000..722418f71a32
--- /dev/null
+++ b/net-misc/curl/curl-7.57.0.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2017 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 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}] )
+	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}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# 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
+	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) \
+		--without-brotli \
+		--without-spnego \
+		--without-winidn \
+		--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/icecast/Manifest b/net-misc/icecast/Manifest
index 71c3d7746bb7..9cf5c2407bdf 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -6,4 +6,4 @@ AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552c
 AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96
 DIST icecast-2.4.3.tar.gz 2393358 SHA256 c85ca48c765d61007573ee1406a797ae6cb31fb5961a42e7f1c87adb45ddc592 SHA512 70e755ee935e738f2b7310333823992517747897692d101b67d73d5cd40d6385a20c25d089a0430806c116021e6e2055761efee9fec27cd9bccb2b58a2bfd446 WHIRLPOOL ab75b4f09bff4725fa2bf27f6a49c7f8dd7c9f66e9333e6cfe3ec92e4e84a0562648407ebb891ec7fea8d7bc9680204572972875c76d20f131f43f3748ca5347
 EBUILD icecast-2.4.3.ebuild 2193 BLAKE2B 2ea2134420764bd2f9b9036a192fc2df7aaca1a32ca29be6326f0cd8427af608bb2e50a0e029aec3faa09d4c588fd1bfc71566b7970f00658332d7871ea52285 SHA512 a687f8a9b909a0beb8fb6dd533b8393668ec7d02faed1aaeb2245966ebfa6cd5bbe1d6ef147602ee71b27e4ca8e9df7252f00559d0e65c035a6eea4cdb7fe8fe
-MISC metadata.xml 520 BLAKE2B d7dd9e8bc5364a0adebb73c9f9ecdf691720ef7a72c800dd2cca94e46e3a4e6c9b97a15e0c6b6bb2b7aa36df38bae8b7e078ee6c09a6e6ccaaa1649acf090691 SHA512 6d9ecf525b9ce4b5b6a49ce0621fe73bd2d692d1b1fbd3bd79081eecb234f7f32704b2d191a462d9bc650592010743d7de664696a5df5e901401832e8101c227
+MISC metadata.xml 512 BLAKE2B d4478aee58c5ea15615899722848ee4e84025febf3fdff1203cdc68cea5b7f9021df8995bec3d25bf8f06953dfb3b4b6f2621fae904be59cc88c78732a0ac79a SHA512 73beb97a44390ef3aa35ef29f473397886d8af1f02e8b76924697d8e86df99238010ae63b392e9eb8cd5e6d7c634e380a51c5e298074cd7ed8256649ef6bfc62
diff --git a/net-misc/icecast/metadata.xml b/net-misc/icecast/metadata.xml
index 706360d136cc..fffe116b2fd0 100644
--- a/net-misc/icecast/metadata.xml
+++ b/net-misc/icecast/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-	<name>Lars Wendler</name>
-  </maintainer>
-  <use>
-    <flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag>
-	<flag name="logrotate">Install support files for <pkg>app-admin/logrotate</pkg>?</flag>
-    <flag name="yp">Build support for yp public directory listings</flag>
-  </use>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<use>
+		<flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag>
+		<flag name="logrotate">Install support files for <pkg>app-admin/logrotate</pkg>?</flag>
+		<flag name="yp">Build support for yp public directory listings</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/ifenslave/Manifest b/net-misc/ifenslave/Manifest
index a8d4a972a6d8..2a8a9fa35387 100644
--- a/net-misc/ifenslave/Manifest
+++ b/net-misc/ifenslave/Manifest
@@ -1,4 +1,4 @@
 DIST ifenslave-2.6_1.1.0-17.debian.tar.gz 9406 SHA256 5d34e36dcdd83ec9615e2cb51951888939179be6350eab1cc6c978b0ff662a75 SHA512 90773620e15883f39f3bf3039133385d21d597f2051b81d98f96a2d7b9d7f69bf8f00bab0ffa2ad0fde5b2f4b83cac683b24925f26b6f014c0fa06f6d1023de5 WHIRLPOOL 5ab7bbe48c33efbad002270c704f2ff7149ff435b748a5aa6e1476dbf5ee14a23f71225fcb1f2da21e40b38897a58678d94be72828aa30fe8cb0dcd6c7f5e9ff
 DIST ifenslave-2.6_1.1.0.orig.tar.gz 8002 SHA256 7917bf34de80a2492eb225adf9168c83a4854ac8a008ed0fd5b3fd147ccd3041 SHA512 65d9b632e88c63dc4c2bae752a4561cc7f315278b301c906c6f023934d6af8cdb894d06e1582d831bf0ac88f8d27751115b4f2e8bea6cbb89a705e4bc04068c7 WHIRLPOOL badadeb1377ec29e8be108b4365137724473593f15bab8c57550b450889c6a41b5c5be2dc9c281c1cae9e2ef02dbbddab9d1bd716036e366b3ae5a203aa4e2b4
 EBUILD ifenslave-1.1.0-r6.ebuild 1543 BLAKE2B e2bf4beb6fd5fd2f50e80d7037fbba0fee9358e71607d205be6985596d36b3de72211e67da9fbe0500fc1e0c304aaac199a7b2ad0b64154c780ce4697b1e07ab SHA512 8d8b9e7a250d4205d9d2f8429f2cf435d7f3466b0abb8b869ab4210ee81247c4533c0a165703b2c622377a2b03879692f7a4bb729688b5744683cbbfe5e6d35c
-MISC metadata.xml 354 BLAKE2B 353c4d49a5ed18c0784d61f99fa19d1d5875bf359a203c1b8dacd70eb8cafcd1d8489c5f794bd1e198dd53629b24a7582b80c88469e1433bd12108df22e9bb1d SHA512 895e974387a0fc3f640cf539633dfb54ad0023caed577d902063d4b8abf87745c48c8b3272be051dc471db7e723db22baabab9e1b720de19a66e9f4cf1f761d2
+MISC metadata.xml 336 BLAKE2B 5eecfb87390ed73dc4084412611127d71f427716bfa06f50acaff415d329433f133ca05668dbc4bf678d8b701c2b5082e8152bb20a2291e1e6086e37e93d4d31 SHA512 abf41fe162a73a2cf8e2300bd61bcbb0ea1947073ba16a070dbf731511050de8ec1691b1e1bb5a43278db912551c452fcd0fdb2f87aa2b5e328be28308ad12c2
diff --git a/net-misc/ifenslave/metadata.xml b/net-misc/ifenslave/metadata.xml
index c57573a31def..35e7aadeca94 100644
--- a/net-misc/ifenslave/metadata.xml
+++ b/net-misc/ifenslave/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
diff --git a/net-misc/iprange/Manifest b/net-misc/iprange/Manifest
index 045b697451d8..810e4d9520fe 100644
--- a/net-misc/iprange/Manifest
+++ b/net-misc/iprange/Manifest
@@ -1,5 +1,5 @@
 DIST iprange-1.0.3.tar.xz 107436 SHA256 e22d528eadff3486147aa0763bdc20d4f9b7af6c6f0e4ce9205bc3bc7ca18f53 SHA512 b1dd64c69d07512fb2df18a58866de9f3c644a8e7f9b242ede522f4e69725c397c9759c21826f78074a12a426a76d1b4f950068ddaaddf53ed5168d374c9a2df WHIRLPOOL 895332d62c740081ada9567e8f5593b70c21c7f1fa7a31c7f62fdd7452c9b1cd3003427c4b297dadf09fdcb78e61cb3b317bca9b3a787b10614d145177b63031
 DIST iprange-1.0.4.tar.xz 104336 SHA256 e138d18974fb65674e5ea53da1ffbdde19704208e5114cc6b32d01db3ce1d567 SHA512 28fa258c95e6a7b0bb304b8fee624cfd8ef1a5b24a98a80c3dafe44639e6dc0de22c3b61a33794533c3d9fc0ba41f5663a6bb6c85cf940d57c64db043ccbdac9 WHIRLPOOL 81a07325f2cf06eb041c4cd3916f21fef64a0a036e7e98bfa3638d0df69e61bab90e72880f05d562f470ccf4ed2b9d8371b1fd80f12dd752bbfb9cef348507c8
-EBUILD iprange-1.0.3.ebuild 342 BLAKE2B 36a4b5d01d383787491a51552df437dc13194c5aee38987d4b83589bcb588480f935f1b0d01970c758f2d309619a0130a336473763bc39121e2a7ed66db3eeb3 SHA512 d812e7b54d8174157f81ba7211f50f8283d3b852ca2ad08d8ba1d5892d2b89597a395fcb8197d49572203e11dcb316b7e1cca5b3a93fd0ac9fc1b761615582d4
-EBUILD iprange-1.0.4.ebuild 348 BLAKE2B 461701fe6e8910be373ca40ee9137f8af8d4571566f75ec6a724b2ec1f12442d0026cdab8de32a295609e899749215e983041b35993e4cb1fb125a60af1c723f SHA512 544587ff834830eef115025792afcdc9e9e25f1cd56f6fab4ea909e067c6afa605e74dc23cdef6cc52b1b9c2f04c01708ae841969fb0c508acbd8e10c683aef1
+EBUILD iprange-1.0.3.ebuild 347 BLAKE2B 8a9fe0d0a19d0d8c0c2aba074c145de36fe2fe78ba39add794045af5da279cd6e1797a5c6ed2288dbd5ee2f392d62c52eba486717ef6298b37dd5358a6f2d0b7 SHA512 d2f6f3158a36afd1a1979a67a73297e95de5c0b41a2fffb71f486eda0aebffecf001022c52c2c8b361cbe421eca598c50c6bea0d0a363fc08f99785e850dbf72
+EBUILD iprange-1.0.4.ebuild 353 BLAKE2B a423265185c52600cb47770a781e2618015eb6a30052cc7447f6d8eee90469bf9350cd09cc9d81c4f54fbe4013a6a1dfd6d2f51070a0fecbd36de8cf51e56a4e SHA512 dd0b32bb30f8bd41376526cc6244f330115a3d92e9938267c80d2cd93b3ce5dfe49b4cc7791b5766f18eb85ba5304a48c29c690d59b8eb83060567a60edd462e
 MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
diff --git a/net-misc/iprange/iprange-1.0.3.ebuild b/net-misc/iprange/iprange-1.0.3.ebuild
index e4cc2e425dd7..b8461ddcd52c 100644
--- a/net-misc/iprange/iprange-1.0.3.ebuild
+++ b/net-misc/iprange/iprange-1.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""https://firehol.org/download/iprange/releases/v${PV}/${P}.tar.xz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc"
+KEYWORDS="amd64 arm ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-misc/iprange/iprange-1.0.4.ebuild b/net-misc/iprange/iprange-1.0.4.ebuild
index 0b24a6a9d4e6..df71a2da27de 100644
--- a/net-misc/iprange/iprange-1.0.4.ebuild
+++ b/net-misc/iprange/iprange-1.0.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/firehol/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc"
+KEYWORDS="amd64 ~arm ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index d77d6419aceb..a43fff0aa3df 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -8,7 +8,8 @@ DIST kafka_2.11-0.10.1.1.tgz 34424602 SHA256 1540800779429d8f0a08be7b300e4cb6500
 DIST kafka_2.11-0.10.2.0.tgz 37630750 SHA256 4c9e73059dea2dcb5022135f8e7eff5f187ffcc27a27b365b326ee61040214cd SHA512 3d972cdccdbe889b73b8d5ec68e8a0bc5daabed29ec8f1f217e22887534eba8f3127886c07950a673c55d289a9dbd077763141eb883b5f9e2fe8b56b4524941c WHIRLPOOL 75ecf95f80ed2295eebb910fdd50e6cb44aba0fe79cee724bbace6f024a34d2d2fc1fd84f987877476e8f1c46a7f61000b833c0422be6d5daa8ce175e8a9a28a
 DIST kafka_2.12-0.10.2.1.tgz 34046244 SHA256 e523b448b24a908202c35f12fd0caaa49ce70070305c360f7ed2270bb2c95f47 SHA512 48884838980ff182fe1bb089b5f8db91aaa190dad9f9cbf24d762ba8afb897546f66d66ce110eef87ad1541e06564e5ea455e4698a23fbd296d971e033953bbc WHIRLPOOL f6fa89a778828d84824e867db84bd3e7d40ceb389beb29bef079ef9220ab8010a2d39e51a42a12abb3446bb96bcee560bfa6966c1681185532eabfc75f065a0f
 DIST kafka_2.12-0.11.0.0.tgz 36644420 SHA256 ab6310dd0d9fce1e6e8045b51b471fb35c3e197714e6e6b03bc5864898785f2d SHA512 60b44930700ab42e4a0e3945b6eb32db422d2e62388b4fee68aef97aea939fd252ebd0be39b36a4e6149aff9dcbd5b0578095d8a8812bd75111a65299aa5af55 WHIRLPOOL 33485fab4501501b608d8709ed59e9a0531b0adaaf1cdbd54c5f5cfb1e36b6a00cb8e0cc0d1f5eb6068b00bd5ebe1d26d3aa39d5096a52cf71c498f7912fa6ae
-DIST kafka_2.12-0.11.0.1.tgz 37227486 SHA256 c776f2dbb7f4e1af6b61e32d482b513a1788bf5f39602746b005ab92601a46f2 SHA512 e85b152a0865e068309d3117b874010895389761da43ec62c87e2e4cffa5c8ea0eed6ea6beceae87d437ffabb143d6bc36408b1387985f2b90fe8b9c8201f29e WHIRLPOOL 9e06a4a9e0d2aea98b12f4fa20f7a8c9a58c7e845283ea0508ecbbe81d7f91eb7ffba054a40da47fa35fec1da777c6c6934c6ec9fbeb6cee8a0e3a05bac8872b
+DIST kafka_2.12-0.11.0.1.tgz 37227486 BLAKE2B c4d18aa324f051f7bfd4ac9d967670445dbf96530fa8f896b7377ed8c6cdde06e155a0f4b79281d3d528b89e03ff06cfd1b9766f526b42523d74dea979bba9f7 SHA512 e85b152a0865e068309d3117b874010895389761da43ec62c87e2e4cffa5c8ea0eed6ea6beceae87d437ffabb143d6bc36408b1387985f2b90fe8b9c8201f29e
+DIST kafka_2.12-0.11.0.2.tgz 37282246 BLAKE2B 55485ff6b319b35626e8c93967357eda7099e427b5f1d87ab29bd7c8edd0ded8e271b3973b5d3ee025f09e17d319a0e9f1a9fffcf75c663052ce3b656f2e9b66 SHA512 b1652b53558886a1d407fd82d6ea1c3af5b580752303dcf836c43d76c0fc0773790df4af2d9364f937fac96d197974282e57add488bd592e87cf4c3f52592bb8
 DIST kafka_2.12-1.0.0.tgz 44352403 SHA256 d5b1d00752252d9c129e9284f26f8280e9899dd374167f257e29d5346eb544b3 SHA512 1b647b7f392148aa2b9d47550a1502e50be4b005c70c82dae03065b89484e66400528be40ca2d54f35eb2c0e70f35c88a04777c2b625daa5d5546caab4ed6818 WHIRLPOOL 1e8996b0324058bb62a84fa60f62d00e01448f6da803aff7251ec520c700a95d0c77b0fe41a3da562eeedf760af1c6d2b8c0b4deb861cfaa16637453a4bf7dec
 EBUILD kafka-bin-0.10.0.1.ebuild 1440 BLAKE2B 365a8f7926540cfbec713af5b8274c4b770a8be6dd23af88e15c061b108000b929acf9b321b4589e4f1ee8629670173a47174ba519704256ca2d827ec4479f83 SHA512 f2bb54ee5bb241b93c964f0ec2ac8298c86dca304f857194864580bddf65764cb8b27961d4e3b750d6624e1747a4284d69d557a4ba7eba9775400c131cc05829
 EBUILD kafka-bin-0.10.1.0-r1.ebuild 1471 BLAKE2B 7c28e1ee6eec26765b2e86f3023eb2bd9610be8bdd46df674e58e87a0e60ccfcc5295b08c604521a00f0b530986b15ae68731aa121df7b4e0e62c6955a5a8510 SHA512 cca27e43b7dd964699e3de6dc1b69f4a6e102516280656f0c5e171ab49e9ad731bd645001dbda4cf22b9c66202b36e9565ff354056c81b19b97bf71954f6d463
@@ -19,6 +20,7 @@ EBUILD kafka-bin-0.10.2.1-r1.ebuild 1473 BLAKE2B a4d14eb7921b00d35613be2db021178
 EBUILD kafka-bin-0.10.2.1.ebuild 1471 BLAKE2B d22ca7e5b2a2592e7d93885ff934a69b43e47ff3dbe85b2c44abecb419a058313e92e525b5de3fe44efce5c0680accfdbf6c758049144b343aaa79be2c22e166 SHA512 202e2f909043c380ef42bab813749490ab7ec57d738eaad6cf79e5cb7ceb8f2e0baf285a63ccaf3e12f00cc22d325f9aa7d421a5662d0f472249bd06e933b493
 EBUILD kafka-bin-0.11.0.0-r1.ebuild 1473 BLAKE2B a4d14eb7921b00d35613be2db0211787ccdb3859f4ed5a3716d0e2d25cd468730bbdb25ecab5ad854a1cc087db429cec1e1c7d6d9c74063ab28a5e97248b6c85 SHA512 00004f94903a431797858689d162545e57c40d3e62e7c9ed3250338744b2c5c48433d5c1184d731663d156650ad08676030cb6066188a15eafbd038818a425fb
 EBUILD kafka-bin-0.11.0.0.ebuild 1471 BLAKE2B d22ca7e5b2a2592e7d93885ff934a69b43e47ff3dbe85b2c44abecb419a058313e92e525b5de3fe44efce5c0680accfdbf6c758049144b343aaa79be2c22e166 SHA512 202e2f909043c380ef42bab813749490ab7ec57d738eaad6cf79e5cb7ceb8f2e0baf285a63ccaf3e12f00cc22d325f9aa7d421a5662d0f472249bd06e933b493
-EBUILD kafka-bin-0.11.0.1.ebuild 1473 BLAKE2B 8a3f184fdba0bbea5419b2d6a6c73733b797692b0c5354cf2c08c73300224a212048cf339f971dc02d2bbcbcf87785c74953dd5f18d56e875896253217d36d3b SHA512 c4c99f4f2cd3519002d12b0fa59ed79470896e6bacfae6147bae6079338f3b8c850a80f19945ba272f08818440d7726c4bf51a2f744d0ee8314002ff9cb04977
+EBUILD kafka-bin-0.11.0.1.ebuild 1492 BLAKE2B a4b7e264a0f77fc4878f2bd3f06f74826fe030ff26eb354d28d4ebe640e80877fd56d102505e853288193c1e2d6c91c8ff7098e861445d035c4899e037a7fe1b SHA512 5920701379370edde973a049a47a95e7ba261fa8cca6d9fca6f5de27b340c7cd2df9cbceb950fe0cc373ca66f087bdf6eca0e7a82fc1f3422a6d18c5aae8cc81
+EBUILD kafka-bin-0.11.0.2.ebuild 1492 BLAKE2B a4b7e264a0f77fc4878f2bd3f06f74826fe030ff26eb354d28d4ebe640e80877fd56d102505e853288193c1e2d6c91c8ff7098e861445d035c4899e037a7fe1b SHA512 5920701379370edde973a049a47a95e7ba261fa8cca6d9fca6f5de27b340c7cd2df9cbceb950fe0cc373ca66f087bdf6eca0e7a82fc1f3422a6d18c5aae8cc81
 EBUILD kafka-bin-1.0.0.ebuild 1473 BLAKE2B 8a3f184fdba0bbea5419b2d6a6c73733b797692b0c5354cf2c08c73300224a212048cf339f971dc02d2bbcbcf87785c74953dd5f18d56e875896253217d36d3b SHA512 c4c99f4f2cd3519002d12b0fa59ed79470896e6bacfae6147bae6079338f3b8c850a80f19945ba272f08818440d7726c4bf51a2f744d0ee8314002ff9cb04977
-MISC metadata.xml 339 BLAKE2B 66611acdad25651579efcd9e214c847f0216fbda4c06f32cb8d7134596840f18a27631b89ee655583d947253b4bebddb1df3d8721ecff0317ff5fcecd17259fd SHA512 6aa179782d22d0b46934d90984c983aae6876461e077bebff7aaaf58687400881b76b658e468f780a88b1b6fb8f1d7d75c061fd16767d658af80c9e54cb3bfe4
+MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
index a3d76ba672ca..1699e37e95fe 100644
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://kafka.apache.org/"
 SCALA_VERSION=2.12
 MY_PN="kafka"
 MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+SRC_URI="https://archive.apache.org/dist/${MY_PN}/${PV}/${MY_P}.tgz"
 
 RESTRICT="mirror"
 
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild
new file mode 100644
index 000000000000..1699e37e95fe
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="https://archive.apache.org/dist/${MY_PN}/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.3" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/kafka-bin/metadata.xml b/net-misc/kafka-bin/metadata.xml
index 0cd421684a02..136eb2b1d753 100644
--- a/net-misc/kafka-bin/metadata.xml
+++ b/net-misc/kafka-bin/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person">
-                <email>patrick@gentoo.org</email>
-        </maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name="internal-zookeeper">Use bundled local zookeeper instance</flag>
 	</use>
diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest
index f31004f0b67d..83c89996fc24 100644
--- a/net-misc/knock/Manifest
+++ b/net-misc/knock/Manifest
@@ -4,4 +4,4 @@ DIST knock-0.6.tar.gz 125772 SHA256 75a4e8ef8c59efa2cc910375191162adf0deeca20b7a
 DIST knock-0.7.tar.gz 110791 SHA256 9938479c321066424f74c61f6bee46dfd355a828263dc89561a1ece3f56578a4 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7 WHIRLPOOL 6d25c5d68edf5f1da9eeb8814f965fd0cdbb5c9cadd08895566200d61373481e8f9100818809c6048909112e37c7c95dc0fa558dd9f01e95cb22207583d2d64f
 EBUILD knock-0.6.ebuild 1127 BLAKE2B 48192b055cd62bc99dc171a9b6f6717beb30419f01b8878178f09859cc3d585825b84437240cb764b30468eccd40c3ec7b2411957d1926a0169a615c7b5276ac SHA512 51ed99834624fa07025cc16f7cd2f6f019dba76efc1d275d8c4459eab9b69f4d7bfa02705ec37efbb4353bc0293683b572f28c7070adf28aa61b078af240d933
 EBUILD knock-0.7.ebuild 1127 BLAKE2B 9ed9c52727e6ca092c6078cbdcd219ab0bcc91518f83e339cc4d903ce56e0b66e0a7fc87ef559431feab8dbd749ce045991c8915e2a2a9593fc1530a2641e451 SHA512 cb6805c8e4c04c8eaf4cd8ee2607ecace433cd8fbcfab88b99f4de8262a73ce137cdf70126d65ed396ddf3017a34ef9b0827ce8f0690293fbba7f921ca1b67fe
-MISC metadata.xml 329 BLAKE2B d606f3932ca1df52791f1ad976f3c691f13858ed10bc421ff937bf11fbcd8c86e1524b114b2e9a3d93b436759f2878bea54808e9c1ab5958bdbe44dc3a61ff57 SHA512 63dcbc6ad7c410cbc4c272afb60025a09f43929f54a16f23fa33e7f3f32f6cd34b2c4002298c6e27b9e115c0970cd3b5d0ddc626a6fd9bc2b75e5eaadbd56db5
+MISC metadata.xml 322 BLAKE2B 7609f7fe4bd42f54c54567492f3fedff22eee6acad526710cf94dafaa5312109a6cc13d565b026de3a115c9a72e27012859ffd75b4539fd4ef2dcd1a32850c65 SHA512 d74a9c4ed216bb9834f97f818b727c5c01103b0e54ae376200d47f11251ce4baeb517b4f76f3412bbcfc9085a301031a3f1be63c8cb330736412abcaeb97cbeb
diff --git a/net-misc/knock/metadata.xml b/net-misc/knock/metadata.xml
index 8d375f5d42e9..f7fb57167ee3 100644
--- a/net-misc/knock/metadata.xml
+++ b/net-misc/knock/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-  </maintainer>
-  <use>
-    <flag name="server">Installs the knockd server daemon.</flag>
-  </use>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="server">Installs the knockd server daemon.</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 2a4fa0347192..d290ab1c9566 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -6,4 +6,4 @@ DIST miniupnpd-2.0.20161216.tar.gz 218119 SHA256 9e73d50ac830b5e08b6eb1df4e4c917
 DIST miniupnpd-2.0.tar.gz 217802 SHA256 d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7 SHA512 c88036d3f4b065fc855572db8945d921641a71a23ffe8b52cb4ccb1a7cf3e7396841c436d54d7ff5968d034d8c4bfc91630719959000436230bb8c37e5bdc8d4 WHIRLPOOL d6aec880c9ef3c70002fdf9a98a0e8f4de95d8b3c9c6a18e328bc94d7dc3b8c130829c8ea6117e27e5b0aac1cd4526bbc9d9de21bd13e7b5527db54a656a1fff
 EBUILD miniupnpd-2.0.20161216.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
 EBUILD miniupnpd-2.0.ebuild 1488 BLAKE2B 9a97af1c4c427c9684befbb6646421c151d54285fd8e698af68ecda818d51aa48eb3f34700c26d9239bff2cf45969e8ee676f3992bfa876587d80e15bf236bac SHA512 35824d68869b52670b2bc69d598d1fc8724cf041e3effa796944c006eb9f94635afa37756617c88dc396a14a94b0bf78d68df169879eb6107692dc339100532a
-MISC metadata.xml 1055 BLAKE2B 8e651e26cab6efc00dcbef7d2d4b0bd2f6adb37334b84417cad2cdc30fb0725b707ca33dbbcf6bb8e243b83ca26ed3f4dbb9ca32d4921e0ba3e58cbab5850d66 SHA512 38a62c904cfc7c8e4c0bf16a0426ee8cd2338933f85fc1a7d9fa3e0cb1b74525df1a6bf2bc8dea83bf41003e683f76804bcb1b69bd17b855290a5f37792328b2
+MISC metadata.xml 1043 BLAKE2B 1ea4668279d5b43c5ffa7a2c95f3fec6532a2a6918fa0f1a9b6fc60f37af5524929d434da3a346aa093bc7ba8e5bde644342500606d753f43499f0df164e4782 SHA512 2f825098e0257d3242abfdbaa0ba3ae7e669912a1b81e7c0f559e208297e2bc0e82c07698f1e63c01b15170eae3560e27e8a67c3fc91598cf81b5b70f8e5101d
diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml
index c4e9cf4a54d8..1d5d87bb77ec 100644
--- a/net-misc/miniupnpd/metadata.xml
+++ b/net-misc/miniupnpd/metadata.xml
@@ -16,11 +16,11 @@
 	<longdescription>
 		MiniUPnP Internet Gateway Device Deamon, used to allow UPnP enabled clients to forward ports.
 	</longdescription>
-  <use>
-    <flag name="leasefile">Enable lease file.</flag>
-    <flag name="igd2">Build for IGDv2 instead of an IGDv1</flag>
-    <flag name="pcp-peer">Enable support for PCP-PEER to allow NAT-PMP clients to mangle their packets.</flag>
-    <flag name="portinuse">Check if a port is in use before allowing a NAT-PMP client to map it.</flag>
-    <flag name="strict">Be more strict regarding compliance with UPnP specifications.</flag>
-  </use>
+	<use>
+		<flag name="leasefile">Enable lease file.</flag>
+		<flag name="igd2">Build for IGDv2 instead of an IGDv1</flag>
+		<flag name="pcp-peer">Enable support for PCP-PEER to allow NAT-PMP clients to mangle their packets.</flag>
+		<flag name="portinuse">Check if a port is in use before allowing a NAT-PMP client to map it.</flag>
+		<flag name="strict">Be more strict regarding compliance with UPnP specifications.</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 98f7cbfada80..7bdf90c35c13 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -6,4 +6,4 @@ EBUILD mosh-1.2.6.ebuild 1420 BLAKE2B 9025c7bc1fcf925d65367fa27fc67633003bdb4fa7
 EBUILD mosh-1.3.0.ebuild 1416 BLAKE2B ffd7e525dc19bad28c1c33e3b3144211bb0a6ea977487951b0001ccf02ed008580b2672da45f58025af3d5b7f6bc5353470f0b468b0ab0751be745bd38265512 SHA512 7b59e94aa6a096d34c7544017f2de6662f91b4ef2b569a2438fe4739d17d83d98db3df07bb2e95d2e88b7b5b86fdd9ab964c4968873567a0893d016de4a74a6b
 EBUILD mosh-1.3.2.ebuild 1416 BLAKE2B ffd7e525dc19bad28c1c33e3b3144211bb0a6ea977487951b0001ccf02ed008580b2672da45f58025af3d5b7f6bc5353470f0b468b0ab0751be745bd38265512 SHA512 7b59e94aa6a096d34c7544017f2de6662f91b4ef2b569a2438fe4739d17d83d98db3df07bb2e95d2e88b7b5b86fdd9ab964c4968873567a0893d016de4a74a6b
 EBUILD mosh-9999.ebuild 1372 BLAKE2B 4a8c93784fafbbc80b53f6fe56b2f8e016080c910a26b0d8d38512850cf9139f25ebbbfcc6f6c64485069fc5204146d78e48ac35a676157664c2e87542d1f812 SHA512 c94fe52a539a0ab2bf622a24968ab91e6d625513e299036f5c2e452bbc4dff506e61301ad53b13a6fba45f893c1238fa0ca959cd4e61eaf5bd42c43385ff0f8b
-MISC metadata.xml 1159 BLAKE2B 94201e94925278cf4e014edded3c681dd51e66d02b65c00506c8044d776b0df6e598bf2a56243f8758dd098ef017e426d4184c84b14574f45ab04510ac650ffb SHA512 6b85b61c6f28de63e397c7f24f0f79bd2d9bbbdc57de87b2d27b7cb4736e7e217bfdbd81a90cddf97bdbde376016413b0cb1fffc060838024376a332ff733272
+MISC metadata.xml 1158 BLAKE2B c248c447c308c6a1361f605ce9ee6030bd89e23083295a7ff93c7f039860b16d3c98aeff4eb7f1d26687dfb9f00b1e3547c6df9ff62281433f71c01de11ed97b SHA512 fe6d5f54ffa09d5fb33df2669668a6e3f6c04809d4c61ece08c083600f7ac63dc4acb29b006ef7208b44e56ab8e232f598f33c390e0e2fa586ace6ad825f5c53
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 5aa0beb6000a..5f24fe90f47e 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -18,12 +18,11 @@
 		<flag name="utempter">Include libutempter support</flag>
 	</use>
 	<longdescription>
-Mosh is a remote terminal application that supports:
-  - intermittent network connectivity,
-  - roaming to different IP address without dropping the connection, and
-  - intelligent local echo and line editing to reduce the effects
-    of "network lag" on high-latency connections.
-</longdescription>
+		Mosh is a remote terminal application that supports:
+		- intermittent network connectivity,
+		- roaming to different IP address without dropping the connection, and
+		- intelligent local echo and line editing to reduce the effects of "network lag" on high-latency connections.
+	</longdescription>
 	<upstream>
 		<bugs-to>https://github.com/keithw/mosh/issues</bugs-to>
 	</upstream>
diff --git a/net-misc/ndppd/Manifest b/net-misc/ndppd/Manifest
index d94dc6187a9b..c5cc1b591afe 100644
--- a/net-misc/ndppd/Manifest
+++ b/net-misc/ndppd/Manifest
@@ -1,4 +1,4 @@
 AUX ndppd.initd 323 BLAKE2B 5aeb5d7f264ef9d0ae5dd078678e52d75b9deeadc5e6c4bd336d61176fcd9d800e26a747ea392eda98bb58fe7ade34c363798e7841df3521903837e31b99f217 SHA512 4fe6632c70a02bed919391ac0dffb7d2b013a387055c8b4e5bb5f93d99e69e20f1ecf26cd7f6c59c01c14d28eec0df8ee6d1e8bad6bb227644d6ce94a1132b3e
 DIST ndppd-0.2.5.tar.gz 31820 SHA256 ee934167f8357f0bd0015e201a77fbe4d028c59e89dc98113805c6855e1c3992 SHA512 85534594689c38c0203ad5e7c0c6373a705cbd7da7e2b0519689853a003be2fd7c953aa73529ca52d8c88bf0ce98524e39c475ea992669278090cde4a0e4ba2b WHIRLPOOL 0722c127b883c61fa45c54694665d070aec04257cc5d6514db36682f5b6a624d42ab9e9377b0eb2822d2ef690607cf5bfc332bd33d25992ece723642f2ceb7c3
 EBUILD ndppd-0.2.5.ebuild 554 BLAKE2B 751d91592fe86d4afb1439088f7d96f0c500d6aea9b54b04f9868fa662c0aa84b122c3b652a7508269fbda9aa0565a6fe3ae8eb1bfc670257f1dfbb47a2d024d SHA512 e1ddff3bad5e4deb157547d20063071ce4f45bd3040645b5d2c676576d06f22e612a91e890ae4a658be82a8aa0c76c5622a9e8fe453d831b8210f51811b13d79
-MISC metadata.xml 505 BLAKE2B 765845d4d9474b01ea92f58ae3180af5c45ffd68fc74ef9622ed6a82e573ceff7944ffedaba2f1bfc966074889c2bc1ae194998bc714284838cb9129af14ae75 SHA512 53079b420f53630dcc1f03704025d56244b04b77b7f25e10857bb97063febaa4a60d488b777a57d91f01e9673c437bced067078f8f23bd532d7f106ccf92a6d4
+MISC metadata.xml 493 BLAKE2B 26adf62b87a9fa0ac5238da77b957a2c7ca9cd793469c0e84cff7894ad4d1a4cc165f97cf8a0141c8cd4b78e5ef6ab4e74875083e4782470c9e2931d315f7f35 SHA512 1e0fcf7d6d53fd189c46d7d413b9d7956697c7a777dc13cea0d1ef95c85105a2b4307d9b8f6d300ff39b1035dbbb8744d193cf2552187a1636eba93f09047228
diff --git a/net-misc/ndppd/metadata.xml b/net-misc/ndppd/metadata.xml
index 83f8029f254b..cb616d6c6e0a 100644
--- a/net-misc/ndppd/metadata.xml
+++ b/net-misc/ndppd/metadata.xml
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zx2c4@gentoo.org</email>
-    <name>Jason A. Donenfeld</name>
-  </maintainer>
-  <longdescription>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<longdescription>
 		ndppd, or NDP Proxy Daemon, is a daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">DanielAdolfsson/ndppd</remote-id>
-  </upstream>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">DanielAdolfsson/ndppd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 7251f52a6f49..4a6aea8f0f4a 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -1,12 +1,13 @@
 AUX netifrc-0.4.0-interface-types.patch 902 BLAKE2B a0c46f3f55944c1390434906f7d526b2531dca133c5965ea2a34fce1759ebb6db386242c99c20492f8556341722e39a4e549fc5fed80749d3490405f7f7af2ec SHA512 ffc5e805e2130cee1f423bc0e10efc1c63e91ca6e7ac0329c38e9a2ea7e5197873c20a13d9f48c48f7c5927767a5817574d1b43acc2e443e7cdd92867d6b11e5
-DIST netifrc-0.2.2.tar.bz2 61115 SHA256 24c2748bec768691799d97c540061d46960756b390475107539e104868f36a4d SHA512 c31b5f5ccd5e76a568ba5acf143eea5413c5911fa7a14a00a983a71cbe737fc40e814686f4916377ac5404b35805503463c2cb371943a76a27124247fd9f9fe3 WHIRLPOOL 43010906bdd64e9631688f8f8a948d08ca4b42c9188c4941f406361e9455b712097596d4fbf86c3643bdb9d32a2c29367bc950edc025ebdcc771fbe30b87c080
-DIST netifrc-0.2.3.tar.bz2 61427 SHA256 c108d34caf555e411a80b56f08ef03693512e076e1a91c320d3aadd080ebc4b7 SHA512 fb3c555956e83831ae6bb0e73c8e1e0a6f3d9c806d148aa2f3e9dc92edc48a19bc65743eea1dc8ada924081eb2cedc5e02b14d8614145f08b1728e973cfd412d WHIRLPOOL 67e0492f1cabd0ca7630dfe38816dc64ec368615a8ac026e63bfdeff70bb72a01027212c3cf6aba720cca34ff10df8570542a718eff6bf7d95104bcfd33f4654
-DIST netifrc-0.2.4.tar.bz2 61828 SHA256 9b53eb3c8e6e80cd4073a34f911a28055c28b9f7a9f119a397002b0de7ac0691 SHA512 a8dd7d1d79e91eb37c938a7b06c835d667d5b39ad5e7bdbd6a1b18d17ac6f828935a83ca119d49b9903e9fe7ca48f0c003b28a6c52252f9f0217b96ec2c2df41 WHIRLPOOL dcc538f9cced599ba1689b96bf6a412c590a1557cdde7027ac2b5066977594352660f32c5d30ddc24a4c6fd870d62ea6f7f98e44a89a534fe37b1e8787ec1e04
-DIST netifrc-0.3.0.tar.bz2 68461 SHA256 9b0bd794a7714c06d2baa11553af018f694c2c71d121e657630d9c9ee94cafc6 SHA512 e28c00e5318c17e46bbdbcd471252729b73a4a0af930a4bf6213d30441650390b6bb83678cfd1fbeddd8102f947016a18976538dcf316cfab08461adf301686c WHIRLPOOL aa868e8b9dccb6d2ba48f37318adae57cf8314d1b45d9ad1fdc5d6b85b0b432b7b3f5b784d9d3ae824612699947b6bd47810c4cf44daf25aef52673a1fa2120c
-DIST netifrc-0.3.1.tar.bz2 69213 SHA256 a92a96b6f065981ee1c0232a507f3695230eeb7fb6172ec9048c2538b36cfea8 SHA512 de7d9291c3303e077c86e1fd42c6d9319308f0b51f28a034f9ed830aa504d2830ce96816a391811bcfadd07500e9c439acd4c4365555d7a3e47e58178b53465b WHIRLPOOL b2b0384880abb52a6d31a640688ecbdf17e4ba02aed9660e63c99c80eed315384459984abe1ef527526bed5a142e2c13275b7e7f68332fc6d9368bd98dcdd461
-DIST netifrc-0.4.0.tar.bz2 75517 SHA256 cc5c10d567530f64ca8c4fb8dcfc8218d102144f83393e1db769a5a5374c00df SHA512 a6b525a8f084a3cc9e4afa452617c001a225475689ed5ecb86703178eb252b70eb2dfc294789e29c6001098087a7ca2238ff9c8763accf3a66d39cff86614e85 WHIRLPOOL cdaa38a549106a3f73db88aa6376f77d71868cf774a1bb346276a52f6503ccc28f0049d12cbad6e068ab9af87b0fc37e69caa43f31efcbeb4e1a548a6b069c16
-DIST netifrc-0.5.0.tar.bz2 78738 SHA256 2937cd4fd0f0a6eee050b00cc0b32ba37d2793eee09de21e0366d4e0886f8257 SHA512 2348c0df590d6060de3756a5111ac2916047e21ce56d43fc0b8d99946f93ca02ce300abcd9243e1e4cbcd5ab89ea6ed0869785cdb5297a669aeb6812788933b0 WHIRLPOOL 32bca5ecc6a3f6b75e541778b9d0548102c69cc86fb9d61458bc36f458766470489f5bf86b9373e8db598ee0883c65e6986efa2a37d1873484297df9aad73015
-DIST netifrc-0.5.1.tar.bz2 78749 SHA256 11a6ff3dc1fb5673d8acd128b6b8cb53a4194df23c5dec170d57f8e6b8b7b1b9 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710 WHIRLPOOL 32ff62ba508a4f4c69c562709b1134f663b7027c3175bbe6aeca8c64c74293dfc1af2037e30e48405a4a8b96726c7621c4b37e7239463298a24e69d69b664ed9
+DIST netifrc-0.2.2.tar.bz2 61115 BLAKE2B e968fd8c5e86e38a2de1ca18608a87cc1a69d5d333595f5efc0afe6a79b19f90cf725b3f56defd4762e2451df06eb49a2ec75feda5f5f60874984c659d5df578 SHA512 c31b5f5ccd5e76a568ba5acf143eea5413c5911fa7a14a00a983a71cbe737fc40e814686f4916377ac5404b35805503463c2cb371943a76a27124247fd9f9fe3
+DIST netifrc-0.2.3.tar.bz2 61427 BLAKE2B 2531c2a54f2b0ccc84368f4c489f13db09913bdedbb042009bcd60f87284a786de8e942915053076745f2940078b0ebdfba3e2fd3861b0c9e8ecfc033535f46e SHA512 fb3c555956e83831ae6bb0e73c8e1e0a6f3d9c806d148aa2f3e9dc92edc48a19bc65743eea1dc8ada924081eb2cedc5e02b14d8614145f08b1728e973cfd412d
+DIST netifrc-0.2.4.tar.bz2 61828 BLAKE2B 77efc7fc187a301d82f3ecc36f152e929de64c2792b3b884bb260afc12664eaf4b8a88fbde4d7fd33c5443f0c85b9473777411957916303d077cd99a8b984bca SHA512 a8dd7d1d79e91eb37c938a7b06c835d667d5b39ad5e7bdbd6a1b18d17ac6f828935a83ca119d49b9903e9fe7ca48f0c003b28a6c52252f9f0217b96ec2c2df41
+DIST netifrc-0.3.0.tar.bz2 68461 BLAKE2B c304f04bac2df3091ca407d834f5121f31687aa73b70cf426a5c639c8f3057493b027c3d444450c1627ad4520cb68b44df427586e48066cff84bffdb918589f4 SHA512 e28c00e5318c17e46bbdbcd471252729b73a4a0af930a4bf6213d30441650390b6bb83678cfd1fbeddd8102f947016a18976538dcf316cfab08461adf301686c
+DIST netifrc-0.3.1.tar.bz2 69213 BLAKE2B c327117df6e10cc8485d8e67a6d01ad3030a0624ecef9e8352628c784747dd0e2d6b7ab81f198816802c0320aaaf8ed1d0d109ac6e889d248d9130f34055ae03 SHA512 de7d9291c3303e077c86e1fd42c6d9319308f0b51f28a034f9ed830aa504d2830ce96816a391811bcfadd07500e9c439acd4c4365555d7a3e47e58178b53465b
+DIST netifrc-0.4.0.tar.bz2 75517 BLAKE2B 2ae5169b040268d299ed6a043c169b132378ccb8a60b01142942ed8a5b8f51ef10b5ff9f674f626dabc53198712766b53ddbf8ee41dd87af8b5512e041143cb7 SHA512 a6b525a8f084a3cc9e4afa452617c001a225475689ed5ecb86703178eb252b70eb2dfc294789e29c6001098087a7ca2238ff9c8763accf3a66d39cff86614e85
+DIST netifrc-0.5.0.tar.bz2 78738 BLAKE2B b0627aaf0ee0526cfbb6af3c8cb82476ee910d19d16ee4a3ebf736fce0e91c2a7a44bf2400b0854bbfc2cc0f3f0bc84ef917760326c2a73a59a60314c5a8f7d8 SHA512 2348c0df590d6060de3756a5111ac2916047e21ce56d43fc0b8d99946f93ca02ce300abcd9243e1e4cbcd5ab89ea6ed0869785cdb5297a669aeb6812788933b0
+DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
+DIST netifrc-0.6.0.tar.bz2 83349 BLAKE2B d9be118aa2aa13891091f7b5060d06ce0bc1eb9740c5adec04b985785e7bd7afe77bc03751d178b8e09c967b04581b12cfbf50aa49b7226ab580081e420f22bc SHA512 de47d146619bd716a0eda8149063691d9d71a895579ac50d3fea60bf0e48c516d6b37aed81c33083dc6e7d4bb74841bb6b143c23972669de9d76b8f7df7a5d23
 EBUILD netifrc-0.2.2.ebuild 1764 BLAKE2B 68620f2b76a29d77f22e364e3be62711dc1c1f777b9a707405331b2c6df76cf7a42ce99fbf6181e6e14412aa974df6fde8acc1c957311dacff227cde8a694d8d SHA512 57715aec43860cc8ea044486d10f0171317228343459417bcaa5e6716e8d32e2338089f24f97c0431d15c19cba2a94f824c90f6670e6de2bf680f4a2fe8865ed
 EBUILD netifrc-0.2.3.ebuild 1777 BLAKE2B ffb0130f7e30d120e9c89806842b32549c6d87d03699d6058d9ec96659083ed9dcf2cdd039aa74ad358c4a70997210203312971295e9d637c6fe725cd0e54144 SHA512 2c09aa95b80921833bd05f6faa4197b627908bf5860d99bfb2db85236fc230059ca73c2af44bbead4651e66b289adc0fc17255743e2c0f2411eeea40dd7c6963
 EBUILD netifrc-0.2.4.ebuild 1787 BLAKE2B 97cc35f38a82555850e34297ead65a2325756f666ca05aace54336978632e863036aae7be8dc43724ac450bbebc1bd645e97374dd16fbb312acd1556210c8280 SHA512 748b52fd645a01c90c0bb9911602a616e05c3e23e209d567198439cc910c53dcc59a57d269cf470eee69ed73e40c5e84f1ed0c0c5d4db4f527284f64301e6344
@@ -16,5 +17,6 @@ EBUILD netifrc-0.4.0-r1.ebuild 2200 BLAKE2B 4e2b64944c1c3861855137d181996b5aefc9
 EBUILD netifrc-0.4.0.ebuild 2114 BLAKE2B c86ad92dc6f989b4cf5cb5c22667b0677067079ab194a051a6cd6dc3e8f8fbc0762959faeb5a62dce87a68a35ea0edc996f36ad0b06e98c3cfb25e8ea86631c9 SHA512 7a57c692b7ac6966ec85f7701efd8b85430b2c1933d43599606ec2ae82c2229922330b2ce7fe8982f0da49e49be0b5fdbbb627efbedf65b336bb5399a1c961e2
 EBUILD netifrc-0.5.0.ebuild 2144 BLAKE2B 5c5acc51efe832cff2f5712f6dc750780211e81dadaf89f355156601e97ea337e724d7b1d6b4317d08390a383e18a994d0c4c9a444d062acd1cc7635ad95ba7f SHA512 8c004db0c367e51f3ee064c02e3ea73a18c34f3f3ee601373420c11ebf3f1bc2a2485ebfc476329e580d1122bf8683886bdab36bc96acd78273a649712b554fa
 EBUILD netifrc-0.5.1.ebuild 2134 BLAKE2B 41731e4daf1d0dbea081ff5717b85ce3dbf538d1a72ae3d6898228836c34b1473ea1d38f280de80be88643c967cca8c370559209f716e9b04592bcfa92c1b6c2 SHA512 b57eeb599989d8840a5f1eb9c029ccdd6c1c6fa4be2857e74ade25c100e513a3b3ddff4cebd2052c1ae92047cdb0edb80be411fb4c5570111c4d03decdc8a6b3
+EBUILD netifrc-0.6.0.ebuild 2144 BLAKE2B 5c5acc51efe832cff2f5712f6dc750780211e81dadaf89f355156601e97ea337e724d7b1d6b4317d08390a383e18a994d0c4c9a444d062acd1cc7635ad95ba7f SHA512 8c004db0c367e51f3ee064c02e3ea73a18c34f3f3ee601373420c11ebf3f1bc2a2485ebfc476329e580d1122bf8683886bdab36bc96acd78273a649712b554fa
 EBUILD netifrc-9999.ebuild 2144 BLAKE2B 5c5acc51efe832cff2f5712f6dc750780211e81dadaf89f355156601e97ea337e724d7b1d6b4317d08390a383e18a994d0c4c9a444d062acd1cc7635ad95ba7f SHA512 8c004db0c367e51f3ee064c02e3ea73a18c34f3f3ee601373420c11ebf3f1bc2a2485ebfc476329e580d1122bf8683886bdab36bc96acd78273a649712b554fa
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.6.0.ebuild b/net-misc/netifrc/netifrc-0.6.0.ebuild
new file mode 100644
index 000000000000..ef1c1971295e
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.6.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+	!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	!<sys-fs/udev-init-scripts-27"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+
+	# Install the service file
+	LIBEXECDIR=${EPREFIX}/lib/${PN}
+	UNIT_DIR="$(systemd_get_unitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 46e279cf7518..47bc2c1dd8c7 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,12 +2,14 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
-DIST NetworkManager-1.4.4.tar.xz 3762664 SHA256 829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14 WHIRLPOOL d5e4ca3868c2aa8bceec2029c573b61ccc2fbc9f9a84cb8360ecf7d7503011f0501e9bffd54b163de8e84606ad7977b3c187adb78beed3a44bf2a3ee9821631f
-DIST NetworkManager-1.8.0.tar.xz 3811100 SHA256 fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e SHA512 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c WHIRLPOOL 3e94a50cd50582f9cad26937ee8d597fe275a857882b1fe7ee3a85e3a30cedf16f559064f92afcb00e1703c42b34c0438a0b798538dcedf8cd29da596390b93a
-DIST NetworkManager-1.8.2.tar.xz 3818844 SHA256 71a5efcd9e4c237ab57b2893ccc8f91f884ace3bec0e2bd4b31a4c9677ff1bf4 SHA512 7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d WHIRLPOOL 5928c3d4c1a35dc9485c303f3ce7e7b33c3949a058bd566f8b779d5d6dfa11ee8fc365e1a7954a214cabea70f2239b0f6e2079a67616f5487abbd1d6053260a3
-DIST NetworkManager-1.8.4.tar.xz 3821500 SHA256 625e2eb36386dcae599075226200140d010f213b47f7202d83b3b1a202029212 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1 WHIRLPOOL 68d5721b06a978f4fa5db496f79eb5e56a007fe8966f4e083ed9f6140893e7fcbe0aedaa6357ed6f7fb4ceeae9c8b7aa8d92dd51c3ccd46048d1e1e5f62c1656
+DIST NetworkManager-1.10.0.tar.xz 3884396 BLAKE2B 62f6ce759188fe1c4337922d4c23145da5029ed6fa70eae1de122bd4ce00209b0f7a0d1fdf0b65083baa9a9b304471a6ec79de63ea8e79779f2e27c1cec26e19 SHA512 f1c479396fe50faaca9dfd90b165ec3158148a2fb5a2d7a71cd8d573597566520610d572d6a8ec2b1d27ac2e5409a2ba899f46f9f38c114c5b90f0431e370958
+DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14
+DIST NetworkManager-1.8.0.tar.xz 3811100 BLAKE2B ad8026891ed0f29e80d217d0cbc7965bdc67065462e88068cc6f8cd989ddbcec7095b5d98eab85d8e6fba4f5af5485b2ec0feecafcb6d8324c3ee3c257a0dd64 SHA512 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c
+DIST NetworkManager-1.8.2.tar.xz 3818844 BLAKE2B 97929ae1d071b3e88dbacf9bd1131840066edb031df2e2fe7e15ef5029029d0029efff8836df3f2cf857e95728bfd8f77f6a81cadf45ae8c76a986aba1649709 SHA512 7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d
+DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
+EBUILD networkmanager-1.10.0.ebuild 10709 BLAKE2B fc7e5d74d6b916ab8018f1a7f3ca773d85a4bcf95daa052e1b30326a9f7bf13922ec17883422d0a771002e1d53ddfe3c4a2d072f48c5f4baa1cfb35c61fb9422 SHA512 c04f31d5cac1c6dd094d0bd043d70cd195322e0fd1acf749c9b2f9d0fbafca185cee0289c93078454d10a3e396613e8b3c28cf8b60f3afbe02b2ca9fd42c128a
 EBUILD networkmanager-1.4.4-r1.ebuild 11420 BLAKE2B 2245516cc7f356c194032729459a96c68e684fd1d3e3f78230424dff74648c29a75225d80376793544d15b9e450d7266a5e3457756fb0db9134981ba2d3c29c3 SHA512 35e42a8b58ebbf86980c15807c010246a2e7b90ae537a039c481266393bc1975ce2f7576dfb8bebd65fed2eb090d053bb8accdc09732549ff586b0ac1a04a956
 EBUILD networkmanager-1.8.0.ebuild 10634 BLAKE2B 5ebd3854eb79ae1e7bdc754584f50c86fac6c93b53cc5a083ed456b4d0f01f11e25ddbcd431cafcddb9842f3bb21a0826941e3db572c19df7303b436ff28da1b SHA512 540491cac8d661c19e36b425261b4c595045577f3194cac666e5d2aa7d8dfff09500ceb84f87532a2570637243412ec7f4240545e7180c3415e487e19618455d
 EBUILD networkmanager-1.8.2.ebuild 10688 BLAKE2B 30ce707b2fde2280d021e76cdebf5e453c32a9490463877a8012cbc2bf65e7e2c3611eca110be09ecd8a0a199a8a876e18ec39366e216c44629a1fba4280095d SHA512 373537eb5ec7a6f002f4ba46d87a8e0b774700622a9155bd0eb5e712b65a98ab8f514c4f820abf8dce245677af53d203d7290afb8b8d25fdc8fecdb02e9d281e
 EBUILD networkmanager-1.8.4.ebuild 10684 BLAKE2B 5f5459e190d2c682f9b0cd84495be993ddc22cc6df6bb5961928d647676e9c99b27b0ab8b0ce576228d86f7b623e8289ba7d9b810320367b5d24849be2a833b2 SHA512 95b658dd24645f839870548fd14c1ae03a6f774282adc30cca5ef57c9dcef013438b8894e258b201af37e777f4b1adcf2ea564a5a0475347c8078e3b1e468dd3
-MISC metadata.xml 1771 BLAKE2B 970e55d0996bd0a13484058decb3d5beb5a5b0c0c5281fad7bcce32ca7b26f61fb26b2b1bc007a8877aaed0ac919e99122926034b92f7be7ea030195036a6c48 SHA512 4a61288c3e91ab8eb040053c706fe147e53fd1e9000b9597dc5b2f0920e08efd0e896f308e32758b4af6371b8fb9737f495355d0a9e2e95a9fd883bd10a8c535
+MISC metadata.xml 1824 BLAKE2B f2397e8a74db17eab6a84d75837dc7e144d21d90c304fbe643b05ed13dbf36c553cacc01328bda0ef8e03319c036591b38ef1d49c250e1f2317b1a3e18213091 SHA512 e85f1ec75063c842dbb5c72d8e84158f1a5ac2452e8c19f9b8269c5f6d143399463b4aef9eec918778dd0f3dd0bea70ebb9512165fd1d60e48f93fc577d4d77c
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 8d695c7325d3..c2122068c0f8 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -24,6 +24,7 @@
 			using <pkg>net-misc/modemmanager</pkg></flag>
 		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
 		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
+		<flag name="ovs">Enable OpenVSwitch support</flag>
 		<flag name="ppp">Enable support for mobile broadband and PPPoE
 			connections using <pkg>net-dialup/ppp</pkg></flag>
 		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
diff --git a/net-misc/networkmanager/networkmanager-1.10.0.ebuild b/net-misc/networkmanager/networkmanager-1.10.0.ebuild
new file mode 100644
index 000000000000..48b1dd56d0de
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.10.0.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( dev-libs/jansson[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		# ifnet plugin always disabled until someone volunteers to actively
+		# maintain and fix it
+		--disable-ifnet
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib
+		--with-libnm-glib
+		--with-nmcli=yes
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 6f8ab73637df..1d0705e62144 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -5,4 +5,4 @@ DIST openntpd-6.0p1.tar.gz 432696 SHA256 b1ab80094788912adb12b33cb1f251cc58db392
 DIST openntpd-6.2p1.tar.gz 437376 SHA256 05e1668f89969a6ae064f411cb1d864ca3acb27ebd8fac963e6443ea0788d0bc SHA512 99ad2c8e42de159b1122fe30385eff2f6311202b8526828dacd52db6ec36ce14785131b0576ac5b08d3ed9cadffc142c9146e395da29409b3227c4a77187d31e WHIRLPOOL 4b1d9bc09deda1550182876f36a251c0a07fd5967db6256f420c9933c4bb275108ebf65031f6e8452aa80fed8b31ac490d7b076db47ca110df4f73d54475243f
 EBUILD openntpd-6.0_p1.ebuild 2981 BLAKE2B 6d7269a78250ee665065a5bdd05f07e00db3cf930cf5bcebf1148f9653c17a46639a5fff7fb42c9b904e30c1c09baeaebd573cb83c084318401528baf4f55ea6 SHA512 0789da0c8ff2f0a4dc721f9fb524565680c21ef5f1a3678977d304dfdf324f630171d0e959229157382ab921c8128004637bc46c9a7f25b18d688f2e0192ad79
 EBUILD openntpd-6.2_p1.ebuild 3024 BLAKE2B b1975bff4dbeea844c71310b68d086321eadc51d130dc164c9452dd182ffcd47298a68c4f64f723053e41070788db3f1eb8e267e549941fc6297c7f6e5603a22 SHA512 49b4ea7c20238d7a378cf836b8cf820417e805f498a6082544682e690c8d7e0e12cd44d7cd92fe874c89577a27b7cf76d1a78d5fd5ff6006ace78d243ad7354d
-MISC metadata.xml 890 BLAKE2B 8ed0a8a559eccacdefde9844b1b42bc4de5af809fc8465e9140e9f014afad2910bdc7aaf283a905a1e2150658c55d9176e33a2acb44bb8d0aaee7e9266d4282b SHA512 ab39595387465d950c9895f04aa0a1bf4868e31416c4c3b907cb05b4cd767908480cfa6f5305cf30130e07f4f4ed6253013931e480d68d059a8c0670674d4da0
+MISC metadata.xml 875 BLAKE2B 896cd59152c8cb04bf21cc8845606dee6b5e59542cbcc386771c8f713ae4cbfcdf63347f5d55854f53b26f1533ad5ecdb5e763a20ec636634361c8634894ef13 SHA512 a7817eb4847542787337abca3d184b396c4ae831aee29edc6cb5f666189da76d9282aa71cea3033261e682eb2cb00fc858f85fc4421f52dae798bec44194e361
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 1354e55c3647..1db33088e0cf 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -20,8 +20,6 @@
 		local clock.
 	</longdescription>
 	<use>
-	    <flag name="libressl">Enable HTTPS TLS time constraint support using
-		    <pkg>dev-libs/libressl</pkg>
-	    </flag>
+		<flag name="libressl">Enable HTTPS TLS time constraint support using <pkg>dev-libs/libressl</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 9bf3fe1355ff..be148adadb9e 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -11,11 +11,9 @@ AUX systemd/quagga.conf 33 BLAKE2B 58926119e2e5fe2050c33e598c9a6ef30f792d2c31b98
 AUX systemd/ripd.service 347 BLAKE2B eaca725f889ad7689ba246ecbc20aa78314cc60a5a7d648ed3196afc2272fa0b968b0de088b7e34087d08d25ea053c0756e9cf9d35b358818c8639a4e0ec5d44 SHA512 4251609529c0fe7b8cee1191eae3d13ae1813d5d9544d2844df7e135f341f84cfd2192e6331bb2642da3637f7dd2ec29ffa93df918ecc1e071cfb45802ceabee
 AUX systemd/ripngd.service 364 BLAKE2B e79e086c0bbe3ceb12fadc711a1c88a34034780807d6abc63cad390854140835ab477b7203b8c492baae297f7fbe3085791944d1b2db2a737930c1bf36a81465 SHA512 ccfd048152896ee7ebdc434554a080b8ba36444d4de1cd11b5d2408cddfeb2ea1312962460b9a761d1a2db31dd5e72cadddf1807f9783ac1c2a51fd52c85ad54
 AUX systemd/zebra.service 354 BLAKE2B e22f8e321c5116179937e9c681482e779436092a10548ea4e564a0005f102a8d6dbba17fe5ef2a3952752f1ca6b1539841ccfee25b4a7b03b9e9faca1618004b SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a
-DIST ht-20040304-classless-bgp.patch 1581 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887 SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 WHIRLPOOL cef99d64d52ab8c28bd672fb93dfbd8d716a31c76a5403496a6d104a5ff39531d6085134124d41fe4ff7adf895fa001cbe77b6e42846d849d6c108c81583d04e
-DIST quagga-1.1.1.tar.gz 2871705 SHA256 b5a94e5bdad3062e04595a5692b8cc435f0a85102f75dfdca0a06d093b4ef63f SHA512 51eb64ada07b42c663705cedf56be5b8b54143a5543b472e3dc7c703a4ab0542f39cfbeed64d1c33ceee6a15ea8d25ef84616fa40b6bf9cc32023f7241c18c58 WHIRLPOOL 795aa54b7930c441cbbc40a67db75865ccecada523164c906dd4a1b385b51820bff061ca58265fc67d1a814c8162d8b6e6758a4aab47ba54dab58cf846cb28be
-DIST quagga-1.2.0.tar.gz 2948778 SHA256 1043644d37975d9f920b76c593368cbe36ca43e27eb57cff316ee80ccb31dce3 SHA512 0ad28b828c2e52ad486189bd68e21041fe7c4affada7e3f12ba83a95f3532e0b012ba6b4271f9d0de63d4f5b15e80c706977b3afa54b57a3a5ec02400227d5ae WHIRLPOOL b4c73c4f7c99c971d762fbde79d5c6776b11b36d8a9b58e9c7cb5d322818ef8b6d90ca5c3f4c55f9b3353ae65042a99b41d39049b0a2f254bbd8904e5136ecce
-DIST quagga-1.2.1.tar.gz 2922514 SHA256 aaddba5d4f41ed8e4c2f155f4584c993465d122c9096b5b52ada3fc75266fbcd SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb WHIRLPOOL aeaa20e007a77a8bda469c847ae4de904c8987973e6ad4e358b59c5847226060417efdec8952aa79f8698b76f10da0c257034873365402215d05205e4a1fa866
-EBUILD quagga-1.1.1.ebuild 3614 BLAKE2B 820408c4c5259a4f2e74296b7bdb8211d0aeef089b4843d7e30e68cbf8ea094466fec738a0a436a58a92d197f2d6dee3047a7e210a6e077e19dcf4f77e49fc68 SHA512 93b78444d67d4206ec008566a3953c7c4c05ab325f79b3c9d29029ec9ded97283c48e376dfc273496598e7e8a7c665f74e08970ad9ee78bcdf39b4e19f1f698a
-EBUILD quagga-1.2.0-r2.ebuild 3734 BLAKE2B c9ff70d32976d36afe4548824e574e567375717bcb321cbc69a2b160020c4ab27b7cfa40828366f4c97ecafe0271c0b607ad67a732e1fe66b8a3b79da94429e1 SHA512 c6317db3cc11f0d6f941a0665c52fc1b1af7648dea08a5d44a0cad1f218c2b14d4ae19d8b7d8f71a8776a2ef1a0975f9335a32fd5197bff19aecb5312a12d60f
+DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8
+DIST quagga-1.2.1.tar.gz 2922514 BLAKE2B ab0a59c1162bb4ac8ba3a75c015a433e2022bc35cd2a4678dbc7c80510f8c687d944b5e2bac03e9d3362bdb20badb2c17228dfd4172eebc6c87b24b2be2276e4 SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb
+DIST quagga-1.2.2.tar.gz 2986142 BLAKE2B 2c2326e015ed4ce7364a960b56108bbd04c184b7cd78dca0cac528cd2869e65e6efbd40c303ce2b6eb29eed809e8b384baa36329b365ae6799a5b25fa21daa4c SHA512 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14
 EBUILD quagga-1.2.1.ebuild 3679 BLAKE2B c71ad696b777ddec0bdfcee4fbb142fc7c55aa7b3d676d1caf56515915aa0fef6d8c825da864c23a685d02f977b0cb9b6eec5335c2a952facaad136ec7efef2e SHA512 c17c0b0d74088b0dd05ca2c3a7fddc471ff5b1fcbb888b94c0117d73f4e74842e21e832923a050cef3fb3666fbba4d20d1a13b0a75836a902fc4b1a1da60d516
+EBUILD quagga-1.2.2.ebuild 3647 BLAKE2B a8efa0d6375ab32edae0b0ed76e265ac9cb3242c6728dff37bc5ed9c8419b74af72c5cf0a7a66433bd01c5b182b6b22e0c1167fa1dedfaf5e5fb145cd8569d24 SHA512 2c4fdfff487cf0ba7d31994b2908cd02d6e84f2c386f6b5464569b9cd3be2daedfd70c28c72c28e4b923c3c0abf9072c6aa6617359d7ad43945d15d13347635b
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.1.1.ebuild b/net-misc/quagga/quagga-1.1.1.ebuild
deleted file mode 100644
index 0cf903443f32..000000000000
--- a/net-misc/quagga/quagga-1.1.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
-
-inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
-HOMEPAGE="http://quagga.net/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
-	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~s390 sparc x86"
-
-IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra"
-
-COMMON_DEPEND="
-	caps? ( sys-libs/libcap )
-	protobuf? ( dev-libs/protobuf-c:0= )
-	readline? (
-		sys-libs/readline:0=
-		pam? ( sys-libs/pam )
-	)
-	snmp? ( net-analyzer/net-snmp )
-	!elibc_glibc? ( dev-libs/libpcre )"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/gawk
-	sys-devel/libtool:2"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
-)
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
-You have to create config files in /etc/quagga before
-starting one of the daemons.
-
-You can pass additional options to the daemon by setting the EXTRA_OPTS
-variable in their respective file in /etc/conf.d"
-
-pkg_setup() {
-	enewgroup quagga
-	enewuser quagga -1 -1 /var/empty quagga
-}
-
-src_prepare() {
-	# Classless prefixes for BGP
-	# http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
-
-	eapply "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# do not build PDF docs
-	export ac_cv_prog_PDFLATEX=no
-	export ac_cv_prog_LATEXMK=no
-
-	econf \
-		--enable-exampledir=/usr/share/doc/${PF}/samples \
-		--enable-irdp \
-		--enable-isisd \
-		--enable-isis-topology \
-		--enable-pimd \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--with-pkg-extra-version="-gentoo" \
-		--sysconfdir=/etc/quagga \
-		--localstatedir=/run/quagga \
-		--disable-static \
-		$(use_enable caps capabilities) \
-		$(usex snmp '--enable-snmp' '' '' '') \
-		$(use_enable !elibc_glibc pcreposix) \
-		$(use_enable tcp-zebra) \
-		$(use_enable doc) \
-		$(usex multipath $(use_enable multipath) '' '=0' '') \
-		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
-		$(use_enable readline vtysh) \
-		$(use_with pam libpam) \
-		$(use_enable protobuf) \
-		$(use_enable ipv6 ripngd) \
-		$(use_enable ipv6 ospf6d) \
-		$(use_enable ipv6 rtadv)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	readme.gentoo_create_doc
-
-	keepdir /etc/quagga
-	fowners root:quagga /etc/quagga
-	fperms 0770 /etc/quagga
-
-	# Path for PIDs before first reboot should be created here, bug #558194
-	dodir /run/quagga
-	fowners quagga:quagga /run/quagga
-	fperms 0770 /run/quagga
-
-	# Install systemd-related stuff, bug #553136
-	systemd_dotmpfilesd "${FILESDIR}/systemd/quagga.conf"
-	systemd_dounit "${FILESDIR}/systemd/zebra.service"
-
-	# install zebra as a file, symlink the rest
-	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
-
-	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd); do
-		dosym zebra /etc/init.d/${service}
-		systemd_dounit "${FILESDIR}/systemd/${service}.service"
-	done
-
-	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
-
-	insinto /etc/logrotate.d
-	newins redhat/quagga.logrotate quagga
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/quagga/quagga-1.2.0-r2.ebuild b/net-misc/quagga/quagga-1.2.2.ebuild
index 6897c5f9eac8..0b061a38a75e 100644
--- a/net-misc/quagga/quagga-1.2.0-r2.ebuild
+++ b/net-misc/quagga/quagga-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
 
-inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user
+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/"
@@ -14,7 +14,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc x86"
 
 IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra"
 
@@ -89,7 +89,7 @@ src_configure() {
 		$(use_enable tcp-zebra) \
 		$(use_enable doc) \
 		$(usex multipath $(use_enable multipath) '' '=0' '') \
-		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
+		$(usex ospfapi '--enable-ospfclient' '' '' '') \
 		$(use_enable readline vtysh) \
 		$(use_with pam libpam) \
 		$(use_enable nhrpd) \
@@ -108,13 +108,8 @@ src_install() {
 	fowners root:quagga /etc/quagga
 	fperms 0770 /etc/quagga
 
-	# Path for PIDs before first reboot should be created here, bug #558194
-	dodir /run/quagga
-	fowners quagga:quagga /run/quagga
-	fperms 0770 /run/quagga
-
 	# Install systemd-related stuff, bug #553136
-	systemd_dotmpfilesd "${FILESDIR}/systemd/quagga.conf"
+	dotmpfiles "${FILESDIR}/systemd/quagga.conf"
 	systemd_dounit "${FILESDIR}/systemd/zebra.service"
 
 	# install zebra as a file, symlink the rest
@@ -132,5 +127,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	# Path for PIDs before first reboot should be created here, bug #558194
+	tmpfiles_process quagga.conf
+
 	readme.gentoo_print_elog
 }
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 969d596ffcd8..b5b133910c25 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -5,4 +5,4 @@ DIST rdesktop-1.8.3.tar.gz 320212 SHA256 88b20156b34eff5f1b453f7c724e0a3ff9370a5
 EBUILD rdesktop-1.8.3-r1.ebuild 1854 BLAKE2B 6836ceeb60e7342292eba2c8d007841011e9c299902478240154e5bf608455008b92d14452c5227f2177e50ef8fb6f9235057a801690c2526459da58aec47b0f SHA512 4c70505726e22fba07d333ccea0bdf6a8364d04bded7df577839f1300d585f490f0774ac3810fad0cd39b3410d76d199439eb600700c48f4d5878a08036800c7
 EBUILD rdesktop-1.8.3-r2.ebuild 1907 BLAKE2B 3636154af2f39d9c2c8cb34e05a5d6f8d7b9c86af15691d954e741f313409a41927ffb1d504e812fad576a8c9a0e3565998435ad107f7ae8a5e53a3ea0c52e99 SHA512 599d6900a1fd58c137abcba8e9c3651e8937b9414d63377bd29291367b9586ae7d71ec95c2261c35a4a78bc5d6895df78f9e63da9392f549f71c8d0d6b93fea2
 EBUILD rdesktop-1.8.3.ebuild 1814 BLAKE2B 650a04a637c6a34d9e1bd2e3986e2ebc1ca481171a15bfe9826bd7a37914946291460290c68458dfb108b3a5f95420fd189a3282cbdabe5e0f7bfae683be6e2f SHA512 fb0ae6e70dd092e8e27499e9dab31a3c0bb86085e1c7a2b0f6e8b225c02ce09570f7b87a603dd8a23f3b473ad04917c38f3213cba2c0a55afa439c80707534a9
-MISC metadata.xml 932 BLAKE2B 258becdebcec3b7b75937c5a2912e2c93f13ea8dd2a99e4d32f2a099e290ea61070c8da615311f6e532115a0aaa1f06596eda96a6adf3bf6c4443a8af3195a85 SHA512 b9be53b9e3f386055e9e92bdb73dfe7ab761ee39af5c9edeef82cf54ce067d802a850eaf8a629bb3159446b66eadaa6dc2301c0eb17ffbd655a6171fc5290edc
+MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index f1f3b0c0a220..905d0e56c9b9 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>voyageur@gentoo.org</email>
-    <name>Bernard Cafarelli</name>
-  </maintainer>
-  <longdescription>
-An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
-</longdescription>
-  <use>
-    <flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
-    <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
-	<flag name="xrandr">Enable XRandR window extension support</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">rdesktop</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
+	</longdescription>
+	<use>
+		<flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
+		<flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
+		<flag name="xrandr">Enable XRandR window extension support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">rdesktop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 662b95bd5d26..464087a633e0 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -5,5 +5,5 @@ DIST remmina-1.2.0_rc24.tar.gz 1052140 SHA256 7d959485469b8e99d4d950e6e916b22e28
 EBUILD remmina-1.2.0_rc16-r1.ebuild 1987 BLAKE2B 005618e52733a4ed61084f51c553581e10a93abd5337f46156c395a4da672253cf3940a19abea0fa345c99f4091d32fc4c372f662b60d157cc9e769c9cb24e43 SHA512 8301d870a34688124dafbd9199c5364ab9fe7d3b4439e0d3fd62258bb64d89544b212ecd73dcb194ddbee17d8aa7308e09182f127bc74319c5ee27ac7c7627ce
 EBUILD remmina-1.2.0_rc20.ebuild 1917 BLAKE2B e0a31733df359a197f2ff84c1f51e406a291e18c26225261858ac838c4b667d0255b23f4167fdb4c911950d053c20f6652e7e0192b5e935c15e40bc5653e29c7 SHA512 3312e56870c95d24962805d2fa7bc6bab8d31b52f69650501ba7c25deec47ddddfd93aa8fffb4dfcad931744c1a48b63f361286a89235286044645e79660688c
 EBUILD remmina-1.2.0_rc21.ebuild 2009 BLAKE2B 8ec23ea98d38fdb189fcc200416ccee98ba9599274543fd922053b4376ed4bb3ae0dfcb9af24b39e925e989b3153672a1341c1f564b64b09f37ccc4805b500e9 SHA512 e3da5aa9cdbe94bc3bc61f2540495879d6ee1b69931f673ed126dfcf071379c5ee96d18a0c9e3e2a076029172e94333ebd81dbfe816d5b28bc35ca48d6eb5fe7
-EBUILD remmina-1.2.0_rc24.ebuild 2009 BLAKE2B 8ec23ea98d38fdb189fcc200416ccee98ba9599274543fd922053b4376ed4bb3ae0dfcb9af24b39e925e989b3153672a1341c1f564b64b09f37ccc4805b500e9 SHA512 e3da5aa9cdbe94bc3bc61f2540495879d6ee1b69931f673ed126dfcf071379c5ee96d18a0c9e3e2a076029172e94333ebd81dbfe816d5b28bc35ca48d6eb5fe7
+EBUILD remmina-1.2.0_rc24.ebuild 2008 BLAKE2B a42fb0c094979828b64b7b05d9d57cf17cbba8a629a1b747fb9cc604ec50818b09f8fdfe7408036f199442875c4595b225761f5b8a6a1f140978aab1e84552e6 SHA512 0f0a9ad6281b8d5dde23e965f13a528d49e6897a02f8c1d0552b607df46726200cb369dee498651f6e2ab236820ba8da17dc25dc021c1e14005f28bde39dc336
 MISC metadata.xml 1246 BLAKE2B a091f5d6a13aa88f677e99bbb408d1f9ffec47def14a95e276598cabd1619941d83bbb19acef3c8dda7fa897887e1f1d9fd03e8784b4b969d35aa1bfc8286054 SHA512 4116cdb618584c5b95ff0330fb9c9efad2736cafcf4e3622fd074d5026f1adc5b7ab8e420188bc3a689b31cc285318db953bfa66c54b7fe91de242136787a5d8
diff --git a/net-misc/remmina/remmina-1.2.0_rc24.ebuild b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
index e0491b743f19..6e63be10d66e 100644
--- a/net-misc/remmina/remmina-1.2.0_rc24.ebuild
+++ b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf"
 
 CDEPEND="
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index c8708c2f4dab..f59bf027dade 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -8,4 +8,4 @@ AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 SHA256 09a8e30ca37ec86e7bbdc59b1b59789a6a3172d423a71382774732f19d0e9173 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965 WHIRLPOOL 0ca06284a408ba9fe6ff5b2aac0b2f8808226812b80403a9cf45b575a9b15320a03391882eb42b5e000a3c475cc5fbc531b657ca01434a7e9061b2bc49405534
 DIST sitecopy-0.16.6.tar.gz 1022265 SHA256 e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734 WHIRLPOOL 7f9e40649e20720bcb3dcfd397c1df6525bc8de5d08779770fe094cc7d2ce9c750d74bad6dbf8e307ee4a2bf8d1e1df21a4616becec3f03fbb6e0e604df5585f
 EBUILD sitecopy-0.16.6-r1.ebuild 3337 BLAKE2B 325be931832211c6c907001bc3d6068dd065acb387047763d6d2397d01b42315766922149cac38196875bed45c9a809bac86af017d37ae3a053506ecf6ca958e SHA512 90974bfa8bafed38ef4886c932f3a569f1db7e334e07819a046138d3f9495c91e75d184b58237a7b958837ec0f4fc85ad77fc8270657a578d17e5d257d180128
-MISC metadata.xml 880 BLAKE2B a68ab727796cbd9123d52f358a200479e866d9ed98f22941e6a12a72c754084e30b4345ca9d45ad447ac6fe39cc0d16bcb779b06124dfb0022dde6681f2b47dc SHA512 543379bb5a41af9e5fa8386e07ddce7e7a0120ea7a2c849d1805774b1edd12fc8a64fd82051288a3e2e320940b25111f06de030b601c6e1c6b4cafe77f6a80d4
+MISC metadata.xml 869 BLAKE2B d9c3132940c8b79f813a472658ef19151c01d85df95091e1188a59a91b5b6e2efbde05a3b676eeceff7dfb94e2f821f310348e715929a83dec48f6dd3c57d9c9 SHA512 ef107427ddbec599b4cad2f5359e798bb9e7e51ad11078e6f1e6c6e2bd1688d2d4d1d3daed192cf82f8cdb9353e76f9b37099eb92d2b4052ee319cfb201e3a3c
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index b03b823d1292..01ac751452b1 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  	<email>rogerx.oss@gmail.com</email>
-	<name>Roger Zauner</name>
-	<description>Maintainer. Assign bugs to him</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <use>
-    <flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.</flag>
-    <flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
-  </use>
+	<maintainer type="person">
+		<email>rogerx.oss@gmail.com</email>
+		<name>Roger Zauner</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.</flag>
+		<flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 9cc1b3781ed6..8355f7926239 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -8,7 +8,9 @@ AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc
 DIST stunnel-5.36.tar.gz 645205 SHA256 eb8952fcfdfcdf5056a1f1a78e1ec5014b819c5f5f7599b924dc4490ffe4b5ea SHA512 663dd155aab17b628fd1ef8ae1c604efc0cdf026566e98fbff16ba4da5b12b06cd6801bf4f604a9b2ea98d993c184ce97c63c1f716fa86b5e630e5fd504e3317 WHIRLPOOL 12f95a119b840b6afdcaf4d41ee325896bc89feda9ed172651dee1b52a3231fe1599c8fb6c69c1a0f93b342a3b785fb3d002a94a31b14678052313f224c48d0e
 DIST stunnel-5.40.tar.gz 648828 SHA256 23acdb390326ffd507d90f8984ecc90e0d9993f6bd6eac1d0a642456565c45ff SHA512 2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2 WHIRLPOOL 5f9fa99d8e6e153abd15896bd704f42324a8f376633e65685fc7b3d80f06b52048eba923c16a8fbb57e09624a65f0f957fc169e1b9f89d683b67c1cee1ba71b0
 DIST stunnel-5.43.tar.gz 698715 SHA256 05915babf705a0494886a72a7367913d403d07fc908ebb7b380d639e2d8bcee2 SHA512 3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8 WHIRLPOOL 3da1656e5937dd1155431fcffd59d523de05a9957a46c8c44edae9493e153919972b1c03b292d6833b4e5ab6a1d8f6b40987f5baa9be9600397430462566b0da
+DIST stunnel-5.44.tar.gz 699117 BLAKE2B 956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664 SHA512 a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
 EBUILD stunnel-5.36.ebuild 2899 BLAKE2B a4c62a1a79157b5b24a8904dacbe45a44b22b53710b44a5bb5c3823e29df666024e8300d82cc6fc5e52a9f8cedad0beaaadc5ee4bec4d366f2544587009c73db SHA512 ffeac1d20a4a83fcda56ae36b81e7a230ae18ad786fdbd51024b0f87b013c9988538cb92d8757869b3337fc78cf25e605fa31fe3d54b437df59c3f1d4a8ec595
 EBUILD stunnel-5.40.ebuild 2930 BLAKE2B b18d32b276cb28e83b8f99b5c495c929c3c6ddff54a7580be3387aa4d5e114feed917bdf4a7faa4136850cdea0ba019fdc3c86fb28268f23f23a125ceb7b896e SHA512 6034f34af01ed21b16474f1ec4a76249d9ee2f14e4312ecf8d7cb75f66f49e9e641328fa4904cc9adec6d9cb480e63187ed9bb9a6263846ef2eaf7a2d8f3eb20
 EBUILD stunnel-5.43.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
+EBUILD stunnel-5.44.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.44.ebuild b/net-misc/stunnel/stunnel-5.44.ebuild
new file mode 100644
index 000000000000..cb4aa4447841
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.44.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# libressl compat
+	eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index defd83fdb19a..359d07a55b8e 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,13 +1,8 @@
-AUX tigervnc-1.7.1-xserver119-compat.patch 13889 BLAKE2B 0e8bc1023713c671a25d5f461f691aa61ec4497255b7716c89fb9864db02ed5e4bd7c459653acd2538dd497798d326e340fb6e452466c8a599016553191e85d3 SHA512 3be73f862020220b82de65e03c5678c623b2295f44a70afd577136b0c8358b8512b08604753c74dcd7a49977ed164e6a2e76f6c400b304f8aad7f8b2d999e544
 AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4
 AUX tigervnc.initd 1974 BLAKE2B bb909f75ecbb7f33db4a0e3a7a1ee59bf9c60d5cbef4d432efa9e741f10d341e1a76e2c2a9780ecc7bdbd4a3e78c6286e9749f24a1d07b768584ad6203931477 SHA512 b0d43352551cf3cbcfe404dcbfe5617965e08674d5af0f7ec801c9124d7ab0279d9bb8f76b6141b5ad96a70df9c99d5b6cfff0ba29211a37a344906d105e1bc8
 AUX xserver119.patch 3681 BLAKE2B 04a4bac19c1e7463b916647e92017ea14af4a9e1140db229383d574381a24f30e68042b6b383fdf18cb0dee90b4d535183121076a6638fb8454222013dae85a8 SHA512 531c3b99c5402a66f95ed5743dd37ae9de493cd9bb2e63b39afdd2d536ae438b3c5e2618226f070adc62e41b169837ae7a3302b7bb131b181361a7b142a9e93f
-DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
-DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc SHA512 babdc362b28d7af80c7efbb3a1aadf158d7f29621afe36d785748af45e515e2718cf1011359db7b39c218770b3f3ee2767e08abc58091f018c08ba9739a3e68d WHIRLPOOL 178d6b3fb7569cfb2de5dd144031b441b02a865574928d20f1589fd6f933b9276477292182cde56e948ab75d2fc0bea4d79f71bcddb33f6057970a7caa08b2cc
-DIST tigervnc-1.8.0.tar.gz 1433830 SHA256 9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a WHIRLPOOL 4001182ec2da3551b0eb2d6ee863c225340b474dc6d32cbe4c0941e421852a10913ee80706009b1a59043b6983ac2bc42f070d1a5aa97eefe1cff3c97497b2f0
-DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
+DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037 SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
+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
-EBUILD tigervnc-1.7.1-r2.ebuild 4653 BLAKE2B 439466d1369b798df4747bdd1ca14917f0dd3c57457f0d513b2cdbd61f55520dc8e49b6760a6438949c177cdb381a7903a7bced71c4a0163a0c87d8a706ace2f SHA512 22cc6f1fd7db870a615b88ebd775fe8afe41021c48278c12d5a3258196b08fe30ac529010f42cce2f3ac0839fbf1f63aaa8878c61d5fb3bc18e688fc7e3ae458
-EBUILD tigervnc-1.7.1-r4.ebuild 4738 BLAKE2B 8d64b8bcc40079df7d07de5a724ca5198690f571f255d88e841a211d7da3840e83ce81e2cbddc8342bf15ed478d01ca5401ef94d5760e3675aa018514d648df3 SHA512 96805da2397ac252fb7238cd7ddb06af21e78e3b6c0af8d54dbe49ee99645f49f871e55cc7bc44369656c5f356c8192c08e89516b962dfa5c6b8e948d8ea313f
 EBUILD tigervnc-1.8.0.ebuild 4541 BLAKE2B 69e2048ec440910bf941f0d60826243d1ee3c156d614c2abb1a0bb32b62887119fad4d02e6babd0888f339864bf1ca054cb93f4f5bd034ce958e752b48eb770d SHA512 24fc22d60a36d37c5c62df2cf2e20f0852c4797285baf4ab50d5a97395ee7129cfde1758fe280101f3664320e14aceb7548d4265cefbb48351ac3cd0526a8d45
 MISC metadata.xml 671 BLAKE2B 6c11feefea25aaeea974f4cc73eaf39d9303f4755bfe4515afc069490a6d742e4299f9dd70189ddf45ff04ed1a346fa0857f09092fe016b2db1a1b8bd70f2372 SHA512 e2416162e344db1025f15b89754c6f84f9b69217b86abe15bb6d048ae80bcc0a84df6943ada53c71f6bc6236f13f7add3e5f03a9e52cc61da060a391b8a69a44
diff --git a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch b/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
deleted file mode 100644
index 192344257a5e..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
+++ /dev/null
@@ -1,446 +0,0 @@
-From 3fed95eda27dfbeee6535f987f5d14a66f64749b Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 5 Oct 2016 11:15:27 +0200
-Subject: [PATCH] Add xorg-xserver 1.19 support
-
----
- unix/xserver/hw/vnc/XserverDesktop.cc | 183 ++++++++++++++++++++++++++++++++++
- unix/xserver/hw/vnc/XserverDesktop.h  |   7 ++
- unix/xserver/hw/vnc/vncBlockHandler.c |  19 ++++
- unix/xserver/hw/vnc/vncExtInit.cc     |  13 +++
- unix/xserver/hw/vnc/vncExtInit.h      |   5 +
- unix/xserver/hw/vnc/vncHooks.c        |  21 +++-
- unix/xserver/hw/vnc/xorg-version.h    |   4 +-
- unix/xserver119.patch                 |  95 ++++++++++++++++++
- 8 files changed, 343 insertions(+), 4 deletions(-)
- create mode 100644 unix/xserver119.patch
-
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
-index 4f82a54..8cc0b0b 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.cc
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
-@@ -90,6 +90,30 @@ class FileHTTPServer : public rfb::HTTPServer {
-   XserverDesktop* desktop;
- };
- 
-+#if XORG >= 119
-+extern "C" {
-+/*
-+ * xserver NotifyFd callbacks. Note we also expect write notifies to work,
-+ * which only works with xserver >= 1.19.
-+ */
-+#include "os.h"
-+
-+static void HandleListenFd(int fd, int xevents, void *data)
-+{
-+  XserverDesktop *desktop = (XserverDesktop *)data;
-+
-+  desktop->handleListenFd(fd);
-+}
-+
-+static void HandleSocketFd(int fd, int xevents, void *data)
-+{
-+  XserverDesktop *desktop = (XserverDesktop *)data;
-+
-+  desktop->handleSocketFd(fd, xevents);
-+}
-+
-+}
-+#endif
- 
- XserverDesktop::XserverDesktop(int screenIndex_,
-                                std::list<network::TcpListener*> listeners_,
-@@ -111,15 +135,35 @@ XserverDesktop::XserverDesktop(int screenIndex_,
- 
-   if (!httpListeners.empty ())
-     httpServer = new FileHTTPServer(this);
-+
-+#if XORG >= 119
-+  for (std::list<TcpListener*>::iterator i = listeners.begin();
-+       i != listeners.end();
-+       i++) {
-+    SetNotifyFd((*i)->getFd(), HandleListenFd, X_NOTIFY_READ, this);
-+  }
-+
-+  for (std::list<TcpListener*>::iterator i = httpListeners.begin();
-+       i != httpListeners.end();
-+       i++) {
-+    SetNotifyFd((*i)->getFd(), HandleListenFd, X_NOTIFY_READ, this);
-+  }
-+#endif
- }
- 
- XserverDesktop::~XserverDesktop()
- {
-   while (!listeners.empty()) {
-+#if XORG >= 119
-+    RemoveNotifyFd(listeners.back()->getFd());
-+#endif
-     delete listeners.back();
-     listeners.pop_back();
-   }
-   while (!httpListeners.empty()) {
-+#if XORG >= 119
-+    RemoveNotifyFd(listeners.back()->getFd());
-+#endif
-     delete httpListeners.back();
-     httpListeners.pop_back();
-   }
-@@ -389,6 +433,140 @@ void XserverDesktop::add_copied(const rfb::Region &dest, const rfb::Point &delta
-   }
- }
- 
-+#if XORG >= 119
-+void XserverDesktop::handleListenFd(int fd)
-+{
-+  std::list<TcpListener*>::iterator i;
-+  SocketServer *fd_server = NULL;
-+  bool is_http = false;
-+
-+  for (i = listeners.begin(); i != listeners.end(); i++) {
-+    if ((*i)->getFd() == fd) {
-+      fd_server = server;
-+      break;
-+    }
-+  }
-+  if (httpServer && !fd_server) {
-+    for (i = httpListeners.begin(); i != httpListeners.end(); i++) {
-+      if ((*i)->getFd() == fd) {
-+        fd_server = httpServer;
-+        is_http = true;
-+        break;
-+      }
-+    }
-+  }
-+  if (!fd_server) {
-+    vlog.error("XserverDesktop::handleListenFd: Error cannot find fd");
-+    return;
-+  }
-+
-+  Socket* sock = (*i)->accept();
-+  sock->outStream().setBlocking(false);
-+  vlog.debug("new %sclient, sock %d", is_http ? "http " : "", sock->getFd());
-+  fd_server->addSocket(sock);
-+  SetNotifyFd(sock->getFd(), HandleSocketFd, X_NOTIFY_READ, this);
-+}
-+
-+void XserverDesktop::handleSocketFd(int fd, int xevents)
-+{
-+  std::list<Socket*> sockets;
-+  std::list<Socket*>::iterator i;
-+  SocketServer *fd_server = NULL;
-+  bool is_http = false;
-+
-+  server->getSockets(&sockets);
-+  for (i = sockets.begin(); i != sockets.end(); i++) {
-+    if ((*i)->getFd() == fd) {
-+      fd_server = server;
-+      break;
-+    }
-+  }
-+  if (httpServer && !fd_server) {
-+    httpServer->getSockets(&sockets);
-+    for (i = sockets.begin(); i != sockets.end(); i++) {
-+      if ((*i)->getFd() == fd) {
-+        fd_server = httpServer;
-+        is_http = true;
-+        break;
-+      }
-+    }
-+  }
-+  if (!fd_server) {
-+    vlog.error("XserverDesktop::handleSocketFd: Error cannot find fd");
-+    return;
-+  }
-+
-+  if (xevents & X_NOTIFY_READ)
-+    fd_server->processSocketReadEvent(*i);
-+
-+  if (xevents & X_NOTIFY_WRITE)
-+    fd_server->processSocketWriteEvent(*i);
-+
-+  if ((*i)->isShutdown()) {
-+    vlog.debug("%sclient gone, sock %d", is_http ? "http " : "", fd);
-+    RemoveNotifyFd(fd);
-+    fd_server->removeSocket(*i);
-+    if (!is_http)
-+      vncClientGone(fd);
-+    delete (*i);
-+  }
-+}
-+
-+void XserverDesktop::blockHandler(int* timeout)
-+{
-+  // We don't have a good callback for when we can init input devices[1],
-+  // so we abuse the fact that this routine will be called first thing
-+  // once the dix is done initialising.
-+  // [1] Technically Xvnc has InitInput(), but libvnc.so has nothing.
-+  vncInitInputDevice();
-+
-+  try {
-+    std::list<Socket*> sockets;
-+    std::list<Socket*>::iterator i;
-+    server->getSockets(&sockets);
-+    for (i = sockets.begin(); i != sockets.end(); i++) {
-+      int fd = (*i)->getFd();
-+      if ((*i)->isShutdown()) {
-+        vlog.debug("client gone, sock %d",fd);
-+        server->removeSocket(*i);
-+        vncClientGone(fd);
-+        delete (*i);
-+      } else {
-+        /* Update existing NotifyFD to listen for write (or not) */
-+        if ((*i)->outStream().bufferUsage() > 0)
-+          SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ | X_NOTIFY_WRITE, this);
-+        else
-+          SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ, this);
-+      }
-+    }
-+    if (httpServer) {
-+      httpServer->getSockets(&sockets);
-+      for (i = sockets.begin(); i != sockets.end(); i++) {
-+        int fd = (*i)->getFd();
-+        if ((*i)->isShutdown()) {
-+          vlog.debug("http client gone, sock %d",fd);
-+          httpServer->removeSocket(*i);
-+          delete (*i);
-+        } else {
-+          /* Update existing NotifyFD to listen for write (or not) */
-+          if ((*i)->outStream().bufferUsage() > 0)
-+            SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ | X_NOTIFY_WRITE, this);
-+          else
-+            SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ, this);
-+        }
-+      }
-+    }
-+
-+    int nextTimeout = server->checkTimeouts();
-+    if (nextTimeout > 0 && (*timeout == -1 || nextTimeout < *timeout))
-+      *timeout = nextTimeout;
-+  } catch (rdr::Exception& e) {
-+    vlog.error("XserverDesktop::blockHandler: %s",e.str());
-+  }
-+}
-+
-+#else
-+
- void XserverDesktop::readBlockHandler(fd_set* fds, struct timeval ** timeout)
- {
-   // We don't have a good callback for when we can init input devices[1],
-@@ -603,10 +781,15 @@ void XserverDesktop::writeWakeupHandler(fd_set* fds, int nfds)
-   }
- }
- 
-+#endif
-+
- void XserverDesktop::addClient(Socket* sock, bool reverse)
- {
-   vlog.debug("new client, sock %d reverse %d",sock->getFd(),reverse);
-   server->addSocket(sock, reverse);
-+#if XORG >= 119
-+  SetNotifyFd(sock->getFd(), HandleSocketFd, X_NOTIFY_READ, this);
-+#endif
- }
- 
- void XserverDesktop::disconnectClients()
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
-index c069028..9e77627 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.h
-+++ b/unix/xserver/hw/vnc/XserverDesktop.h
-@@ -38,6 +38,7 @@
- #include <rfb/VNCServerST.h>
- #include <rdr/SubstitutingInStream.h>
- #include "Input.h"
-+#include "xorg-version.h"
- 
- namespace rfb {
-   class VNCServerST;
-@@ -69,10 +70,16 @@ class XserverDesktop : public rfb::SDesktop, public rfb::FullFramePixelBuffer,
-                  const unsigned char *rgbaData);
-   void add_changed(const rfb::Region &region);
-   void add_copied(const rfb::Region &dest, const rfb::Point &delta);
-+#if XORG >= 119
-+  void handleListenFd(int fd);
-+  void handleSocketFd(int fd, int xevents);
-+  void blockHandler(int* timeout);
-+#else
-   void readBlockHandler(fd_set* fds, struct timeval ** timeout);
-   void readWakeupHandler(fd_set* fds, int nfds);
-   void writeBlockHandler(fd_set* fds, struct timeval ** timeout);
-   void writeWakeupHandler(fd_set* fds, int nfds);
-+#endif
-   void addClient(network::Socket* sock, bool reverse);
-   void disconnectClients();
- 
-diff --git a/unix/xserver/hw/vnc/vncBlockHandler.c b/unix/xserver/hw/vnc/vncBlockHandler.c
-index 4e44478..baebc3d 100644
---- a/unix/xserver/hw/vnc/vncBlockHandler.c
-+++ b/unix/xserver/hw/vnc/vncBlockHandler.c
-@@ -30,6 +30,23 @@
- 
- #include "vncExtInit.h"
- #include "vncBlockHandler.h"
-+#include "xorg-version.h"
-+
-+#if XORG >= 119
-+
-+static void vncBlockHandler(void* data, void* timeout)
-+{
-+  vncCallBlockHandlers(timeout);
-+}
-+
-+void vncRegisterBlockHandlers(void)
-+{
-+  if (!RegisterBlockAndWakeupHandlers(vncBlockHandler,
-+                                      (ServerWakeupHandlerProcPtr)NoopDDA, 0))
-+    FatalError("RegisterBlockAndWakeupHandlers() failed\n");
-+}
-+
-+#else
- 
- static void vncBlockHandler(void * data, OSTimePtr t, void * readmask);
- static void vncWakeupHandler(void * data, int nfds, void * readmask);
-@@ -144,3 +161,5 @@ static void vncWriteWakeupHandlerFallback(void)
- 
-   vncWriteWakeupHandler(ret, &fallbackFds);
- }
-+
-+#endif
-diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
-index dea3cb8..9d70e44 100644
---- a/unix/xserver/hw/vnc/vncExtInit.cc
-+++ b/unix/xserver/hw/vnc/vncExtInit.cc
-@@ -249,6 +249,17 @@ int vncExtensionIsActive(int scrIdx)
-   return (desktop[scrIdx] != NULL);
- }
- 
-+#if XORG >= 119
-+
-+void vncCallBlockHandlers(int* timeout)
-+{
-+  for (int scr = 0; scr < vncGetScreenCount(); scr++)
-+    if (desktop[scr])
-+      desktop[scr]->blockHandler(timeout);
-+}
-+
-+#else
-+
- void vncCallReadBlockHandlers(fd_set * fds, struct timeval ** timeout)
- {
-   for (int scr = 0; scr < vncGetScreenCount(); scr++)
-@@ -277,6 +288,8 @@ void vncCallWriteWakeupHandlers(fd_set * fds, int nfds)
-       desktop[scr]->writeWakeupHandler(fds, nfds);
- }
- 
-+#endif
-+
- int vncGetAvoidShiftNumLock(void)
- {
-   return (bool)avoidShiftNumLock;
-diff --git a/unix/xserver/hw/vnc/vncExtInit.h b/unix/xserver/hw/vnc/vncExtInit.h
-index 9785d11..3164528 100644
---- a/unix/xserver/hw/vnc/vncExtInit.h
-+++ b/unix/xserver/hw/vnc/vncExtInit.h
-@@ -22,6 +22,7 @@
- #include <stdint.h>
- #include <stddef.h>
- #include <sys/select.h>
-+#include "xorg-version.h"
- 
- // Only from C++
- #ifdef __cplusplus
-@@ -50,10 +51,14 @@ extern int vncInetdSock;
- void vncExtensionInit(void);
- int vncExtensionIsActive(int scrIdx);
- 
-+#if XORG >= 119
-+void vncCallBlockHandlers(int* timeout);
-+#else
- void vncCallReadBlockHandlers(fd_set * fds, struct timeval ** timeout);
- void vncCallReadWakeupHandlers(fd_set * fds, int nfds);
- void vncCallWriteBlockHandlers(fd_set * fds, struct timeval ** timeout);
- void vncCallWriteWakeupHandlers(fd_set * fds, int nfds);
-+#endif
- 
- int vncGetAvoidShiftNumLock(void);
- 
-diff --git a/unix/xserver/hw/vnc/vncHooks.c b/unix/xserver/hw/vnc/vncHooks.c
-index 22ea9ea..29f3f8b 100644
---- a/unix/xserver/hw/vnc/vncHooks.c
-+++ b/unix/xserver/hw/vnc/vncHooks.c
-@@ -128,9 +128,11 @@ static Bool vncHooksDisplayCursor(DeviceIntPtr pDev,
- #if XORG <= 112
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-                                  pointer pReadmask);
--#else
-+#elif XORG <= 118
- static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout,
-                                  void * pReadmask);
-+#else
-+static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout);
- #endif
- #ifdef RENDER
- static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, 
-@@ -716,9 +718,11 @@ static Bool vncHooksDisplayCursor(DeviceIntPtr pDev,
- #if XORG <= 112
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-                                  pointer pReadmask)
--#else
-+#elif XORG <= 118
- static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout,
-                                  void * pReadmask)
-+#else
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout)
- #endif
- {
- #if XORG <= 112
-@@ -731,8 +735,10 @@ static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout,
- 
- #if XORG <= 112
-   (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
--#else
-+#elif XORG <= 118
-   (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
-+#else
-+  (*pScreen->BlockHandler) (pScreen, pTimeout);
- #endif
- 
-   vncHooksScreen->ignoreHooks--;
-@@ -1033,12 +1039,21 @@ static void vncHooksCopyClip(GCPtr dst, GCPtr src) {
- 
- // Unwrap and rewrap helpers
- 
-+#if XORG >= 116
-+#define GC_OP_PROLOGUE(pGC, name)\
-+    vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\
-+    const GCFuncs *oldFuncs = pGC->funcs;\
-+    pGC->funcs = pGCPriv->wrappedFuncs;\
-+    pGC->ops = pGCPriv->wrappedOps; \
-+    DBGPRINT((stderr,"vncHooks" #name " called\n"))
-+#else
- #define GC_OP_PROLOGUE(pGC, name)\
-     vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\
-     GCFuncs *oldFuncs = pGC->funcs;\
-     pGC->funcs = pGCPriv->wrappedFuncs;\
-     pGC->ops = pGCPriv->wrappedOps; \
-     DBGPRINT((stderr,"vncHooks" #name " called\n"))
-+#endif
- 
- #define GC_OP_EPILOGUE(pGC)\
-     pGCPriv->wrappedOps = pGC->ops;\
-diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
-index 60610cb..9d1c0eb 100644
---- a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -50,8 +50,10 @@
- #define XORG 117
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
- #define XORG 118
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (19 * 100000) + (99 * 1000))
-+#define XORG 119
- #else
--#error "X.Org newer than 1.18 is not supported"
-+#error "X.Org newer than 1.19 is not supported"
- #endif
- 
- #endif
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
deleted file mode 100644
index 0f71cfb4d1be..000000000000
--- a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
-
-XSERVER_VERSION="1.19.1"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
-	mirror://gentoo/${PN}.png
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="+drm gnutls java +opengl pam server +xorgmodule"
-
-CDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	pam? ( virtual/pam )
-	server? (
-		dev-lang/perl
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-	)"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.5:* )
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-
-DEPEND="${CDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xproto-7.0.31
-	x11-libs/libXfont2
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.1.3
-		>=x11-proto/glproto-1.4.17
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.2.0
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
-		>=x11-libs/xtrans-1.3.3
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${WORKDIR}"/patches/010_libvnc-os.patch
-	"${WORKDIR}"/patches/030_manpages.patch
-	"${WORKDIR}"/patches/055_xstartup.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake-utils_src_prepare
-
-	if use server; then
-		eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch"
-		cd unix/xserver || die
-		eapply "${FILESDIR}/xserver119.patch"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use arm || use hppa && append-flags "-fPIC"
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-dri3 \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-tslib \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--disable-unit-tests
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die
-		else
-			rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		systemd_douserunit contrib/systemd/user/vncserver@.service
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild
deleted file mode 100644
index 3cac464560b0..000000000000
--- a/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
-
-XSERVER_VERSION="1.19.1"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
-	mirror://gentoo/${PN}.png
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+drm gnutls nls java +opengl pam server +xorgmodule"
-
-CDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( virtual/pam )
-	server? (
-		dev-lang/perl
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-	)"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xproto-7.0.31
-	x11-libs/libXfont2
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.1.3
-		>=x11-proto/glproto-1.4.17
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.2.0
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
-		>=x11-libs/xtrans-1.3.3
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${WORKDIR}"/patches/010_libvnc-os.patch
-	"${WORKDIR}"/patches/030_manpages.patch
-	"${WORKDIR}"/patches/055_xstartup.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake-utils_src_prepare
-
-	if use server; then
-		eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch"
-		cd unix/xserver || die
-		eapply "${FILESDIR}/xserver119.patch"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use arm || use hppa && append-flags "-fPIC"
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-dri3 \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-tslib \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--disable-unit-tests
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die
-		else
-			rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		systemd_douserunit contrib/systemd/user/vncserver@.service
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 76f0e299fe83..c4b7eeaaa15f 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
-DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.11.06.tar.gz 2831531 SHA256 6d0c0226a1e914c94a9a68e8bff5a6498bdf783ffb9513ecf18646139c1e58b6 SHA512 0f7707084f84e7375ae61ffa88979990ba27cf2afb44992d75172415190f5959fe317313b127cbdde33500ed6b0525e9ff03872116dfa7ca188a97e74d562574 WHIRLPOOL a077a96023aec039e74380f91c34c59208cae3e2e06635003547bf8ed7fbb80756bdc73fac7b5607449b9740ea61ce2f1185d2adc738ccd7f6cbfbc32fe9b4ad
-DIST youtube-dl-2017.11.15.tar.gz 2834012 SHA256 88b177baaad0ceafc496bbef790c24b35272cbd9527e2b64f536131aad040ce8 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96 WHIRLPOOL a9d82b0881c91ed410cb57c14a80417e1791a44a51e2a59f14b039ca8bed25715b8de5e70b4434d5b0e87ebbde9b17399e04cf468e878a14b09e3729f239f66f
+DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
+DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
+DIST youtube-dl-2017.11.26.tar.gz 2839867 BLAKE2B c4f1b9739283fb4016ff0892bdcb0db86f1ddc88842553d76159fe4312e70e7145085f3b6a1bfc157d7f5811f28eb1ab79661db701a3366be12be2357b464f19 SHA512 ecf1eb88b37e271505a50709a468afcc6048f00bc6531e8df1eb064dcea62ad6fa2a5a9016d1d106e56b9d3b9904325e133491ca124e06ec64e6f4a5902a2368
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
-EBUILD youtube-dl-2017.11.06.ebuild 2382 BLAKE2B dc7476db3784bfbfdb2c9d818577e781cde3fe8a174b2d1ce7b11183e627f82d234f0d6d76ceb87a5169b9d014eed2b99985c7f0cc9a7ebad2dffbfe7351938f SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20
-EBUILD youtube-dl-2017.11.15.ebuild 2381 BLAKE2B 97cf491495c6ed4eaaf3db59e531303d380003925606530f5e76936425e8d06c45d1b8be970cb86b7e7f6c96a13e82641acddc381677ff170dfb77529bab4e49 SHA512 a45074412fd250f1c152951c64b9b8c53b646a5007544171498e4275197798b599ab25c0a266b7cb8dcd2b54781786ff42d15543b6c20a25691687ce402d8fc5
+EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
+EBUILD youtube-dl-2017.11.26-r1.ebuild 3267 BLAKE2B 3227b519ffc0d8ee64afb3d67c2d4cdbae5a0a89af64f6a0fcb714e73f81031ba94c1af601e4d5ec9c3a0f01e6bac8a6e0c07b4d4a0596af985f72a96a1d884d SHA512 7eccbe2a3f18ee560043684aa0ff1868923adb79b6b2e35ab0da782920cfdf5e8b67b154c703918c23e23954b29c040438d60d9dfccbcbfa660c2d58885db96c
 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-2017.11.15.ebuild b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
index 55c0ffc7515d..a9e6d290efc1 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="+offensive test"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2017.11.06.ebuild b/net-misc/youtube-dl/youtube-dl-2017.11.26-r1.ebuild
index 975ce26c347e..1ca94c2424ec 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.11.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.11.26-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
 HOMEPAGE="https://rg3.github.com/youtube-dl/"
@@ -94,4 +94,21 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
 }
diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest
index 25c00c54acc6..87d4798af1a3 100644
--- a/net-misc/zsync/Manifest
+++ b/net-misc/zsync/Manifest
@@ -2,4 +2,4 @@ AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c
 DIST zlib-1.2.3.tar.bz2 425209 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 WHIRLPOOL e874b123296f5d77daf60617501b30f4beebccb64b3910c2539f75f6c194a2cf4885dc7a3904bf790e1651120ec33b55c48e95970dd6bfd6c4d0a2ea48d7d0f4
 DIST zsync-0.6.2.tar.bz2 245592 SHA256 0b9d53433387aa4f04634a6c63a5efa8203070f2298af72a705f9be3dda65af2 SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d WHIRLPOOL d7f2d864b791fc38522d376eef8cb2ea38e57d91da7f8d2ea1379ecdb8397b4ff672c954dc5fd6e90f786d8d48836fd8b637cf8a60229646a1a9c2635bffb51f
 EBUILD zsync-0.6.2-r1.ebuild 1086 BLAKE2B 1e10f4290a8f4ebabf373daec5c2ca71bfc38388c16fb6ebf6a68d4e5f68f9ccd272fe7c19142ad0c69ead49b2dbb3a3a41fe6b31aff0cd02bbe381f7a4d36b6 SHA512 e2fec8aa4c44a1380edce1a8e5ce727693924f16f2cf4addf6b450aed03f6492f84be08605699b033ae62fa35053e8a881d12ede1f5bbcd831f48947f7fbf5e5
-MISC metadata.xml 1264 BLAKE2B 0270525a635de87d9026933081a7c88ff6a714095ea299e307a02798bba5e94ec21735156b121c16bbd28d21797648d1c9f12c1874cc1706c79d8de457a182ff SHA512 2b426d47519f21b1a560e8efc4be732803a2c577b28e8cef0aa10a46544495e32ca8c933860e09a75ff860427aa517bde415d5f30f15bde47b2d4a81a1ca94c8
+MISC metadata.xml 1248 BLAKE2B da1ebc159e8f07cf0237017bf86cda2dc162472539ea5b8777c0f9f12384e6728eabbf0dc0d87823c5480b6a905eb533042ef2ca9ec1b83a52f6cb9e4082bc58 SHA512 ee5763e3797b34d9b70bdada81f187c7d61cf155a0c207b6b70067a1407770dcdd2f7cce93f796fc022bed0577935d216e57f3260cf1a2a0a23672dbd610c04a
diff --git a/net-misc/zsync/metadata.xml b/net-misc/zsync/metadata.xml
index ca294a5c6757..a35011bd04b5 100644
--- a/net-misc/zsync/metadata.xml
+++ b/net-misc/zsync/metadata.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 		From the zsync web page:
 
-		"zsync is a file transfer program. It allows you to download a file from a 
-		remote web server, where you have a copy of an older version of the file on your 
-		computer already. zsync downloads only the new parts of the file. It uses the 
+		"zsync is a file transfer program. It allows you to download a file from a
+		remote web server, where you have a copy of an older version of the file on your
+		computer already. zsync downloads only the new parts of the file. It uses the
 		same algorithm as rsync.
 
-		zsync does not require any special server software or a shell account on the 
-		remote system (rsync, in comparison, requires that you have an rsh or ssh 
-		account, or that the remote system runs rsyncd). Instead, it uses a control file 
-		-- a .zsync file -- that describes the file to be downloaded and enables zsync to 
-		work out which blocks it needs. This file can be created by the admin of the web 
-		server hosting the download, and placed alongside the file to download -- it is 
-		generated once, then any downloaders with zsync can use it. Alternatively, 
-		anyone can download the file, make a .zsync and provide it to other users (this 
+		zsync does not require any special server software or a shell account on the
+		remote system (rsync, in comparison, requires that you have an rsh or ssh
+		account, or that the remote system runs rsyncd). Instead, it uses a control file
+		-- a .zsync file -- that describes the file to be downloaded and enables zsync to
+		work out which blocks it needs. This file can be created by the admin of the web
+		server hosting the download, and placed alongside the file to download -- it is
+		generated once, then any downloaders with zsync can use it. Alternatively,
+		anyone can download the file, make a .zsync and provide it to other users (this
 		is what I am doing for the moment)."
 	</longdescription>
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
commit	407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree	844bea44d85dc7218f54970af1c42cc9d55c3f1a /net-misc
parent	89c6c06b8c42107dd231687a1012354e7d3039fc (diff)