gentoo resync : 03.11.2018

46 files changed, 607 insertions, 492 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c4e9859aa57c..492ae7c4d698 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 7a864864addd..8f06032687b7 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,6 +2,8 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.61.1.tar.bz2 2965173 BLAKE2B 16ef6962f64e18a4b67c3cccff78120084a2660207f512974f9827c53037a95b935a6020620f926eee85339fbc558be5585f2a4c001bd287c4d33795e6a6dab5 SHA512 484d33c0d32109539a95309cdb4404c03c0e7164fdbf7a4724a5b01aa20e2d48fbe6363c7cc53060d4d28050cfa6b43f9ed220ab65d4d389eb00efff5db1bfb5
+DIST curl-7.62.0.tar.bz2 3014762 BLAKE2B 0cc9ef5d19004dc5cc69444cac3b2fb4fd82ba470a831b761c147e45826fc26087f4e07da76ee0b6a070f6125a1423927607a257786387326f4c9f4e3953d5f7 SHA512 83ca5c2757745f763316eefdd4c3f0e8a211a7f0db6a708b67ae2133ad41fdf17dd2230f9283a4778c9c866126d407454a090291cd2bf274371d0a214c1c13f5
 EBUILD curl-7.61.1-r1.ebuild 7220 BLAKE2B b022dceee6068aa31e3fbf8b792b554e32647da47ed863b35c11470a494c0ae6f51a1a243eed73589113d19a4ea52e601a6142a7b55e31cc0e52e0d9b28de7db SHA512 fbd4cb210b96c45d73ad053dec8d2f59550568f079787c38c22df208395205cb4d56dfc1891f115f349e05a10a67416bfebe0bea5f3761cab6d534da1bfaca55
 EBUILD curl-7.61.1.ebuild 7190 BLAKE2B 526a2302f0c6fc7f7ea05320497d9a481c456b962680355094f63d37c59cbd79f014e2569e5e423e508406d287fdfcb18134eb40b256fb5c4a2bbe308e0ee204 SHA512 666d3c972e2f9cebc462bd27a1651465a8ce4105587e5d77a95c0564d377baacc09c024b8f12dec06698f0a2bb6d8b07a6a2e42cab328c18cf425968b6121fd6
+EBUILD curl-7.62.0.ebuild 7220 BLAKE2B b022dceee6068aa31e3fbf8b792b554e32647da47ed863b35c11470a494c0ae6f51a1a243eed73589113d19a4ea52e601a6142a7b55e31cc0e52e0d9b28de7db SHA512 fbd4cb210b96c45d73ad053dec8d2f59550568f079787c38c22df208395205cb4d56dfc1891f115f349e05a10a67416bfebe0bea5f3761cab6d534da1bfaca55
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.62.0.ebuild b/net-misc/curl/curl-7.62.0.ebuild
new file mode 100644
index 000000000000..d13d87e7796c
--- /dev/null
+++ b/net-misc/curl/curl-7.62.0.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${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}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin17 ]] ; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=637252
+		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
+			configure || die
+	fi
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			myconf+=( --with-axtls )
+		elif use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index 42c85f9ec89c..39d4be2c5219 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,14 +1,3 @@
-DIST grive-0.4.0_pre20150905.tar.gz 158858 BLAKE2B bb16431b333bcbd91726045095e84ccb49ccd69b58e941e980c56f9589b21b8400cf9e922bdbf4399e31f12997503f3852aff60644d0b2c4ae463461053327fd SHA512 2a6842c742d79345ff805f92e74990de624d656c1f16fd98b2611e2359b051d6dfebef07590390eee3ea07e60143ca9e66ceecd675a3a75d6a099dcb0070ab46
-DIST grive-0.4.0_pre20151011.tar.gz 160502 BLAKE2B 62d2fd89bd977f3f21f7c66a5918c1de9898ae71fe38adda9c8c2a577960b0adb76f42cd4d5e29f53316fe78efa0a3074deaf8e5658b05ca1e778358d3a7b4c6 SHA512 c5b59a8740ee0886d95f64278c1dd8e0c80df8c53b982f0720fd3a9caa82503ce0ef75987afeafa8735b4e88ef6fea6b5266671516165b288156b1ab543dc3f7
-DIST grive-0.5.1_pre20160114.tar.gz 162888 BLAKE2B 49c163625c8c7fff33e66f823ff4fd48b4a562605d7e12cc62630bd82be5927e20a54ebe0818dd324603b630aaf2311edb35a5ea3ae4084199bc789528691128 SHA512 8d10a9c1f36149def23326f3edd4350b156c59d6c2caa3d9ea262d9f61e174f0af2264a0c8d57592625c0e7cd5f9e7e171d01ff0c6a879a5605e44bb4c9a62d7
-DIST grive-0.5.1_pre20160706.tar.gz 163646 BLAKE2B 04a9352c33fe713dbbc2b5f9381b0982a6cc3b9e3f5ef6dd36ccec25878e317ed8bb214e449ff0161962cba1318dc4641187ae605844c749bcfcc164f5afc2d5 SHA512 05496c9d38b13804b5839cf6a5d64a588e670b0e6d2796fe7f7a66267ade34f22bde28cf34210a4f2d36f12671ba38c963b3fc3fa6f8f80ff8b143aace648b52
-DIST grive-0.5.1_pre20161004.tar.gz 163085 BLAKE2B a9f450a4e32f3299922f5e26456370f7f3fd8e4922d7dba5d58e6076ed8bfc0152427510d33c58d90ab2427b534b4f4fbbf913061fac937f2c8af1e0b2367c40 SHA512 1de5c2956d898d0a67e28469d7cf054e83b63f6dca736a60f875fbaac3197bc425432c43db2472e87113df2fa5da49eff9e17cd33610ccda7ba5bf0c2d4966c0
 DIST grive-0.5.1_pre20171005.tar.gz 164450 BLAKE2B e8fde261ec419c1284575032ce326de4953ecf7b4824a70aec07b41f6013b4d26532ba0eae3897c910bd5bb51949dcc13fcb699013557f24c38c75fb251e868c SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c
-EBUILD grive-0.4.0_pre20150905-r1.ebuild 757 BLAKE2B 6cde3a7107cb87b4f83bbef9cdfdfe0ef4b546d702d8bb090c01351e4e7945df1e0922fe3dcdc1eac24ec787049c65312f964d19b920190cb862a1fd1fa238f2 SHA512 04405f22f6fd0974e06911f807cb9b2d07f026cdca49efbdae6f382507a802a665da8e7892fb0b0d51120849bf55e3e28ccb1046a4234a2e4a7c0dda4da1ef91
-EBUILD grive-0.4.0_pre20150905.ebuild 730 BLAKE2B a8d2d3bb89eab9fc25b183ff795f42820071094d154d2b2166525db8442b9f360185ee718db995fbe4d891fcd617da31b4268442bf388fe795c4018944e145a2 SHA512 56614f95a73bbaa3fbd9e16eba3d0acc06a9afeda7c8b30501183c5fd44fbf1b16c7ba6236fc4f580bfdae8da182f55e2d50b1d95b0374a4626b7401a1c9e3a3
-EBUILD grive-0.4.0_pre20151011.ebuild 757 BLAKE2B 0dc7861261e2226f53b16d4733a6e8e7ba2dce39348a826519d6c1b33ab5ead0f5b75cab2974f31e202f79c83276e3f00a391ab7cae9022bc5d6bad4e05dd25d SHA512 9c82af5c69d2e668e7a00b9142d867ae32dba67de5f300acaf649ffd6662fd3707c08cad579feb111c997f7d87a0af41d39f73998aebdcc43ae3cc351ace8d52
-EBUILD grive-0.5.1_pre20160114.ebuild 757 BLAKE2B 845a649df6946c8cb6f5df6b8d56a8567cb1ff5e0571bf62445ad338b5594c44eaa7a9efcfdc99efc047d950e866257d1a2e103ec67cd7cd32b9e0cab19e9272 SHA512 6df633cbbf8619c06bdfac65865ef8a1f210cfa38de358cae55d2920ce7bb48821976cfaf04f080a280916d52e55f214e76f378c292a02c50bb40ed06a2780ce
-EBUILD grive-0.5.1_pre20160706.ebuild 813 BLAKE2B c929879692b6d64a9ba94a86328e13177fcf9832f7964d848c1889fc0c19b18807c35e8b054b3d614918e4017031ec2bed9beca70dc633e7660d6790b1c56acb SHA512 be0fcedbe5843d13a696024822b1ae0b54d7c1e0779f66f366ea7700b5cead43a97feb7e31c5ad7773319cde1a9d513e7b7e2398a10857b680393042f7fe14f9
-EBUILD grive-0.5.1_pre20161004.ebuild 813 BLAKE2B ae45cdb3667199e44e7daf883011849549ab5970f2c70901bb7280d9161cb8bcb36cf08e65853cf0352253ee861e56ac0e722dedfbb481dbd48cd7c00c21aeb2 SHA512 e6dc360c9891f239b5e51db71b16079989f9300a961b43f8d897f01ce8024523a5ff32785a643694ca85b6b6b31ef724851b97c211a1566d39ea410572499f49
-EBUILD grive-0.5.1_pre20171005.ebuild 813 BLAKE2B 9de64618d8ca394c204334c603befa1b74338d61247c16820c21af0685cfd8ed8439942d857c7e878c404a3fbb55594cfb8effcb7f4cf1bd97f388ee3e9140a3 SHA512 8efff2dace77362f70f1c5c1ff9d51ac23da448301bca844b670183982f733c599a2ff9e1f09f2f0be0f86894e8458f3efa05c9e49a1843031153cde8e01bb7d
+EBUILD grive-0.5.1_pre20171005.ebuild 810 BLAKE2B 75622d38abc90cb36ac0625bc113a4ae3e1841768d0392e24d45ffacd06c593ad96d4b366fad8f22d725eafa2bbb7324c9851f507c7af30660ec06202c1694f9 SHA512 d29f8d4cb9b1775b600469592378b0785de1dcc8a6afba3e142d95e47a8b3064576d1c2cd070f13b7fd9d14e0c668d2ebd67b9c153df91ba23036ba25379cd66
 MISC metadata.xml 329 BLAKE2B 29317b0c9304da834a9876bf09262b2e6d8664978ec04973bfcb6b196efa71d3405f758176662a2af32b780f5819cf4980a4ed21f079609ed8b50109a176a438 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997
diff --git a/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild b/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
deleted file mode 100644
index a371012753c7..000000000000
--- a/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
-	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An open source Linux client for Google Drive"
-HOMEPAGE="https://github.com/vitalif/grive2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	net-misc/curl
-	sys-libs/binutils-libs:0=
-	sys-libs/glibc
-	dev-libs/yajl
-"
-DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.4.0_pre20150905.ebuild b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
deleted file mode 100644
index 0c2271c2d939..000000000000
--- a/net-misc/grive/grive-0.4.0_pre20150905.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
-	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An open source Linux client for Google Drive"
-HOMEPAGE="https://github.com/vitalif/grive2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	net-misc/curl
-	sys-libs/glibc
-	dev-libs/yajl
-"
-DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.4.0_pre20151011.ebuild b/net-misc/grive/grive-0.4.0_pre20151011.ebuild
deleted file mode 100644
index 53516923c8b6..000000000000
--- a/net-misc/grive/grive-0.4.0_pre20151011.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	COMMIT="44cb91f94e67bcdad77ca564b4d8083cedf72251"
-	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An open source Linux client for Google Drive"
-HOMEPAGE="https://github.com/vitalif/grive2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	net-misc/curl
-	sys-libs/binutils-libs:0=
-	sys-libs/glibc
-	dev-libs/yajl
-"
-DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.5.1_pre20160114.ebuild b/net-misc/grive/grive-0.5.1_pre20160114.ebuild
deleted file mode 100644
index c60351f4ddab..000000000000
--- a/net-misc/grive/grive-0.5.1_pre20160114.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	COMMIT="cfb8ff08b300d1fa57e12cdc85f724e3e25c906d"
-	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An open source Linux client for Google Drive"
-HOMEPAGE="https://github.com/vitalif/grive2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	net-misc/curl
-	sys-libs/binutils-libs:0=
-	sys-libs/glibc
-	dev-libs/yajl
-"
-DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.5.1_pre20160706.ebuild b/net-misc/grive/grive-0.5.1_pre20160706.ebuild
deleted file mode 100644
index 7e7ac90236b5..000000000000
--- a/net-misc/grive/grive-0.5.1_pre20160706.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	COMMIT="457d84974592ed3f123622b12f2a7a748cbc0668"
-	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An open source Linux client for Google Drive"
-HOMEPAGE="https://github.com/vitalif/grive2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
-	sys-libs/binutils-libs:0=
-	sys-libs/glibc
-	dev-libs/yajl
-"
-DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.5.1_pre20161004.ebuild b/net-misc/grive/grive-0.5.1_pre20161004.ebuild
deleted file mode 100644
index 76c1a3633a94..000000000000
--- a/net-misc/grive/grive-0.5.1_pre20161004.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	COMMIT="7bbb01c3014cc996ec24a7e5c0684f24b604b735"
-	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An open source Linux client for Google Drive"
-HOMEPAGE="https://github.com/vitalif/grive2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
-	sys-libs/binutils-libs:0=
-	sys-libs/glibc
-	dev-libs/yajl
-"
-DEPEND="${RDEPEND}"
diff --git a/net-misc/grive/grive-0.5.1_pre20171005.ebuild b/net-misc/grive/grive-0.5.1_pre20171005.ebuild
index 744cc461a623..75e5b3f315c4 100644
--- a/net-misc/grive/grive-0.5.1_pre20171005.ebuild
+++ b/net-misc/grive/grive-0.5.1_pre20171005.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
@@ -27,9 +27,9 @@ RDEPEND="
 	dev-libs/expat
 	>=dev-libs/json-c-0.11-r1:=
 	dev-libs/libgcrypt:0=
+	dev-libs/yajl
 	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
 	sys-libs/binutils-libs:0=
 	sys-libs/glibc
-	dev-libs/yajl
 "
 DEPEND="${RDEPEND}"
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 918dba85466f..8ac67d40915d 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -5,5 +5,7 @@ AUX icecast.logrotate 140 BLAKE2B e42003ef1902b876df9c90fbbe15ebfd41fe6b38d989d2
 AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552cd1e8ec32865bc8756608f2962fc63810fe3fbd1936819d36207926c80e5eb1796ec7dc742f56d075 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51
 AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96
 DIST icecast-2.4.3.tar.gz 2393358 BLAKE2B a2b34eeb7c94974e13250620f9a19ed0165ec0cc676c5947edf8f88cea76240ab5eb90807d598c29944573c3717b8b7951261434521bc81100c3a6ba22d85840 SHA512 70e755ee935e738f2b7310333823992517747897692d101b67d73d5cd40d6385a20c25d089a0430806c116021e6e2055761efee9fec27cd9bccb2b58a2bfd446
+DIST icecast-2.4.4.tar.gz 2360592 BLAKE2B fd4034749feb4bf38c684ac6d8de572fdebce875843dc1be286264c8fe8d38feb24ea889b07ec79aada34cf16dae46eb21a8c5470f67c08f2dd56dc04c12130f SHA512 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0
 EBUILD icecast-2.4.3.ebuild 2193 BLAKE2B 2ea2134420764bd2f9b9036a192fc2df7aaca1a32ca29be6326f0cd8427af608bb2e50a0e029aec3faa09d4c588fd1bfc71566b7970f00658332d7871ea52285 SHA512 a687f8a9b909a0beb8fb6dd533b8393668ec7d02faed1aaeb2245966ebfa6cd5bbe1d6ef147602ee71b27e4ca8e9df7252f00559d0e65c035a6eea4cdb7fe8fe
+EBUILD icecast-2.4.4.ebuild 2226 BLAKE2B 597483a56de0e1dd417906aea1715e497235e917796681ba54c5b839267a0da7296851e664df4ebf85c8c8aa1f730d58d1b3f145d4fe2ec246e4448ba34fc82e SHA512 149a40d6627c260c5dc9f1b7552402e4af05a952b499b5ff5c1e5b5e3ec20e48bdcae6655201c680b888bbedd2cf6604f5879711d00ac6d8112e7a597cc1bcc9
 MISC metadata.xml 512 BLAKE2B d4478aee58c5ea15615899722848ee4e84025febf3fdff1203cdc68cea5b7f9021df8995bec3d25bf8f06953dfb3b4b6f2621fae904be59cc88c78732a0ac79a SHA512 73beb97a44390ef3aa35ef29f473397886d8af1f02e8b76924697d8e86df99238010ae63b392e9eb8cd5e6d7c634e380a51c5e298074cd7ed8256649ef6bfc62
diff --git a/net-misc/icecast/icecast-2.4.4.ebuild b/net-misc/icecast/icecast-2.4.4.ebuild
new file mode 100644
index 000000000000..6c599a6c0cf2
--- /dev/null
+++ b/net-misc/icecast/icecast-2.4.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools systemd user
+
+DESCRIPTION="Opensource alternative to shoutcast that supports mp3, ogg and aac streaming"
+HOMEPAGE="http://www.icecast.org/"
+SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="kate libressl logrotate +speex +ssl +theora +yp"
+
+#Although there is a --with-ogg and --with-orbis configure option, they're
+#only useful for specifying paths, not for disabling.
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/libogg
+	media-libs/libvorbis
+	kate? ( media-libs/libkate )
+	logrotate? ( app-admin/logrotate )
+	speex? ( media-libs/speex )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	theora? ( media-libs/libtheora )
+	yp? ( net-misc/curl )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# bug #368539
+	"${FILESDIR}"/${PN}-2.3.3-libkate.patch
+	# bug #430434
+	"${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
+)
+
+pkg_setup() {
+	enewuser icecast -1 -1 -1 nogroup
+}
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--docdir=/usr/share/doc/${PF}
+		--sysconfdir=/etc/icecast2
+		$(use_enable kate)
+		$(use_enable yp)
+		$(use_with speex)
+		$(use_with ssl openssl)
+		$(use_with theora)
+		$(use_with yp curl)
+	)
+	econf "${myeconfsrgs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
+	docinto html
+	dodoc doc/*.html
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/icecast2
+	doins "${FILESDIR}"/icecast.xml
+	fperms 600 /etc/icecast2/icecast.xml
+
+	if use logrotate; then
+		dodir /etc/logrotate.d
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${PN}.logrotate ${PN}
+	fi
+	diropts -m0764 -o icecast -g nogroup
+	dodir /var/log/icecast
+	keepdir /var/log/icecast
+	rm -r "${ED}"/usr/share/doc/icecast || die
+}
+
+pkg_postinst() {
+	touch "${ROOT}"/var/log/icecast/{access,error}.log
+	chown icecast:nogroup "${ROOT}"/var/log/icecast/{access,error}.log
+}
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
new file mode 100644
index 000000000000..171521589b20
--- /dev/null
+++ b/net-misc/istioctl/Manifest
@@ -0,0 +1,3 @@
+DIST istioctl-1.0.2.tar.gz 18828091 BLAKE2B 064e9ad8b2629809c7b55514ad0a537bae8785bfebabea610a54ead0a0e665cdc718218376e07dcf5e235f8674bdd9e2eaa7a79bfd5d5485a5ddc841e1c52527 SHA512 d444dd8e0676ac9b36dc3901595f15d6504991619a82057f924141f752d2a45866df9ca388d6c63e1fbe43be4d4156f3efc748be59b565f865a0c5b3d02bda07
+EBUILD istioctl-1.0.2.ebuild 881 BLAKE2B 00a7f516e13770c040062a00ed69f81978dd417bc99110642ae0be829db843f3102702d66dfffe25c0dd47cece882b0a32b1bfce7156e7f6f90d4e90722597db SHA512 4d97bd6fc977531321d9ad406b39e13546eabd2029887422acae435de2fc6c0e0c6d805ca8de15cde59392750a7862a561266b27cc7ad1ef0418816a104946d6
+MISC metadata.xml 321 BLAKE2B 46078d652e4352893c239c5e6b7d30a160f48b370f932357a5c2940c67ddae2f6c932ca6dd1b0b784b0e2a03a7649936ebe317dc95da5ad7a9acbd2e497a01d1 SHA512 cb45dda3fe092fbc1d18cdd21f44ad5cd89c51fee4e10aee6140bd66b25e46c9253672b8f36fe0ae6a83ff9a76c9b1bd35de59846abb9054b1f5095e33858d88
diff --git a/net-misc/istioctl/istioctl-1.0.2.ebuild b/net-misc/istioctl/istioctl-1.0.2.ebuild
new file mode 100644
index 000000000000..4f3d1ba3c9a5
--- /dev/null
+++ b/net-misc/istioctl/istioctl-1.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+GIT_COMMIT="d639408fded355fb906ef2a1f9e8ffddc24c3d64"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Istio configuration command line utility"
+EGO_PN="istio.io/istio"
+HOMEPAGE="https://github.com/istio/istio"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
+		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
+		istio.io/istio/pkg/version.buildStatus=Clean" \
+	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
+	popd || die
+}
+
+src_install() {
+	dobin out/linux_amd64/release/${PN}
+	pushd "src/${EGO_PN}" || die
+	dodoc README.md
+}
diff --git a/net-misc/istioctl/metadata.xml b/net-misc/istioctl/metadata.xml
new file mode 100644
index 000000000000..25597e3863fd
--- /dev/null
+++ b/net-misc/istioctl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">istio/istio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index f8db710677fd..50de92789b8d 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -7,5 +7,5 @@ EBUILD ntpclient-2010.365.ebuild 704 BLAKE2B 25b14f9088e389f0580dbb85272ff8d773a
 EBUILD ntpclient-2015.365.ebuild 700 BLAKE2B 4c23baca82e100dd31156534e1d1b15c6b9b7ba7a8adb590ff527508f831975fd1aaa1fd06ffa8ecde1e33eadc18315648a47e3e37c9650edb6b1e1c765c59ce SHA512 0220d85794028d9daa151ad2cc1c2e6e707938ebe5076c5bcb5f0ef2d954855c81f140ce845c6b6737fd8293e3510d53d26a4184179bd2fdfc76c91e6e181d74
 EBUILD ntpclient-2017.217.ebuild 655 BLAKE2B 0770499a3105930e5ed01ba5d3c9c75e537568a9ecb5ae4d30a497e31831eac52303545bca975313fe3a2d5fe9b90220973a19976732f4b6694f35bfca7e1e51 SHA512 b3e1d7211c99d2659ae925ff8123b49d10f1cc66057b0db2d51935829b49b5da04153b8fc3102386699fc0a9e1801df4afb12103c8f42728e0992bc6598b724e
 EBUILD ntpclient-2017.246.ebuild 626 BLAKE2B 080ccdf5a2ddaa15ae72af62fb0d1804a75f03a7b14de177f304c4177e50d67b073d0f6019a13ab4945ad7ab7c5522e93e70636f35895b12a43714520ce2c38d SHA512 6ea85f9ac17b4fdc091c46f5b01ddd10dd629eeeadf8a02decbf1ba36f7dd5954c6c5a9b3aef29ae4c5d789ade9a52aca7848f533d6b33afd2c5be81ceed96fb
-EBUILD ntpclient-2018.244.ebuild 767 BLAKE2B 865070f73977bb2febef607505febf16e638b00904f2663816706d812d920d079e795189f06353b0cb5c28b2aa71509eb96ef3e6699fb398bbde78387fbe12b8 SHA512 de9f1870b7a32d095db493bfd5277301b91fb3557a7be65f1414a106ffeffe626f31254d66958b29de3da96cb3b806b6dccf6e137d90f79e4db83ddcefaaf0a5
+EBUILD ntpclient-2018.244.ebuild 766 BLAKE2B 94db3d53ebe8587a9fe34e3ac94a55cd114befcaa76977f49d63c13ca7521a6c43eeb3b65045371f71e0b990042233c682cd437e66d7b5c82026523808e13c0a SHA512 2faf1a89ea25323b7fe941f3c1687ff33ffb7033c3bdd167d8bd2f6e908917a96bdbd7cfc92b5a6b00ae3b2f7773012ae89fab43ceec05e21307d59c48247be2
 MISC metadata.xml 1258 BLAKE2B 60a9f7c14c15b49d19acb728c55a2a695311d50232e6bb143315a81400cdc990af3b5e1f3699c7b225fd76f6c0725a6e7cd62f0c49091ccd47222bf6e96f0ea1 SHA512 dc7d72c25206360f89ac0b8cd210a6b13346a6a183a92eb4a279059cc07b372d49d7a64808d4db5fb638781d9c16fc33aca21dd02ee2fc40894f2ce6195e4a64
diff --git a/net-misc/ntpclient/ntpclient-2018.244.ebuild b/net-misc/ntpclient/ntpclient-2018.244.ebuild
index 5a1d7f11c258..e184aae73f65 100644
--- a/net-misc/ntpclient/ntpclient-2018.244.ebuild
+++ b/net-misc/ntpclient/ntpclient-2018.244.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${MY_PV}/${MY_P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug embedded obsolete +syslog"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 410b0e998008..ce17367f208a 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,5 +1,5 @@
 DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
 DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
 EBUILD nx-3.5.0.33.ebuild 2337 BLAKE2B a902ccaccafac239a62ccfe6db1543161ea4c47890dc75996744824caee103eb0b6150bcfe10a0befdff4658f60097d06c77d5fd90de79f925e79351ab357c16 SHA512 7e2e099057167fec9639ee20389764d06997a11bb73a94d825dc07c18e563fcba4aa068210e36675c9ca0303edb78e9d564943b26d38e4c67e8ea8ef77a41a54
-EBUILD nx-3.5.99.16.ebuild 3119 BLAKE2B e40db11b95aca9c3ac55fd52f36324d634d864fafc99610329a812a4bd8a326ae2fa7ea865e1b20951bb4d8facbb943d51977c447b63f10bd15bef4f1e6f724b SHA512 38795367edd1e04caf52ced83ce0c49a94a20c56160ad6ae9267e2eb03df674da288581095853c907b9b84ea241e1c5a7143e9dbb4c938774b6fcb219f4165b2
+EBUILD nx-3.5.99.16.ebuild 3118 BLAKE2B cd118b671a1b57c7ceae369431e8b23a214104bd790914d735b118e2e7d9487b096b4a08792a4006572362f0bac78015c1f868092186c22ac21d9e829674df64 SHA512 42b58a02ccba22d17b2862ea85923e8fc7f6834c667b31afcd1399d66cb21f9e6a33f98b48973305d342b6cf406504cd41a545a046a2708d77d6741d441773a5
 MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
diff --git a/net-misc/nx/nx-3.5.99.16.ebuild b/net-misc/nx/nx-3.5.99.16.ebuild
index eb3831cbde7d..ac90bff91f82 100644
--- a/net-misc/nx/nx-3.5.99.16.ebuild
+++ b/net-misc/nx/nx-3.5.99.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="elibc_glibc"
 
 RDEPEND="
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 590da7d54f99..59afa899c602 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -7,10 +7,6 @@ AUX openssh-7.5_p1-disable-conch-interop-tests.patch 554 BLAKE2B f5f45c000ec26c1
 AUX openssh-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ace0e07dce1106c6841031cacfb197e00cc76fc1d0cf153aae52757dcf98a5fb89971125493d0572bd4964d0e59cb3f391fd1256aef SHA512 bc23fdf5995ae38ff166f12f64082f79a2135ca28f2240e89bee42b1e3ba39ce94467ece9ddea99173f1829b09b069dbf56a0bce7dfd1ae5f63c12f73b5ffba7
 AUX openssh-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e091bb48021ef8affa84c988d55d9fe6a823b0329b6d9707c88e1556d45c304b6630ade7008f63fd649975594a75f570bb33 SHA512 058dc269eb032151e88e0ac79a0b0fd6fcd56d489e90e299ee431b1475a8f8080e8f4649244864af33e743820b081c9f90b32a1a93b8b60feeb491c0201a4d61
 AUX openssh-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e
-AUX openssh-7.6_p1-hpn-x509-11.2-glue.patch 2188 BLAKE2B 2be559ea9fbe4dcd619cb13334b9b10005d93d83284f895c18ae56b1059c81faf5e0d71ed02000ad14beac201b0af7a698882b1dc6fcc646f3e5bf7444e693ff SHA512 db93c85430bdfa802ae950de6170f9867bc82fad222b153433d14c6728f94bed3fbeb04e30c8960361dcb92aa6d3bc6480b2d02f0fa01e4ea70bc0039fa6e52f
-AUX openssh-7.6_p1-permitopen-x509-glue.patch 1906 BLAKE2B 7b78577535bff9fc3c19d76bf5ebe1710b6e2743c40a336dbdfd65d2ba6c9f04979ebfa0a0bf3e8d87eb038fea945d7e5ad287adef13dec8a20b9160d964a226 SHA512 ad531ef8ce6cba778b66c3c912e6a57c8012d173f3e516ed4f9910213f0dc04b4fc76f4da6623a6a4ffc6f789c9f162279216aac801c67e4b62e33b0e1883e9d
-AUX openssh-7.6_p1-permitopen.patch 1857 BLAKE2B f2f7e091b99d96e77ec95353789cfd8051ced60a198219a88ae409cdedde8751af9bea5b048c76a610411f86a4e802e488fb2c5b4045e1410a6b2f2cc1a34227 SHA512 1fc3410f52e86930af5188cadf9e9f1046e7a695639e27b95da9e25a781e8f4445e279c54cd010d280e7b4df58da404b97fce8e6192ae5d456d33b498aaf00c7
-AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32abaa34bd57aeb32558f5d9978df5b5eb5ba5dc1ac8c46ed430619318fa3cfd3475a9c24e3f594ad05d081decd0e4c2f36 SHA512 08a9caf1cbb4dbde2828f14075b41762dad24a8a88882cc61cb133783caa1200f63f052824409b0334c832365c0d934f44b2eeac947228ff52be24a09548cd22
 AUX openssh-7.7_p1-GSSAPI-dns.patch 11342 BLAKE2B e648273cdd04bcd46b25a2ae2b4ffdfff455c7ab04f6c56cb5ad91859231c267211564f6b2785d9fad1b78c4fe0a095302c7acf732357efdb2273ebab9ceebab SHA512 bbfe702786636006dfe4560d8245d9007f9a94768a2df17a3ca3ead7bd1351edd2960f993e322b96828a0054ad55f71fcb77793a05ba2e52d8d9286431cc538a
 AUX openssh-7.8_p1-GSSAPI-dns.patch 11683 BLAKE2B 156499d327bc9236de7f22d333cfc5da608af38a97de701b7392ca831d2e54f4c313c385acc04fba9dca93e0f2497a0da1538ff7c1ab698353c173da0820c5ef SHA512 5e461fed07d62a13a85a7c8b7902dfe77f7e6bf1c6276c6877142a3acbe79650ebc019dd727183b1e9c781a4c3de22f9c36052a9aa5da5fb39fb4e252b8925af
 AUX openssh-7.8_p1-X509-no-version.patch 878 BLAKE2B 2ed1a11e4b9066720057e5ae0a8842c23628690fe2eb453e54d4ee11d7ed0f6b34f0f609b1661563bc86f9bc469781a2e86e4e0eb0ac40b01c62c3a6bff2cca0 SHA512 99bced3799591657044bbb660b82e02bea2790203566ac166641f2a23a7b40c0f98643001edab866747a8de49b3f2d5732324904352030e92651b75ed58a7791
@@ -29,7 +25,6 @@ AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b9
 AUX sshd.initd 2735 BLAKE2B c3fd3b653676b0e628d58939a55e0ff5cfdd177af18a9ef2d53dcb1717ce478ecb654da398752ee4fef0f6225416fd4fa5cfa6e83d7e977086744616d291dcd3 SHA512 9c3e908c79674bb070e99491dc587c1e6404b1e2eec711dc27cd54510ff68217c83e7ac6fcf7b89f62ba5393ff3e417774fd6d105422464203544e8fbc91c6bb
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
 AUX sshd.rc6.4 2108 BLAKE2B 55b66dddb45aadccde794667195f716f84c521576d886a3acc56f6f66087f0ff7167bde629c876da4ee1306a4995b8a4cd089eece35037616d17ee4b691b4cf8 SHA512 fe58e950514743a72467233ff2f2a63112c50e5db843d61e141a5ca3dd8ef8f42a616cd9de7748ae582054c47c2cc38ce48b638e2d88be39c1387f77e79c83e1
-AUX sshd.rc6.5 2723 BLAKE2B 3509a84c3f3d09ac3946f3e59c07ce615fb263ed7580815384589b9451e4c3df9c6c82a6d7cbd738e87d8b2dd2a4e7907e59b179250c828a191e395e25900fa9 SHA512 b65910477e6d255cb0eb8a49ffd2c43b1d8876f9e6cf8dd4c7161dbedd17ed757aea7ead4ebecc29d830e2675f66a0974c063fbcf93849c06f1599cbf0ff9d1b
 AUX sshd.service 242 BLAKE2B e77eb1e0adad0641b60a59d243e911e0a6286a87acda25f3e478582068d8a7a2a12ec88e14bf2c01c7f4c2025ce2d2ce1b1273a93c096bc96da47a69878a823e SHA512 77f50c85a2c944995a39819916eb860cfdc1aff90986e93282e669a0de73c287ecb92d550fd118cfcc8ab538eab677e0d103b23cd959b7e8d9801bc37250c39c
 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42
 AUX sshd_at.service 176 BLAKE2B 316c2de6af05e97ad2271dfda9fc3276b5c049aa1e56ea7c4acc20d5dd6f4444b0ed3122db90959dc8c009e36f59dbe8e8b969f21eaca98c513ac46b4f80f46e SHA512 662a9c2668902633e6dbcb9435ac35bec3e224afdb2ab6a1df908618536ae9fc1958ba1d611e146c01fddb0c8f41eefdc26de78f45b7f165b1d6b2ee2f23be2a
diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch
deleted file mode 100644
index 2ed6a7b54a66..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:02:11.850912525 -0700
-+++ b/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:35:06.223424844 -0700
-@@ -907,9 +907,9 @@
- @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1)
-  {
-  	/* Send our own protocol version identification. */
-- 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
---	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
--+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
-+ 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
-+-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
-++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
-  	if (atomicio(vwrite, connection_out, client_version_string,
-  	    strlen(client_version_string)) != strlen(client_version_string))
-  		fatal("write: %.100s", strerror(errno));
-@@ -918,11 +918,11 @@
- --- a/sshd.c
- +++ b/sshd.c
- @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
-- 	char remote_version[256];	/* Must be at least as big as buf. */
-+ 	}
-  
-- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
---	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
--+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
-+	xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s\r\n",
-+-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment,
-++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment,
-  	    *options.version_addendum == '\0' ? "" : " ",
-  	    options.version_addendum);
-  
-@@ -982,13 +982,14 @@
- index e093f623..83f0932d 100644
- --- a/version.h
- +++ b/version.h
--@@ -3,4 +3,5 @@
-+@@ -3,3 +3,6 @@
-  #define SSH_VERSION	"OpenSSH_7.6"
-  
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
-+-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
-++#define SSH_PORTABLE	"p1"
- +#define SSH_HPN		"-hpn14v12"
-++#define SSH_X509		"-PKIXSSH-11.0"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
-++#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN
- -- 
- 2.14.2
- 
diff --git a/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch
deleted file mode 100644
index 9d8f9a6cdef3..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/openssh-7.6p1+x509-11.2.diff	2018-03-13 10:48:08.755434051 -0700
-+++ b/openssh-7.6p1+x509-11.2.diff	2018-03-13 10:51:27.217980071 -0700
-@@ -29025,13 +29025,6 @@
- diff -ruN openssh-7.6p1/servconf.c openssh-7.6p1+x509-11.2/servconf.c
- --- openssh-7.6p1/servconf.c	2017-10-02 22:34:26.000000000 +0300
- +++ openssh-7.6p1+x509-11.2/servconf.c	2018-02-11 12:07:01.000000000 +0200
--@@ -1,5 +1,5 @@
-- 
---/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */
--+/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */
-- /*
--  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
--  *                    All rights reserved
- @@ -9,6 +9,29 @@
-   * software must be clearly marked as such, and if the derived work is
-   * incompatible with the protocol description in the RFC file, it must be
-@@ -29467,27 +29460,6 @@
-  	case sAllowUsers:
-  		while ((arg = strdelim(&cp)) && *arg != '\0') {
-  			if (options->num_allow_users >= MAX_ALLOW_USERS)
--@@ -1663,9 +1931,9 @@
-- 		if (!arg || *arg == '\0')
-- 			fatal("%s line %d: missing PermitOpen specification",
-- 			    filename, linenum);
---		i = options->num_permitted_opens;	/* modified later */
--+		value = options->num_permitted_opens;	/* modified later */
-- 		if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
---			if (*activep && i == 0) {
--+			if (*activep && value == 0) {
-- 				options->num_permitted_opens = 1;
-- 				options->permitted_opens = xcalloc(1,
-- 				    sizeof(*options->permitted_opens));
--@@ -1683,7 +1951,7 @@
-- 			if (arg == NULL || ((port = permitopen_port(arg)) < 0))
-- 				fatal("%s line %d: bad port number in "
-- 				    "PermitOpen", filename, linenum);
---			if (*activep && i == 0) {
--+			if (*activep && value == 0) {
-- 				options->permitted_opens = xrecallocarray(
-- 				    options->permitted_opens,
-- 				    options->num_permitted_opens,
- @@ -1885,11 +2153,20 @@
-  
-  	case sDeprecated:
diff --git a/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch b/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch
deleted file mode 100644
index 5dc96d4d0a37..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 69bda0228861f3dacd4fb3d28b60ce9d103d254b Mon Sep 17 00:00:00 2001
-From: "djm@openbsd.org" <djm@openbsd.org>
-Date: Wed, 4 Oct 2017 18:49:30 +0000
-Subject: [PATCH] upstream commit
-
-fix (another) problem in PermitOpen introduced during the
-channels.c refactor: the third and subsequent arguments to PermitOpen were
-being silently ignored; ok markus@
-
-Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd
----
- servconf.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/servconf.c b/servconf.c
-index 2c321a4a..95686295 100644
---- a/servconf.c
-+++ b/servconf.c
-@@ -1,5 +1,5 @@
- 
--/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */
-+/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */
- /*
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-  *                    All rights reserved
-@@ -1663,9 +1663,9 @@ process_server_config_line(ServerOptions *options, char *line,
- 		if (!arg || *arg == '\0')
- 			fatal("%s line %d: missing PermitOpen specification",
- 			    filename, linenum);
--		i = options->num_permitted_opens;	/* modified later */
-+		value = options->num_permitted_opens;	/* modified later */
- 		if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
--			if (*activep && i == 0) {
-+			if (*activep && value == 0) {
- 				options->num_permitted_opens = 1;
- 				options->permitted_opens = xcalloc(1,
- 				    sizeof(*options->permitted_opens));
-@@ -1683,7 +1683,7 @@ process_server_config_line(ServerOptions *options, char *line,
- 			if (arg == NULL || ((port = permitopen_port(arg)) < 0))
- 				fatal("%s line %d: bad port number in "
- 				    "PermitOpen", filename, linenum);
--			if (*activep && i == 0) {
-+			if (*activep && value == 0) {
- 				options->permitted_opens = xrecallocarray(
- 				    options->permitted_opens,
- 				    options->num_permitted_opens,
--- 
-2.16.1
-
diff --git a/net-misc/openssh/files/openssh-7.6_p1-warnings.patch b/net-misc/openssh/files/openssh-7.6_p1-warnings.patch
deleted file mode 100644
index 5843dd162cd9..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/openbsd-compat/freezero.c b/openbsd-compat/freezero.c
-index 3af8f4a7..7f6bc7fa 100644
---- a/openbsd-compat/freezero.c
-+++ b/openbsd-compat/freezero.c
-@@ -14,6 +14,7 @@
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#include <string.h>
- #include "includes.h"
- 
- #ifndef HAVE_FREEZERO
diff --git a/net-misc/openssh/files/sshd.rc6.5 b/net-misc/openssh/files/sshd.rc6.5
deleted file mode 100644
index 044cbe7268f2..000000000000
--- a/net-misc/openssh/files/sshd.rc6.5
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-: ${SSHD_CONFDIR:=${RC_PREFIX%/}/etc/ssh}
-: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config}
-: ${SSHD_PIDFILE:=${RC_PREFIX%/}/run/${SVCNAME}.pid}
-: ${SSHD_BINARY:=${RC_PREFIX%/}/usr/sbin/sshd}
-: ${SSHD_KEYGEN_BINARY:=${RC_PREFIX%/}/usr/bin/ssh-keygen}
-
-command="${SSHD_BINARY}"
-pidfile="${SSHD_PIDFILE}"
-command_args="${SSHD_OPTS} -o PidFile=${pidfile} -f ${SSHD_CONFIG}"
-
-# Wait one second (length chosen arbitrarily) to see if sshd actually
-# creates a PID file, or if it crashes for some reason like not being
-# able to bind to the address in ListenAddress (bug 617596).
-: ${SSHD_SSD_OPTS:=--wait 1000}
-start_stop_daemon_args="${SSHD_SSD_OPTS}"
-
-depend() {
-	# Entropy can be used by ssh-keygen, among other things, but
-	# is not strictly required (bug 470020).
-	use logger dns entropy
-	if [ "${rc_need+set}" = "set" ] ; then
-		: # Do nothing, the user has explicitly set rc_need
-	else
-		local x warn_addr
-		for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do
-			case "${x}" in
-				0.0.0.0|0.0.0.0:*) ;;
-				::|\[::\]*) ;;
-				*) warn_addr="${warn_addr} ${x}" ;;
-			esac
-		done
-		if [ -n "${warn_addr}" ] ; then
-			need net
-			ewarn "You are binding an interface in ListenAddress statement in your sshd_config!"
-			ewarn "You must add rc_need=\"net.FOO\" to your ${RC_PREFIX%/}/etc/conf.d/sshd"
-			ewarn "where FOO is the interface(s) providing the following address(es):"
-			ewarn "${warn_addr}"
-		fi
-	fi
-}
-
-checkconfig() {
-	checkpath --directory "${RC_PREFIX%/}/var/empty"
-
-	if [ ! -e "${SSHD_CONFIG}" ] ; then
-		eerror "You need an ${SSHD_CONFIG} file to run sshd"
-		eerror "There is a sample file in /usr/share/doc/openssh"
-		return 1
-	fi
-
-	${SSHD_KEYGEN_BINARY} -A || return 2
-
-	"${command}" -t ${command_args} || return 3
-}
-
-start_pre() {
-	# If this isn't a restart, make sure that the user's config isn't
-	# busted before we try to start the daemon (this will produce
-	# better error messages than if we just try to start it blindly).
-	#
-	# If, on the other hand, this *is* a restart, then the stop_pre
-	# action will have ensured that the config is usable and we don't
-	# need to do that again.
-	if [ "${RC_CMD}" != "restart" ] ; then
-		checkconfig || return $?
-	fi
-}
-
-stop_pre() {
-	# If this is a restart, check to make sure the user's config
-	# isn't busted before we stop the running daemon.
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return $?
-	fi
-}
-
-reload() {
-	checkconfig || return $?
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/net-misc/pingu/Manifest b/net-misc/pingu/Manifest
new file mode 100644
index 000000000000..d6893fa3d488
--- /dev/null
+++ b/net-misc/pingu/Manifest
@@ -0,0 +1,9 @@
+AUX pingu-1.5-makefile.patch 601 BLAKE2B 4a651802ecd4549671ca99bf16836f117a2292a254f437fd00bcd7aee65d0fb008a1934aecc39c108c754c7eefb6ac322b8d32df9b0d015a0e7319b032b66bf7 SHA512 ed567b42e7d7b3d549092d97e8c0b9bb4ee78c8ef8b8624e0f8f27701faf8a6cecdbba9bc622aee261ff7868fcc0358fce12a54060d2a9de7fbe52da759dfc99
+AUX pingu.confd 107 BLAKE2B e0718a9bd9d364e90bb32dfc6140786a9e798946c13527d8b0f7022ee481fb9d83fb297e9b4805d60c222f1e05b8319cabbdb6ab5b6475363986d2f7b2642e36 SHA512 86a67a154be6973bda53e1de00e3342d42c2af5ccb8d9c01dffb429a27d11f648fa9637cd3573d7245b98f8e4648c5054f5698f4913c20f40dc1e7f2e1338938
+AUX pingu.initd 292 BLAKE2B 5237192fe86acb4c10b0f4b34ff3609b8efbc7da90a028e1d6e9f8b77c080899e1a9d0faaed0a94308b87e08306882b63d23abb53c441889a492c3f36d156b2e SHA512 53062de7bd025b2d02649222a6811fad8e01758cf29491180370e11d4c3dcc5e78f50cdf0980196c682d34ef305e726a446db68afaadb1d6dc20751c40fffe2e
+AUX pingu.service 171 BLAKE2B 62a47288ec37613de21022ccbfae46a549dfda21699788c32da170ac674e2321a17968484b982e4e3fa386bca5fcc2ee1f3169ebc50f466bbd2cbcf183e79d21 SHA512 114b3a0c50ef9d737509fe3ea9386bdc4a138d7851d3f81ed13c886dd1be5e9593d513e3bfa0b4ff30b478780caf6c709038ab98a63d143a559ffde480fe62ef
+AUX pingu.tmpfile 28 BLAKE2B 210f520d7b30a5c33747f481674dfa588c690589ca5cc03d5a450505f47b83231ecedf9f40afb0a67634206e3eda305a03335d93b1eb19b879c9fe5d06ac222d SHA512 e7e396baf936f5a04c5cdbe2e56058aa4b1a3a85bcf60137ce673da4662b8d02227e773da243f9ae2606fb7112eec2cd226de57524a3aec55e84331d1891e6cf
+DIST pingu-1.5.tar.gz 31565 BLAKE2B 13d1fa075f32d5a32cece55c5292cda08f72e711a8567cc8b25ce0e2bb0325395f1346e9feb96eb266c93d10d04609d87562192f7b7d0c22730fd4a8561c6c1a SHA512 71e5fbe93f831f24d168957cdeaff2817a22f407575316d6515755bec760d10724821070549eaab562924237b96976a1a776ca903d5fe0cd9f9b69a38eadd8c9
+EBUILD pingu-1.5.ebuild 1298 BLAKE2B 00ddb5cffca604bfdcb620ebd450e633e7e2aff732eed954f3d1ed2b8adb47d0a85040a0fb8914d29b2e50a48f304530158882265ee93f15f2d06d779057105d SHA512 96387332ec8643e9b75d1931e1430ce3d0cb0efad3adfa0024ebfc09774f957f952533df2bb47a3e9d633c0e824be920057cc7de7da818b7f7d6af4deb114760
+EBUILD pingu-9999.ebuild 1139 BLAKE2B 4513781ea236033d279d7c5db84d896d37d88275d533b56ce18bab50db81dede0d173d930b86bdaafa86011c379ec0265bcfe9e9c516244bee224245ef65e8c9 SHA512 be1dd4c24a21f51578e92a28ae023e7c51ab26c713e11ab4a12e9db0d118352956c2cbb37806d22e3d7420d2c8315db9a3e38ea78ed03426eae425db8744e7da
+MISC metadata.xml 590 BLAKE2B 94c0dffa914dc9d92714f494729ae239a9f086ac62d8aebac8b2e47f4ec89e17c8f27cc8c268ec1e613cad0c2a79d3f15b64cb8753ed3d675cdffcfe847084df SHA512 9ad09d7d667e80a83d41543eb18735728f39fe7e20d782d649359954e7bcb95c2f882436e0d6972ac9650c129358d230b98a8e57125d4ed82d089e18a4bd6c38
diff --git a/net-misc/pingu/files/pingu-1.5-makefile.patch b/net-misc/pingu/files/pingu-1.5-makefile.patch
new file mode 100644
index 000000000000..a4c04aac31f2
--- /dev/null
+++ b/net-misc/pingu/files/pingu-1.5-makefile.patch
@@ -0,0 +1,21 @@
+--- a/src/Makefile	2017-11-25 18:39:32.667570139 +0200
++++ b/src/Makefile	2017-11-25 18:41:29.285573031 +0200
+@@ -17,7 +17,7 @@
+ 
+ rundir ?= $(localstatedir)/run
+ 
+-pingustatedir = $(rundir)/pingu
++pingustatedir = /run/pingu
+ 
+ DESTDIR ?=
+ 
+@@ -93,8 +93,7 @@
+ 	$(MAKE) -C $@
+ 
+ install: $(TARGETS) $(INSTALL_LUA_TARGET)
+-	$(INSTALLDIR) $(DESTDIR)/$(bindir) $(DESTDIR)/$(sbindir) \
+-		$(DESTDIR)/$(pingustatedir)
++	$(INSTALLDIR) $(DESTDIR)/$(bindir) $(DESTDIR)/$(sbindir)
+ 	$(INSTALL) $(BIN_TARGETS) $(DESTDIR)/$(bindir)
+ 	$(INSTALL) $(SBIN_TARGETS) $(DESTDIR)/$(sbindir)
+ 	for dir in $(SUBDIRS); do \
diff --git a/net-misc/pingu/files/pingu.confd b/net-misc/pingu/files/pingu.confd
new file mode 100644
index 000000000000..ae4ae8603fd0
--- /dev/null
+++ b/net-misc/pingu/files/pingu.confd
@@ -0,0 +1,5 @@
+# Config file for /etc/init.d/pingu
+
+# Various options.
+# run `pingu -h` for valid cmdline options
+OPTS=""
diff --git a/net-misc/pingu/files/pingu.initd b/net-misc/pingu/files/pingu.initd
new file mode 100644
index 000000000000..c4de6a754c31
--- /dev/null
+++ b/net-misc/pingu/files/pingu.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/sbin/pingu
+command_args="-d ${OPTS}"
+description="Policy routing daemon"
+name="Policy routing daemon"
+pidfile=/run/pingu/pingu.pid
+
+depend() {
+	need net
+}
diff --git a/net-misc/pingu/files/pingu.service b/net-misc/pingu/files/pingu.service
new file mode 100644
index 000000000000..6677e9b8efd8
--- /dev/null
+++ b/net-misc/pingu/files/pingu.service
@@ -0,0 +1,11 @@
+[Unit]
+Description="Policy routing daemon"
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/pingu -d
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/pingu/files/pingu.tmpfile b/net-misc/pingu/files/pingu.tmpfile
new file mode 100644
index 000000000000..c48124d1e470
--- /dev/null
+++ b/net-misc/pingu/files/pingu.tmpfile
@@ -0,0 +1 @@
+d	/run/pingu	0755	root	root
diff --git a/net-misc/pingu/metadata.xml b/net-misc/pingu/metadata.xml
new file mode 100644
index 000000000000..4a306e8d3616
--- /dev/null
+++ b/net-misc/pingu/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	Pingu is a daemon that takes care of policy routing and
+	fail-over in multi ISP setups.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">ncopa/pingu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/pingu/pingu-1.5.ebuild b/net-misc/pingu/pingu-1.5.ebuild
new file mode 100644
index 000000000000..1d074daa34ea
--- /dev/null
+++ b/net-misc/pingu/pingu-1.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Policy routing daemon with failover and load-balancing"
+HOMEPAGE="https://github.com/ncopa/pingu"
+SRC_URI="https://github.com/ncopa/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="dev-libs/libev:="
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	virtual/pkgconfig
+	doc? ( app-text/asciidoc )"
+
+# Fix QA with install into path /run/pingu must be created at runtime
+PATCHES=( "${FILESDIR}"/"${P}"-makefile.patch )
+
+src_prepare() {
+	default
+
+	# Fix compilation issue
+	sed -i '/icp->un.frag.__unused = 0;/d' src/icmp.c \
+		|| die "sed failed for src/icmp.c"
+}
+
+src_configure() {
+	./configure "$(use_enable debug)" "$(use_enable doc)" \
+		--prefix=/usr || die "configure failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newtmpfiles "${FILESDIR}"/pingu.tmpfile pingu.conf
+	newinitd "${FILESDIR}"/pingu.initd pingu
+	newconfd "${FILESDIR}"/pingu.confd pingu
+	systemd_dounit "${FILESDIR}"/pingu.service
+	keepdir /var/lib/pingu
+	insinto /etc/pingu
+	newins pingu.conf pingu.conf.example
+}
+
+pkg_postinst() {
+	tmpfiles_process pingu.conf
+}
diff --git a/net-misc/pingu/pingu-9999.ebuild b/net-misc/pingu/pingu-9999.ebuild
new file mode 100644
index 000000000000..30ea3b2eab70
--- /dev/null
+++ b/net-misc/pingu/pingu-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Policy routing daemon with failover and load-balancing"
+HOMEPAGE="https://github.com/ncopa/pingu"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/ncopa/${PN}.git"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug doc"
+
+RDEPEND="dev-libs/libev:="
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	virtual/pkgconfig
+	doc? ( app-text/asciidoc )"
+
+# Fix QA with install into path /run/pingu must be created at runtime
+PATCHES=( "${FILESDIR}"/"${PN}"-1.5-makefile.patch )
+
+src_configure() {
+	./configure "$(use_enable debug)" "$(use_enable doc)" \
+		--prefix=/usr || die "configure failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newtmpfiles "${FILESDIR}"/pingu.tmpfile pingu.conf
+	newinitd "${FILESDIR}"/pingu.initd pingu
+	newconfd "${FILESDIR}"/pingu.confd pingu
+	systemd_dounit "${FILESDIR}"/pingu.service
+	keepdir /var/lib/pingu
+	insinto /etc/pingu
+	newins pingu.conf pingu.conf.example
+}
+
+pkg_postinst() {
+	tmpfiles_process pingu.conf
+}
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 3ef39a40bbf6..ee6ea0ad988e 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,3 +1,3 @@
 DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f
-EBUILD vino-3.22.0.ebuild 1633 BLAKE2B c0f50eba83fd449c354e1463a4810358013899285e17b15a21e57f625acc5ff6c4e71bbe9f16ace0606baaf4c80846d5d860e53f1075bc5169f5f85428d37e67 SHA512 9134f6315e151bdc72953943faa8182830752e71146ba089c4b0b8c65e64306baf129bed77944f5f4541630e542ce94f2e8b8f0460e40a713ed6b9486a9eddf8
+EBUILD vino-3.22.0.ebuild 1651 BLAKE2B 345994ec32582e2fd99fba1dd860557119976ab09dd34aff5ea8aa01c9cf6658181522178cc8818f39114452016c172331fe0055edebbf333d80732d8e9145e3 SHA512 5d2e83be516cde4164c4c5a5067ab789ebd95fcc0133680cf2714db10677728fca0ce70d2d3790e236315399098df532610a0a0f74b3ca7585b9daec09b4c1ae
 MISC metadata.xml 343 BLAKE2B 92816370ecc7d4e3b9d3f4513ee7c437b98ea3ca798107beb1b4885ab778768e19a20dbf8a3c19dd1c6d2b812a2498a9d1e2b4f4211dad0f350f620420a523e2 SHA512 dc33b648174ba60a62212dd252f1d358ee7a05ddbd41ae2b31dbdf362f4f780207c5183c0b180d68c8df5a613e91c1336231f2d75100076a01517e4d70d8252d
diff --git a/net-misc/vino/vino-3.22.0.ebuild b/net-misc/vino/vino-3.22.0.ebuild
index bf21f64eb59d..5e5c68740d17 100644
--- a/net-misc/vino/vino-3.22.0.ebuild
+++ b/net-misc/vino/vino-3.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,6 +45,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-crypt/libsecret
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50
 	virtual/pkgconfig
 "
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 15ca1214bf06..fd4aa7cfd9f1 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,9 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
-DIST whois_5.3.1.tar.xz 82920 BLAKE2B b4e58ae3f58c8e5de8bca5be3c0e753e0de91651bea1aa4789d389bc65e5155cddb1e87a2adc39340f33360533ef2b86eb9b7b13116a2d64e8a68496529e65e5 SHA512 4840ceecaef1d47bda436f8de8b539ff2b1446dd99ec0867d0bb2b478c13fac190a4a265ab31abb30a779f1a221062f298cd01a1b19ce873221b39dbd3a4a3d7
 DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
+DIST whois_5.4.0.tar.xz 83576 BLAKE2B fb21094227bc254e7901d0af667206f742657093b2dc25dc066ccb727d07fbc9cef7443f29d0bd22e307d2127689f9fe33e55282e0311f968039bb0fbe48417f SHA512 d6b8f097eaaab216d862503c96aff32777caec3597b357fb2589b86e98c6ff52f35b18ea5f33d1ece23250c61f849daf9943a2895fe563b05fcbd26718b3b80e
 EBUILD whois-5.2.20.ebuild 1503 BLAKE2B c8f9f004b15d47af335cbb9ef8e8504fa5cf1e91c3c8dc35117df6772a3831081b51fd5379a93ed65119219f6657c6a2dbfade35dbdc39fa1080e203aabf82e7 SHA512 ef0fcf8e2a3d4b439644112a2b8e69f56e652f6afd19172d550c7669a34be8ee291944ae7bc74feb0fadaf346eadd9e64d192205b6d3b46a6efd1684268f2452
-EBUILD whois-5.3.1.ebuild 1593 BLAKE2B c4831da66c7db8d7f7b04c1f7b3f4ed97cd84598778a240c74a6a1ee7d5909bc7e2692f57ce7c0903146ed6aea85bd9ceaa69586cfc5d5b1e251c064a89c5bfe SHA512 89c30e09ef96e1cb38aba09549c5993549563651cac4d67e63d8693ffb7105de7886fadc0f7a73a2ddd941cc910e45171198d5dc1eb3abf75bde7aaa0341d9ee
-EBUILD whois-5.3.2.ebuild 1593 BLAKE2B c4831da66c7db8d7f7b04c1f7b3f4ed97cd84598778a240c74a6a1ee7d5909bc7e2692f57ce7c0903146ed6aea85bd9ceaa69586cfc5d5b1e251c064a89c5bfe SHA512 89c30e09ef96e1cb38aba09549c5993549563651cac4d67e63d8693ffb7105de7886fadc0f7a73a2ddd941cc910e45171198d5dc1eb3abf75bde7aaa0341d9ee
+EBUILD whois-5.3.2.ebuild 1583 BLAKE2B c2f14b51bc9fbfafb9fb3e7932d511070021e6a938f40e0c6a7cb6162a3b7cd5818de75412150cb8af375cf2e5979ec81d03df1a944564fe559f4e1171e016b9 SHA512 b5c9a274a929b0baf0f7449220dc02979be48825f1b1560a71bb679adbe9c15303fb3a95425ad8a506692fe535232b8542ad445add1cc7597f7dab7b9867e89e
+EBUILD whois-5.4.0.ebuild 1590 BLAKE2B b832b7c82c05efff9136bd6f4ca02c9b482f141fdeff38aa6b72ec5ef5b3cefe74b9a8711f4f358bac380d0c34f2ecd0bb92203c40f0912aecbdfedbd64834cc SHA512 6251dd887631db7394f43ab322d733b4da29f5c012c8398de2f79c83ba57bde18dea0ead4fd6eef8005e48373946ac6ebe88e468173c59d6735175eec65be37e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.3.2.ebuild b/net-misc/whois/whois-5.3.2.ebuild
index 27fc4102f0ca..1a2a41bfc449 100644
--- a/net-misc/whois/whois-5.3.2.ebuild
+++ b/net-misc/whois/whois-5.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/whois/whois-5.3.1.ebuild b/net-misc/whois/whois-5.4.0.ebuild
index 27fc4102f0ca..ae4f333c28e5 100644
--- a/net-misc/whois/whois-5.3.1.ebuild
+++ b/net-misc/whois/whois-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 3f47d05a5a38..3b843c57dfa2 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -6,5 +6,5 @@ DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b1
 EBUILD x2goclient-4.1.0.1-r1.ebuild 1212 BLAKE2B 817b894fa28a636679d986e1c1cbcc60c1c0c575c1ee3a6a61053c6ec4a396db6af09daa15f5b87729fb8b4da162d92345abe685f8028e78c06ca51f5342636f SHA512 6828dde23894609af104231e8e3f86e473bb9491caafe9016ffa2da2415813f785525169b288a23439d26926528bb8a2b26a1e77bf0fbd46ccc803c09527cef3
 EBUILD x2goclient-4.1.1.0.ebuild 1377 BLAKE2B e7f76cefcbb3fbe497dc3d653291dd5d70998f33632a83fe2a98bb724c2a4ea9953b41ca390473b2b494824f4b52f56c0dc06d030fa72d5f67a95e813d7a5c35 SHA512 6665dbc7ddef0a202a0dca44a8cae74dc1117253f0f9129bdee3b8dd80e2ddddfac7182d58dcda89dbcacbd7dd0d30b976c698c15c5a337b37fbceeb26338b04
 EBUILD x2goclient-4.1.1.1.ebuild 1378 BLAKE2B e57ee137c064cbca5f3a74a4d6da5c3a62cc12a13837d86a76934cb696f6ceae1320d0bcce78e45a1e937aa960c27b360354f7e9d8221e73570e034252089d64 SHA512 96ac2ad4645b5a220050b7a7b70ff8cf64330be309f5739f2230c6e89ea49cf296b8da6bb2335cd3a07e40cd57141cd44593f69737f17b8c0c30fa0d77c0054c
-EBUILD x2goclient-4.1.2.1.ebuild 1420 BLAKE2B 2320ffa67ef0249d5de07dbb640d5ca26318b137ac887095ae462a062e432839dae73d867f9f7c9d0af0bb77543e3411ce8526d68aec3cbc42df37c483260229 SHA512 9e52c5364f16d0b06de4530ef4ca467d486afbe5c4181eb80701462b48243616a757a0f506e798318ff112c3911f9d1383da9c3c15b0c5d0e2a85a86e196ca77
+EBUILD x2goclient-4.1.2.1.ebuild 1419 BLAKE2B 3d5c8683105bb9f6b37e7111343891eb773b3ba1a8fd6755d0cae28ea9509852d1675be7bd67eb74cec52cca218d0cef222002763fb0ebf3486b2d919578b614 SHA512 5877bf18d4b5cb4db3c6541f754ed8a92d3f8d5b058e44eaab052b7b0ed8cf5b4ca9b9a201931a9d0cd176a40b2c37071050144d8901a090f8b397fbf1d79d94
 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
index 4309d740919a..9912ac58712b 100644
--- a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="ldap"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 6c0802872c97..0353f3fe2fc6 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -9,5 +9,5 @@ DIST x2goserver-4.1.0.2.tar.gz 138053 BLAKE2B 5281f05d8531ace6e9228faf5c73590b17
 EBUILD x2goserver-4.0.1.22.ebuild 2745 BLAKE2B 46368f9d193c2961f8a7643e36caf60c4e3e7917a5b0279e31e50e3132851c132c7d4398404de69cc2d7b786b993e250f39aec5d3b81de779f89be0c74b6b063 SHA512 085e01dc8fe8fb4b7e7d609db05852deaaec28a828f0ea7d27d17e02b6972240078b790a13b77d1df0dba826407ec4369b739cfd2a01068429fae9978025a85b
 EBUILD x2goserver-4.1.0.0-r1.ebuild 2716 BLAKE2B 9fcf8025a9173d0ee4d9b7d2c10a6dbee4b407719a94ff499dcb36de79ac0c854347f837a5fd5a524bd91cd920951623c51e651c773c4115abc8ada55713dd94 SHA512 f25ec7e1f78fda719e99b28bc90372bf6ff4748d610f8145a1cf31b244bddee2c62879e9349a79ee79b632012259683a47e95c7a24e173594a180d988cfc271b
 EBUILD x2goserver-4.1.0.1.ebuild 2716 BLAKE2B 9fcf8025a9173d0ee4d9b7d2c10a6dbee4b407719a94ff499dcb36de79ac0c854347f837a5fd5a524bd91cd920951623c51e651c773c4115abc8ada55713dd94 SHA512 f25ec7e1f78fda719e99b28bc90372bf6ff4748d610f8145a1cf31b244bddee2c62879e9349a79ee79b632012259683a47e95c7a24e173594a180d988cfc271b
-EBUILD x2goserver-4.1.0.2.ebuild 2712 BLAKE2B 4684f4421857be5004c2bbddd3f16fe1aa8a2ee99d39019ab5517769fc402a531ad8ba4bf5e91c59357ab21b9fd9dfb26cfc8db69638733c9801ba5e14f1cb67 SHA512 35c655994b37ff5ea58e25f6c3e3d87624ca2e5331538120e0314e1f3d98427d92a0b2c1cede7d695fe117f554ffa0978fa1c4a0b599042e7b97f9ede6aeab4f
+EBUILD x2goserver-4.1.0.2.ebuild 2711 BLAKE2B 188f91ad888a632a3ecbba4ea6b4d9ad8f909bcd01d72eb5734b4304765dc7157325e0420c5c332681b15f5cff243ede8629ea368f2546dbb7fe0a288a2249ba SHA512 eaa56966049689fbfac0fcccaca74a62bab669a06b94ecadfa530c344ec6c280e1bb7252a9d69845fe66ea7fd14e341897080890cad633e75b32568255614730
 MISC metadata.xml 398 BLAKE2B 4e3f8a55917796a30045a54805c7d7d8d4457ec14aa2354987868e02805192f208f1dd624414e1b04633ccd4d2fccd0d05b91deabc3073aefdb019578acdc42d SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
index c55cc66218e5..42f843d70c69 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 984f05a7cf57..ff2006e10f86 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
 DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
-DIST youtube-dl-2018.09.26.tar.gz 3042551 BLAKE2B 1cf4fe51a55bd82bacf5405119f91c78d975d755c8dc50e41b52f8e0af26074d6873b4046970afda81b3732825918c3bd1a14aaf3ef554096db063b365a72e6a SHA512 b54721bd9b6c6bb66d0ddf4000a435bf8f4d3884a513aada844497db38a5bca34f82484b483b20adb709043ffdd1c00b6aa6cb9c5e6d5be2306d0ae7be77caee
 DIST youtube-dl-2018.10.05.tar.gz 3044157 BLAKE2B c65651eebda6bd9c28245415f7aa804c78a74fa33a9717a3e9589734334ed8d12d5432eadd18d55ee46d4b51b1cacbe458c2ad175ed2e135b838fac54d468192 SHA512 b581372522d467b3277d81bdc9978352c720d4f33e0d8249cd0271eb1814a153324a5b34608d88d392bb52b1c57d0a6f425baf8377d5609810ef770839586714
+DIST youtube-dl-2018.10.29.tar.gz 3045428 BLAKE2B cf21d3113c07b7d62a373ada4a366fa61231eb8aa7f14192683451c99cf3f4f59d1abc04053359c2c3b40e7f80cfc2c5325f66a1b73196bb561a2244988f5114 SHA512 86f94acc888084348466d8aabc3711f25cbeb28c9a7afe08dcf23034d3b43d0e0a9c58dab60fe9c7eb2ab8ce2e3ce97b849e1eb11f547d173bb25dbb9df1b39f
 EBUILD youtube-dl-2017.11.15.ebuild 2365 BLAKE2B cff79a16ba920a6b85b9e7970a12065fade413701a7b0fbd86e739887ea86dde832e7d9344f73fef2480e32d689c8c89ed3926afc9f2cf702b9385550dd38c04 SHA512 5be26dbc448c37d37db450f7b70aed88124794e7f80ba584485ee99fdb6288093e5bae05ca8b2e58eb783b7a398fc5b866728711588d43da6bf46c07f47bf1fb
 EBUILD youtube-dl-2018.08.22.ebuild 3286 BLAKE2B 998db6c1bf8f4bdb39152fa75712e4ebe98a9d69422b464328da90fb986e8ea07ddeb9e90cbff52dcd8012cce96ab06e48d7e4c87e6a660cc5fd90dfa5bd731a SHA512 927eab9548db77ce0a3455023a2f85bab64a0dae9a03d09d8b1ce96ec891bf32e49b2b2292abc5688db940eefae51473918df6449469f054a859820398782a11
-EBUILD youtube-dl-2018.09.26.ebuild 3286 BLAKE2B 3d1dcd532b3718f37128c1b3e95ccb4bbff360335a28232e8169cc87de2f74c60b9ae1c51ded8d49ebb71cd4b864bae7ee5d5c09788eea8123e8430a34059634 SHA512 e72de7230ed2cfd9371e12bf2a74d1c42ca4f7f4c42bcb1d0e78735b7768521e55e3227706b24c50d4d394f19ef75d42b95d73d27464919cdc2a7b2cf34572b8
 EBUILD youtube-dl-2018.10.05.ebuild 3439 BLAKE2B 2e9fcd2e40f815a9d75bb7adff01f12afa5345c027f5dc55b9e20b30a3055bef402d66361048a9cc6cb71e1e6b3982e3b059bee837fb8d36c886be616d078490 SHA512 b46ab94dffbea58076d3b83de105a1c51ed1ae2213ff9b26b074cdcc41ec8ed97223baf92aec78ca2c56d0614826893a01ee0ca8e2e5667561dc43fec12ebbca
+EBUILD youtube-dl-2018.10.29.ebuild 3439 BLAKE2B 2e9fcd2e40f815a9d75bb7adff01f12afa5345c027f5dc55b9e20b30a3055bef402d66361048a9cc6cb71e1e6b3982e3b059bee837fb8d36c886be616d078490 SHA512 b46ab94dffbea58076d3b83de105a1c51ed1ae2213ff9b26b074cdcc41ec8ed97223baf92aec78ca2c56d0614826893a01ee0ca8e2e5667561dc43fec12ebbca
 EBUILD youtube-dl-99999999.ebuild 3306 BLAKE2B 7bd4ace3451b5edfef9e1ec119fc76b903aff5263e56a556334ccdf9df33fb223f3490de38edb61ce60e78efa5bcff7b8b3de144152db729b25b9ff58d9fc51e SHA512 ce0d4ae78c44450821d42948736ff85c78a84a1f96857588d18d0c43ac82dc55514c5d3b4b489ba6684565c800676231badab8e892f5b7110831432d6bf8807f
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.09.26.ebuild b/net-misc/youtube-dl/youtube-dl-2018.10.29.ebuild
index 8a6b3e14fd72..ccd279b522c6 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.09.26.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.10.29.ebuild
@@ -106,10 +106,12 @@ pkg_postinst() {
 	elog "videos can be retrieved in a higher quality format without sound."
 	elog "${PN} will detect whether avconv/ffmpeg is present and"
 	elog "automatically pick the best option."
-
 	elog
 	elog "Videos or video formats streamed via RTMP protocol can only be"
 	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
 	elog "Downloading MMS and RTSP videos requires either mplayer"
 	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
 }