gentoo resync : 02.01.2018

30 files changed, 141 insertions, 755 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e57c24a73850..7bb6751a008f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 17dcc3634bb0..6aad6a5a9e50 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,11 +1,5 @@
 DIST aria2-1.30.0.tar.xz 1497124 BLAKE2B 99bce103f1bd89b94e202cb7b2d9dc427398e0dec3517b25a3870515433b7be35fe2841b5ace049771181e6ce44acb82f8715c72347e7069acd6b003e33522ac SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38
-DIST aria2-1.31.0.tar.xz 1501388 BLAKE2B 6decd9a1ba658e27ada5137747a36764cedd37dd9caccd609dcfeb284f040d72a021a0bf79731a65e33a29cea0dc0e31f3e08dd633d6d0c44e95bea60a7c7182 SHA512 a0a1312522324dc0bc24cf1a5cceaef49d40445668ed0bd98dc3cdd5e2edb428552e97504c8c072f5d1180d6bbd252de01d290ef5c94d1803b8ade330bc2710f
-DIST aria2-1.32.0.tar.xz 1502192 BLAKE2B 8b515cb91dc30ee598bdae0f96c53448b22af73983fdc105e85e9a2feb68c33fcb3f3440c1808cedbba421d145f37022e876af9f0ab12dfaec5a59aa87f43787 SHA512 7c14c395fab3024191145b5c965c6c89211cd36ce405cafeef350aa6df9850bee9de65e756eab7d0bdeccb9409b829ea21552b9aac0166f50dcc17501b3dca8b
-DIST aria2-1.33.0.tar.xz 1526936 BLAKE2B 69012e3221afe6e510a3fabe68236526fa64c982b84b2894c61a847084bd151b607bbfc46ac8b4e802ff796e1a2d4d056209e36e9273f20d3acd22e6cc5db978 SHA512 6b28282b5688444c99c3219d185c5c87f1760300f47fb9a87f9ee5eb62dd366d55a7706bb6edb16957f0a6926b354b0c6cbbe9887c94980c3027775d06589fea
 DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a
 EBUILD aria2-1.30.0.ebuild 4270 BLAKE2B a3dd69cd5a6dce0c86e48c3abad321d16223834508778e2a850aa89fdfc2871b8f6b7d21ed15af9fd0572f4875119f23766e8fb4844f8ceb4008e551afcfc975 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a
-EBUILD aria2-1.31.0.ebuild 4272 BLAKE2B c270e7767410eb060d964450b0a83ae6f9c756e75ff911aca55d7efb297ee01bb4c7affe456655f629e66c89e01db4fcf366afb081329ed97e9e1a7c25b6b7a7 SHA512 bf640ec2df8a7949ae45e02f9ae6902e2e1580b02806c47e6aebb68d4042c5babe077e3f0e77d7afcac411afcfc09c5990840b04a9606fde7205630352d41620
-EBUILD aria2-1.32.0.ebuild 4272 BLAKE2B 8a4073814b1905196436cd50e03f57a1655c45d31031508e530fa461976d54ebfe6e9607d065ca45963b767ae04020efe637a165dab3af2297bad06966974fbd SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0
-EBUILD aria2-1.33.0.ebuild 4272 BLAKE2B 8a4073814b1905196436cd50e03f57a1655c45d31031508e530fa461976d54ebfe6e9607d065ca45963b767ae04020efe637a165dab3af2297bad06966974fbd SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0
 EBUILD aria2-1.33.1.ebuild 4272 BLAKE2B 8a4073814b1905196436cd50e03f57a1655c45d31031508e530fa461976d54ebfe6e9607d065ca45963b767ae04020efe637a165dab3af2297bad06966974fbd SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0
 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
diff --git a/net-misc/aria2/aria2-1.31.0.ebuild b/net-misc/aria2/aria2-1.31.0.ebuild
deleted file mode 100644
index b0c010ec8637..000000000000
--- a/net-misc/aria2/aria2-1.31.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( dev-libs/libuv:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/aria2/aria2-1.32.0.ebuild b/net-misc/aria2/aria2-1.32.0.ebuild
deleted file mode 100644
index de956e8d1695..000000000000
--- a/net-misc/aria2/aria2-1.32.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( dev-libs/libuv:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/aria2/aria2-1.33.0.ebuild b/net-misc/aria2/aria2-1.33.0.ebuild
deleted file mode 100644
index de956e8d1695..000000000000
--- a/net-misc/aria2/aria2-1.33.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( dev-libs/libuv:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest
index c9da67759d1d..894459c0f6d2 100644
--- a/net-misc/autoupnp/Manifest
+++ b/net-misc/autoupnp/Manifest
@@ -1,6 +1,4 @@
-DIST autoupnp-0.4.6.tar.bz2 240257 BLAKE2B 964f1c9fb7c07b7577a769064b3bb51a4edc6d5f924dafcc8d1882dfd9fe655eaabf9184a230c185dadc157613084c6fa8da03dc3b8591a93ae77f11c9606f9f SHA512 570ae76d940879a375e9336cb62cce8b2e007c57df6cbebee5878cf6a71d1fe5853218166ba0ee794586fa20a7c62b158aae9242b30880f6fe110c9bb1502ba1
 DIST autoupnp-0.4.7.tar.bz2 264916 BLAKE2B 3542c577a32f5ba3a8ea60c6f2ebb3d5cea76fa440d281e6895c246252d3ba70720aaafa4d843f06a23f1b022942cddb2a0b37b41eff91919db55fbbd87f28b5 SHA512 2c6bb3421fecbffea2a63ea1e930b7c789459d4626a0f281abe0e9bb62e5efc772475d4bf0c9f13fe2e9e13417940c6eb17408e6aae28bc24a4fc2e16d4dc8de
-EBUILD autoupnp-0.4.6.ebuild 638 BLAKE2B 71a4c3e7345200286f69cff92c87900d07f3480ac301525086fc6feed8e2dd0bcf7896821f0ec5402eeb843855e6e00aa83239046bc3c20a7f307bdcb67c0c82 SHA512 2f71d39e33cd92b7a856edb00fb8409661bfc9695e9bd54d323dbd8dad854fde137c675f13b978828877da5dcccb2691d3e13195f5baff32346016c98f114332
 EBUILD autoupnp-0.4.7.ebuild 610 BLAKE2B 0ef201d9447206f72f7d081245f7ce756ec59e2c1e13e8ec88bf555709f5406a97f105ee067e60cd5627fe69d04c686e78499d30d4362fc15da2bedc7438e5f1 SHA512 a433cd85eb23299a5ae377ddeccdc41bcaa2875b81fd9e09092647e5eee15aded956a24d6d9120c829491ec8dde370ac64b9917f98cbf4f7e8159e32a099d033
 EBUILD autoupnp-9999.ebuild 776 BLAKE2B c772f18299b242de3a22ea8d7babe829d4584cc8474d2cdc0a68301ca80b490bc245a7db07647010635bb0f01647084df3edcc3e793bddd33163bea4f88bbd4e SHA512 714a716c73c950068a91659593d82493eec249da7d9b8f38074eeaa377f5f0920a62418c426a7d5dc511ce888e6d06672a8825000d68fda1e1f5540fd30c5008
 MISC metadata.xml 511 BLAKE2B 75ced551d168b8262824bb7393f8289c57c57dbd6feedc922b44e083e5bb13e5acdcaee6c6b24ff8d40e919d3bbb2a2b59004cf2879e4f2e3082a95a1585e291 SHA512 91af116a031d29419468e6d690a12aa9dda0095cab46e529634e2eb3cd486e069a8ff0ab59637cf0ced97aedac86afe0ae4469226ea49f1b637d65931e090b22
diff --git a/net-misc/autoupnp/autoupnp-0.4.6.ebuild b/net-misc/autoupnp/autoupnp-0.4.6.ebuild
deleted file mode 100644
index e28dde826431..000000000000
--- a/net-misc/autoupnp/autoupnp-0.4.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Automatic open port forwarder using UPnP"
-HOMEPAGE="https://bitbucket.org/mgorny/autoupnp/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND="net-libs/miniupnpc
-	libnotify? ( x11-libs/libtinynotify )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	myeconfargs=(
-		$(use_with libnotify)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --all
-}
diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest
new file mode 100644
index 000000000000..800f01b20987
--- /dev/null
+++ b/net-misc/babeld/Manifest
@@ -0,0 +1,3 @@
+DIST babeld-1.8.0.tar.gz 92124 BLAKE2B 43f24c64280597201880a257095235447a49b97e7fcfc4f53db1c6e45564e41dc751017ce664779e4accdf03cb134cb33856288e2deebc6f194ae1e3744bad4e SHA512 6665ea5108200fe9d158a221ee5697c35fa1bf1d59e99a354aabea844342505731d77c1e3dff3917d048c2154bbadcdda5904ad6e46f16c43f52b5c297480b7d
+EBUILD babeld-1.8.0.ebuild 502 BLAKE2B a4bfaffc4f94305fc43d06ed1f5752e6f7664478ea395b23cedc54575e61fdd092169bde83cb19f0759cc30b19b3b68af8f024c3596f0fa2de9f26dbd68ed614 SHA512 b9bbc8a876416320d2e1deeb01bea933ba5e8e2682e606d06c45e43b35a6d46d4118a520f87f21ae9f61db43ce7a854d42ec640a5411ea769c23b1e85c613819
+MISC metadata.xml 213 BLAKE2B 21f4d23acabbf3b15cd7161a8b3d63b042b273a0839be30ed713eb9cf4f0e36d2a579264fb35fc66b12168288ef24b5abd2418e85abdf4e1ea5f7de1a26ef28f SHA512 e8aad49b782740278a85d29c45a05a6545fb67fe68cd4b47ba72a759ea822eff4eb5ac8e620cfa0fa44840ecc134d89d2f7281e88434527c78cd6c9c92f704ed
diff --git a/net-misc/babeld/babeld-1.8.0.ebuild b/net-misc/babeld/babeld-1.8.0.ebuild
new file mode 100644
index 000000000000..c39edc852990
--- /dev/null
+++ b/net-misc/babeld/babeld-1.8.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="a loop-free distance-vector routing protocol"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/babel/"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	emake CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install(){
+	emake "TARGET=${D}"  PREFIX="${EPREFIX}"/usr install
+	dodoc CHANGES README
+}
diff --git a/net-misc/babeld/metadata.xml b/net-misc/babeld/metadata.xml
new file mode 100644
index 000000000000..a492b8f65591
--- /dev/null
+++ b/net-misc/babeld/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person"><email>heroxbd@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 519bf3869ae4..7fc235ed8cb0 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -4,10 +4,8 @@ AUX chrome-remote-desktop.rc 1388 BLAKE2B 937378e8ad7bb295333dc537a9c333e1a1041a
 DIST chrome-remote-desktop_49.0.2623.40_amd64.deb 20315570 BLAKE2B 03725450590fad81105ae5314f9a1c9c9acc1b3f2d294ee1401379c264d59d737c2c39333ab5cb7a77e5885855ca484db360f0936be6c5bc2c84aa0cb38afe72 SHA512 d936885a986a749a0b4ebb1bb68fe0bc14d10d21363a409abbbb224b4f3ee048ef030ee81469be9bbb8c3852d7c6793fcab1f51d52fcaf5b02cda07550b72330
 DIST chrome-remote-desktop_49.0.2623.40_i386.deb 20941574 BLAKE2B 7f86e734fdc9c95f8820912aa075d4be805896f4f045ba39fb1fedc9ba6e3b576d71ce67692f683009ff005c2c248ed067ef4980906ae9e158c107aa96b58470 SHA512 00cf6641ee993fb8c295ca99cb57cde42eb3dd6cc34ae4684f858279615695d5b1a257081e8988293f94e887986492e112bc0276f572cd592d9879dec88eace8
 DIST chrome-remote-desktop_55.0.2883.50_amd64.deb 21636452 BLAKE2B 34ec5d7d5f01610161613921b685166be1f8c78eb8fdece45ea66fb83e05784adb33750fc9612cf77fd6a7b9c0bea8568c784d5b0ecd518e3f60ae2154295407 SHA512 3e140407d6e34caed18f3280d2136ea924ba7c9fc0159cde4981927be9c0bd090c58581ed01b3a99b8a796211500ff1588a847d5d3273ec814d9fb10285a97f8
-DIST chrome-remote-desktop_56.0.2924.51_amd64.deb 13879608 BLAKE2B 2ccc6d4c8b9d20992cdc84ccdf28fba54f2d18014225a6cdafb0a4ee6ab1e202eadbf6b039bbb2860c81fb7a9356bff8dc3b759f44c8a270f314e207bdd9f11a SHA512 0578f430d93270b398c7341515e10e25ffe4c8827b3a8dc01b789fc530eb0919cd560bfa8377d5e1f0c74c53db7ba2f60354c57e2c435dcb411d9168610a3b7f
 DIST chrome-remote-desktop_57.0.2987.37_amd64.deb 15677362 BLAKE2B aa92ef2a6c89043ff7e1a39c186edc57dabd9b5a629391aa0603f51b527131a94cea501a9929a5cacd951b8204959ed93203b81bdadf677af5d937774d110f69 SHA512 df470d9f69545dd2793b5d97674bb8724f5ad3dfad05b4d5572b01a21443d79e6776fb72ca14044d7ee00660b7d040023c9716e2568551e2862bdfd3cff99d88
 EBUILD chrome-remote-desktop-49.0.2623.40.ebuild 3668 BLAKE2B f149fbab2512737be2bf8668ac1aa6b0c2873a23afcbbef60fbb7d67fafd3ce213496860ff4266a05527712a26f6f9cf964258f8c8b5bb5c6638034c4f19ff5c SHA512 7486227050481ba09ac2f5a0c1fa205d1461210354bbbd2b1fdcd40195fc223ed018b439ad421c1f93c825e67106042e867f57552b68c26134fd185daa4126be
 EBUILD chrome-remote-desktop-55.0.2883.50.ebuild 3403 BLAKE2B a84618438a3ff2fc32e0cec93d45e3acbdb6f36b3fbbd400f7944deed4ee0bf406aa2f7d662da4c69388714ddf702afd9b139628ed80ef8c7542ce03c3357f88 SHA512 bc100be9a1d350e8e2068d7fc9cccefa54f846a7703222d6371a5b3b6f7a012e9c8de406518c69935999b03a45480ac8028820a601a1bcc9ccf7a1ecd5cdbf3c
-EBUILD chrome-remote-desktop-56.0.2924.51.ebuild 3405 BLAKE2B 0e5fe524121ac746cc2e070f364e58056534cfd949c106bf6ba7ad6c1d2c8b44e25a3d70fd14831c24a1adbb4d77f06b425d53beb8008e957e9892b8c79d3600 SHA512 f82404cef04d54b7e99b8fc271d8403e2e4bc659bb1c2b701794d1fc8823174b5e889622ca1873a37ffd56a121f9cb4e4b6ddce5b1253746fead511423400a9b
-EBUILD chrome-remote-desktop-57.0.2987.37.ebuild 3826 BLAKE2B 859a9ab7812e03d494eb789ff5baf7b531cc5e20270c149d4fbcc8e7748d236dff22216a9e361a9f2c0c175e455a5a73a9ca1c6c000eb7013bdf0f4696e0f0e7 SHA512 009b75c18f84a40d5d10a40704b12cd31cce0402c07740d6a906d7767239d8914f5744d25649ecc6037c7049f15e353668229ac27e49f728b7feb87ecf930cfe
+EBUILD chrome-remote-desktop-57.0.2987.37.ebuild 3825 BLAKE2B c5d0b10e2c3685b6152c5e35631d223e5993078365a9d54dbc336455d51c1c4d5d213db0b29f3cd4e84845fa0f35a1606a51aacc91b632ea651fb1322cfc8249 SHA512 0e275cce491f42c3ab65e9d3fce723bea92edfa6354ad20203f347e9b39c152deea52429bb3c055d02d8ac4d913d37c6ce1855bc7ad5db36afa851447a8ec42d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-56.0.2924.51.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-56.0.2924.51.ebuild
deleted file mode 100644
index a2172a6f3a1b..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-56.0.2924.51.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit unpacker eutils python-single-r1
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# All the libs this package links against.
-RDEPEND="app-admin/sudo
-	${PYTHON_DEPS}
-	>=dev-libs/expat-2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-python/psutil
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/pam
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/pango"
-# Settings we just need at runtime.
-RDEPEND+="
-	x11-base/xorg-server[xvfb]"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
-	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
-}
-
-src_install() {
-	insinto /etc
-	doins -r etc/opt
-
-	insinto /opt
-	doins -r opt/google
-	chmod a+rx "${ED}"/opt/google/${PN}/* || die
-
-	dodir /etc/pam.d
-	dosym system-remote-login /etc/pam.d/${PN}
-
-	dodoc usr/share/doc/${PN}/changelog*
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Two ways to launch the server:"
-		elog "(1) access an existing desktop"
-		elog "    (a) install the Chrome plugin on the server & client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) on the server, run the Chrome plugin & enable remote access"
-		elog "    (c) on the client, connect to the server"
-		elog "(2) headless system"
-		elog "    (a) install the Chrome plugin on the client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) run ${EPREFIX}opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
-		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
-		elog "    (d) run start-host again, and past the code when asked for an authorization code"
-		elog "    (e) on the client, connect to the server"
-		elog
-		elog "Configuration settings you might want to be aware of:"
-		elog "  ~/.${PN}-session - shell script to start your session"
-		elog "  /etc/init.d/${PN} - script to auto-restart server"
-	fi
-}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
index 47641db6d60e..fc00cdec2c72 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
@@ -32,7 +32,7 @@ SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
 
 LICENSE="google-chrome"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="${PLOCALES[*]/#/l10n_}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index 75976225ca7a..8f68c9768ea3 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,5 +1,8 @@
 AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c15579b7f2603cc547f55f97ad053027aef670616e2e8c65c0c932ca930cb2a59de1428c62c3887 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d
 AUX gsutil-4.27-use-friendy-version-checks.patch 745 BLAKE2B 71c404d864f38528836c635b36a49dfa67b7d0370da5ed5486539a8bf5a79130bee1c950d012053fd610ea101be16ce120468221a343e893cbaa6a6507c95d8c SHA512 ed060d08fe58c171df591c010aec1c597a4ba2f08ecf4d5806a78437b90aedd9309f16f48a7cc24143c508b9cac44d865aa3b4499cd11ab8fa1cc0c6196796ad
+AUX gsutil-4.28-use-friendy-version-checks.patch 750 BLAKE2B a4b2e54e3d0d983f5ed2ed41ae092b2ef398a8702830a890c97aef4f6ac1655689f96537c0cf6c99dfb4e2fdca29537aabc09cab2a9a772e5d71c3f303c82aa9 SHA512 461668e10d4480f21144af93f14d4059a2cdfc15b739bc58f7fe9547a96dd38a8bf0f6c7f10b9928fdc1c5e1e402292eaabbbcfb808a4b5dae09cfac1c797e27
 DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57
+DIST gsutil_4.28.tar.gz 3410500 BLAKE2B ef6d5460f9f04d27c0f172db5880e02cc88f461455ca05c3eb125656f80c29cba9fcf96ceb0c5958f14a7dc1ac85fcae3a2234a2876c7757ece5e756e910da08 SHA512 fbba505f58bc46a737ae8c02aa6a112f71f2543e3aaa4d45afd8e81cda0850c7180216827f3510858b90dfcad85c2d4b54a8c74a04c9b4ab580e966fee7bde0a
 EBUILD gsutil-4.27.ebuild 1740 BLAKE2B c3e503d3d77e86fd0b1348c8874e77d6dc98a13f4eb2800dac4af762fdfc46e1ccafe2ec18a90ab5977dbfd3fc4b77bea90c3b1ad6fd1cbaf8b626c80dd93dbf SHA512 bcdd47cd2b3a021b47e16a783e6ef805bdf89bddb08df894f0919972a801fa2a09eee724ca55ce15c316b7be371c643a17955eef4570701b4d4939bd41e20595
+EBUILD gsutil-4.28.ebuild 1744 BLAKE2B 94f21ca272815ef6dfb33670f4c9f62a3b3214b4028a6d017ddeea250aa08c77d1cdf443981fbbd52b1dfb3b66699e886ebad7b8161847c62ff35236f4db6c65 SHA512 5eb59880ae5a14af04c8714ef697795d62f0f831570729a8e7ee775f7355e3253dfb1d9f33617817e4d59e91c99839ef54737d869ebd84bde5bfe621dd017d17
 MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
diff --git a/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
new file mode 100644
index 000000000000..93b529a3003b
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
@@ -0,0 +1,29 @@
+--- a/setup.py
++++ b/setup.py
+@@ -36,21 +36,21 @@
+ 
+ requires = [
+     'argcomplete>=1.8.2',
+-    'boto==2.48.0',
++    'boto>=2.48.0',
+     'crcmod>=1.7',
+     'gcs-oauth2-boto-plugin>=1.14',
+-    'google-apitools==0.5.16',
++    'google-apitools>=0.5.16',
+     'httplib2>=0.10.3',
+     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
+-    'mock==2.0.0',
+-    'oauth2client==2.2.0',
++    'mock>=2.0.0',
++    'oauth2client>=2.2.0',
+     'pyOpenSSL>=0.13',
+     'python-gflags>=2.0',
+     'retry_decorator>=1.0.0',
+     'six>=1.9.0',
+     # Not using 1.02 because of:
+     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'SocksiPy-branch>=1.01',
+ ]
+ 
+ dependency_links = [
diff --git a/net-misc/gsutil/gsutil-4.28.ebuild b/net-misc/gsutil/gsutil-4.28.ebuild
new file mode 100644
index 000000000000..452ebb5e0681
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.28.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# The oauth2client-2 dep sucks.
+# https://github.com/GoogleCloudPlatform/gsutil/issues/355
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.10.3[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.16[${PYTHON_USEDEP}]
+	=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.28-use-friendy-version-checks.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e '/SocksiPy-branch/d' \
+		setup.py || die
+
+	# Package installs 'test' package which is forbidden and likely a bug in the build system
+	rm -rf "${S}/test" || die
+	sed -i -e '/recursive-include test/d' MANIFEST.in || die
+}
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 2ababecfd5ec..878dbf541475 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,9 +1,9 @@
 AUX 10ICAClient 88 BLAKE2B de89e73ff93f7b7a78b4d20bb3233471e29b448727de46c51859153af6754d8c3f0d6343c84671b706f0921c573703593342580855ae6e9ae04220848a5f872b SHA512 1a9c405dd4e5629595cdbbd5a712432fd40531ef094c84fb64849a49885dca2e9e27687fe01568735a12c11282fa851aab7d26d0db8606acd7b577eae8339e57
-DIST linuxx64-13.6.0.10243651.tar.gz 20685306 BLAKE2B 75c963cbbc1a907697938b0ffa82908a17a2aa0d6ba883b2f850a8f30d7d6e7ca78688ed3ee3a143644a76e956fa3255627ff5bdf925d865a8feecd63cdd4ba5 SHA512 e28e417a3a4e8d292b243d894f954692a6042adc0851c595ae25107ac9d6e84cc8e6d232c759ba2a45d9571b3f673e0e3f8431bb6736508f310f990799e6f58f
 DIST linuxx64-13.7.0.10276927.tar.gz 19647618 BLAKE2B 28106ee1223ad41b2a73f2b115bdec52cf87cb851cf8f481082ba24c5d6fc87f381d01c7170f15ac300f1e4656a5637cb579fa291712d32704ff8ca9fcd8a3bc SHA512 30b05ca67ed5d53d01bd8e83473f9b71613562186c40479797d19ad665f9d73ba43f2af974878b78d9d86c67b7b5c6e88701427daaf0a46c45e13ba915e0fe58
-DIST linuxx86-13.6.0.10243651.tar.gz 22560063 BLAKE2B eb5eb856045c25aed317308de950bfb9e91c155b9e1f4fc36d7385a96eef2c19a8504b8138d227a8d41e319f59edd4b9523ccf59c600f096c26d317d18dc6799 SHA512 06fd3d738be851c8b75790bf5dac3897b71ebffb028864119a43053ab45815c6ffb04d3b8e37d79673d85179034d22da923e2972dc12807ac409e087e18919cd
+DIST linuxx64-13.8.0.10299729.tar.gz 19855914 BLAKE2B 62029b75a2c77f3c58ca272a3cf8b91094f1328e9378ae66bf38ea94b7a0d14ccee392efd983cd1f2c7af822d488358b1db7c97569f866cb0381c9f5b3188bb8 SHA512 dc43587b7ca35d12ff2772618f8fa1154ee26081e315d381cf603976a7c2f4e395c8d8f134f7ad7238a3c390fdb085291f92ff3da2b4755d903fcd15d0c738df
 DIST linuxx86-13.7.0.10276925.tar.gz 21531393 BLAKE2B 31c132358c9ef7c8bc9b413084867fc1885e3f8939b2793c2166aaea39c1e309c9ad22521db16680bd0b816f81999d505645cd3ea97a7491b5b8cc20e915f1de SHA512 7fb6efffe0fc7681197de00a86e15c7b2de30bcd8c581d4da59a8fdebcea4f2da41ad1f573e81761c5bcf554718a75716aa75b28b8c3ac77461246a5c9f48cd1
-EBUILD icaclient-13.6.0.10243651.ebuild 4632 BLAKE2B 8096d3579022f55638e95a399418b0d6f211b3c805c2542fff5c1661cafdcd0d9728f139cc1d86739b96809e5d7e5c997fda2710b509d134b1523de71d3a87f7 SHA512 1bd702b09ed0e9c2265f0d40ff1451d510ec9de6a64384c5a0dcc51b9909e726edb93e8e2e7a37828568f77f1a143af070b8af0cbcf50d54b8a29aa86714886c
-EBUILD icaclient-13.7.0.10276925.ebuild 4636 BLAKE2B 21947e8e4ed88a07b71ec2a596565d0716813683142340b81731760391464dbf1d1496c68a40c36243924949dfd429ea16a87eff73fd20d810261a9a9de9bf68 SHA512 3273c929b5c1c5cf003ca61038d78c2615ac3d1484c74009550b7ad4adad1dcf86e413ecda99839172abea19242e92acb3502fe6eb7f83ab6f3b28d71501378e
-EBUILD icaclient-13.7.0.10276927.ebuild 4631 BLAKE2B 96766a115c02f1bd096fbe9baf529aac1ab00254e708173cfd697f099c0e7f9652a7271eb4af43417fa8c21dead4324c9c7d51d1dc9a819f5b089a183b8bc449 SHA512 d7da197d63cd566abcb85a57ffd2aa967a656201c957c36b97fe414fea5c7fa318d03d9405ada93a996537778208b276a8ee0152852f391be2fa059ac2e8e16c
+DIST linuxx86-13.8.0.10299729.tar.gz 21763683 BLAKE2B fb8238dd256bbeff59df73e1ee495579ffa315d5d38d857436ebdafc2d5e4f9e3bf3c760a66005fbd82657ddbe418849a28532b15b757937d0892e4be33a1905 SHA512 7e6c70e3600cc56c85722f37e473cf3c422daded0f7e755c47bf8b17f224be0676f5ef09c594c058eae6760dc4633c13a02f4d75c3870a4a10a04d29159a670a
+EBUILD icaclient-13.7.0.10276925.ebuild 4635 BLAKE2B f51c1d52f61efbb39183272b2b6a38e5443793eafe1d55bc8b950364b3aa46b6a9e1b7a83a7a976db306e49756cf017a1bd135ae5ed8f28acb3bae2e34056995 SHA512 c3c89d17483a8ce1bad1c2513a6e2e3a2a96e3442d7e64a2d0b44e9f73c2077a417db453b97ba6bea5a610f0b41216552ee0f9f0671333f8c213976ce5857684
+EBUILD icaclient-13.7.0.10276927.ebuild 4630 BLAKE2B c465ec17d70c4096c287b4d1c57a9f71e80fcf96867cfed4e09bf18a0fbc6ade4796db324f51c7e3648f6bc7edd58d52e2b0bffb7cd19cd628629dc894b37a97 SHA512 6350dbf895eec5808ffb9abd698f69aadbebea7577596b37815f778f641d9cbf12636bbb35d6a80c16c455e5d350041ef97cba4674868390a93baa7673804ea2
+EBUILD icaclient-13.8.0.10299729.ebuild 4320 BLAKE2B 0eeafa010a5978ae71b5db5219e35cc44a87c4aa42395fda7a9cdd3db142684d6bc2f8c3e6e73facbf0b0e04e03102378df2f7447d3ebd999d2a6e0bed1195b5 SHA512 ba3ae1816dc22d8b6fae74615c31bb75c1d61730121b4201ac047cc835b5f0adb02e9171535fb74e42a254b86aeea344919f0ef4a470fb7b35483b84547caa59
 MISC metadata.xml 731 BLAKE2B 0591439b7ee7542c2e23cb0421d0e51141db3ae4405cd865a9d6ca58742c7438645d496a55428598be89c92f69fdec881d60674b52eaedca802894b490954dc3 SHA512 dab4b211f7d0b6e4c1b25ea2009de42a50d1ae69b05a5aeada2870282c2049e8212bf88a879a349b92a00669f8f3ab348e8513f12b5e8143b1258b58f0f610b0
diff --git a/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild b/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild
index dd9cf49c6f73..f406a1729dd9 100644
--- a/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild
+++ b/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="x86? ( linuxx86-${PV}.tar.gz )"
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild b/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild
index cdd7f6ba8c6a..204c38fbec90 100644
--- a/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild
+++ b/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )"
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-13.6.0.10243651.ebuild b/net-misc/icaclient/icaclient-13.8.0.10299729.ebuild
index 5a7c8f00a2d6..590f4019bb37 100644
--- a/net-misc/icaclient/icaclient-13.6.0.10243651.ebuild
+++ b/net-misc/icaclient/icaclient-13.8.0.10299729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,8 +12,8 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
 ICAROOT="/opt/Citrix/ICAClient"
@@ -40,7 +40,6 @@ RDEPEND="
 	media-libs/speex
 	net-dns/libidn
 	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:2
 	sys-libs/e2fsprogs-libs
 	sys-libs/zlib
 	virtual/krb5
@@ -56,10 +55,6 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXt
 	x11-libs/pango
-	gstreamer010? (
-		media-libs/gst-plugins-base:0.10
-		media-libs/gstreamer:0.10
-	)
 "
 DEPEND=""
 
@@ -173,10 +168,6 @@ src_install() {
 	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
 
 	exeinto "${ICAROOT}"/util
-	# echo_cmd, gst_aud_play and gst_aud_read still require gst-0.10
-	if use gstreamer010 ; then
-		doexe util/{echo_cmd,gst_aud_play,gst_aud_read,gst_play0.10,gst_read0.10,libgstflatstm0.10.so}
-	fi
 	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so}
 	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
 
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index d71ac82c1b9a..972f9e954104 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -32,6 +32,6 @@ EBUILD iputils-20121221-r2.ebuild 4051 BLAKE2B 05bb4832d99c0c065b5caffb695929c91
 EBUILD iputils-20151218.ebuild 3977 BLAKE2B 1b51c297b6231fcc7edac3c28ffd5347263ed8cb8fa30aca729c9bf85d301b290123b99b82c9abb279e80f8a39c4721987fb3c1cbd5a3a286cc3708f9f25aa2e SHA512 b07ffea44d85ea3aa0a92ab606386d7d1a917eed700c421aabb4af6ae4b46b1fc5e9ef1f942a441441ec4171548b9dc04f7bd73b75804568579ec044b297dbc0
 EBUILD iputils-20160308.ebuild 3838 BLAKE2B 62aa96ba316885c62f9716a6ae488c349bb0b530a81f2b8497c70d92d235034b3556ed2256c588a979cd198de8d11665b6c1d83ac59cabce0a22ba25ab4f33cf SHA512 596ab450370cb8883d3480e8e0a21cc27ecaa19ba7499296a0c67e84fa8bce3c085f66d87eea03be19d54b780a8933f752999196b13d2b3d0a66faec2f756d08
 EBUILD iputils-20161105.ebuild 3870 BLAKE2B 800dd0dacaf970aed7a2d21d2f3931be41d0e2469dc7a2b9cd1fc1c3c58266759669cf393d0832ad1e27a8e550960bc6f7ede6fd0967f8b2c83526e004dd25ff SHA512 64f9077c8e69b02db0560a1213293d27cfebbd5a02d62f75b53f6ee3d76b46c64ce2995ca1c6e7b3fb22185f33fd40a0da4a1796307883adcbbb47ed123b9611
-EBUILD iputils-20171016_pre.ebuild 4089 BLAKE2B 4456817c48fd681945bf2f733bc57288bfb4bf35d42c072d849a96f7c47c0cdaa1ad82956b9a3a1ce0f6229ad7a3ab092086ccb3dde455d6d727f70da592fa99 SHA512 41b570b7aca636f33fc434cb6ec93f7ab9022398dec0562b20b9b82cff0bda52066e58cb55f3c0d68ab54de78ee2354e35e3ac9d4c1e3403726ae3c0997a52e3
+EBUILD iputils-20171016_pre.ebuild 4084 BLAKE2B 217410d195fa51635cdb841dfc48d84d256533cb7ade5ebb780edc8cd5d0ca98ba76a9fe3c75c14c38b44eaff470b2dd1c8757795fe3b925fca0be19fbc8889f SHA512 0eb0108e155aa28a54f4eaaa4a5d540f784644187e3a9708aa6f2d864690aa8655e4f506332476db6c293eaa657373775e2eda540bb2296df3b487443f29a496
 EBUILD iputils-99999999.ebuild 3905 BLAKE2B eee7bf20dc61ad938df5535fafbb197f94e0a1de5dd1e514d981bff627ec285f456e3f2b28e5a587ad763d206236cd0f72e61d9039100a5a3e030d4cc3159f5a SHA512 a7f056364c5394b6b9845930ba721492f1d8a4dc2a0231fbca9b5cdae14d8fa5d2f47460a85d2c6189c4f4288c26798b4c475c515cd441ed80114c510b82a437
 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
index fb555325457d..21e214f7506c 100644
--- a/net-misc/iputils/iputils-20171016_pre.ebuild
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # For released versions, we precompile the man/html pages and store
@@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 20bb89de706f..f39227fd251a 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,8 +1,6 @@
 AUX minissdpd-1.2-remove-initd.patch 595 BLAKE2B 420f456bcd5d0e1df0d857a142d463020716f9d8e1480b523ae5634ddb00c855efc4fef94ce683a3f136faa964dedeccd95877177182d4009b72bf91e1b4830c SHA512 20306ae9870659c9d5c07643f3d95ce56961a57a119d3f15b6aa6ef4ad6ab4c8f32bff9d11af3445f1c94fc9b628faf0a9c9b7e1fb1924f5bd20697bc39d438f
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
-DIST minissdpd-1.5.20160301.tar.gz 34827 BLAKE2B 4330bb100a5ffcddc2569507895cbde6be408496ba6bcf027abdd2814d35c6a917be797e1b66d7f526a4f7795c4ee6db1afc755413c718938f33b19cd847b652 SHA512 b8dbfa7ce05fc006c09378fe53fb3345cd8d4aad486ba0bd4adb4d7f5d662e34ba04d82ad48bdc721eca1a7d1d083a9f42be69c5d1086223a0e8803068c15426
 DIST minissdpd-1.5.20161216.tar.gz 35078 BLAKE2B c8e681e812869ddc15cece499356e7852a4b2e86b661bd80d62a840c8a9a01f321d4616013fec49d4abd834c75378014b52e605ad3fa116c0dc863e5a389a9fc SHA512 4fe1dbc14a39a18bcc834c73cc0150cda656b2be7ffcc0a72dc2854dbd698f3528bfdcd80af741124546f916d914921ffc428bb4f19b34e7493f0cbf9ff54928
-EBUILD minissdpd-1.5.20160301.ebuild 710 BLAKE2B 2cd828a3045c2bd1adcb39de4ae0720cce1e5fe363771e1501116a6aa2738202f8fdf43201273fc26e7700c7daba3747449f54fc64212420547b1a618893b5a9 SHA512 5ffaf520ae16275f29245211dc505e4c99185f2afd10525921095ada1f58154c588dd82de33a5409821f5b0b1e43b5c1eacf5c36b9b8f1eb80975f887e33598e
 EBUILD minissdpd-1.5.20161216.ebuild 694 BLAKE2B a1e1cd336d2993c5384f923f7d74e021d0f5e8db1b437fb7610fdc5858254c2d0f0f8707870bc8f7971ea99e6da1c0d84367c4ee1cffd339fb11f176b9942275 SHA512 7d5738d4fec110c526ea32aa830b2dda2f0c4a8dfecbb77e5e5fd1201be01063ff32cec1206e4b635f35592d51b800e006fe096abd4e8d65aad56d3526f5933d
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20160301.ebuild b/net-misc/minissdpd/minissdpd-1.5.20160301.ebuild
deleted file mode 100644
index aed15e6c5e32..000000000000
--- a/net-misc/minissdpd/minissdpd-1.5.20160301.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/libnfnetlink"
-
-RDEPEND="$DEPEND
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	einstall PREFIX="${D}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 72356b68d457..580a6038c719 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,7 +1,5 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
-DIST miniupnpd-2.0.20161216.tar.gz 218119 BLAKE2B 9d09f4d2b19c4f808bf527c90a73739baa0eac924f461f6cbbf20866ee851f85248efa920bd6a770173d4a3a8f9e8d771ffacdb17aa684d329295502278f7963 SHA512 af82f060d28033dd670fcc96c8e2895f92d249a8a79d991e0215159eeb57715d7a9152d7d751b836091f7a623ce8a194ea243d1a2fb639349e320c02ce187c27
 DIST miniupnpd-2.0.20171212.tar.gz 222617 BLAKE2B 6ac33048b18d9f8aeb5103f57c9982fec956a61155f8592118c38dea70801597d9e867690ef2f1cdfaf848a25d7ddb4891b3ebf37cd391b33518d6b02e6f9b4a SHA512 3ab81c840953736c662bcb6f074421052a846c7827768acd7a961a23906b9e3d3389f5b593fb6f8011c8e717dae6cd3907b6d34e7904d560378671a7fc1dd3b2
-EBUILD miniupnpd-2.0.20161216.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
 EBUILD miniupnpd-2.0.20171212.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
 MISC metadata.xml 1043 BLAKE2B 1ea4668279d5b43c5ffa7a2c95f3fec6532a2a6918fa0f1a9b6fc60f37af5524929d434da3a346aa093bc7ba8e5bde644342500606d753f43499f0df164e4782 SHA512 2f825098e0257d3242abfdbaa0ba3ae7e669912a1b81e7c0f559e208297e2bc0e82c07698f1e63c01b15170eae3560e27e8a67c3fc91598cf81b5b70f8e5101d
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20161216.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20161216.ebuild
deleted file mode 100644
index cbdc231611f5..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20161216.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(use igd2 && printf -- '--igd2\n')
-		$(use ipv6 && printf -- '--ipv6\n')
-		$(use leasefile && printf -- '--leasefile\n')
-		$(use portinuse && printf -- '--portinuse\n')
-		$(use pcp-peer && printf -- '--pcp-peer\n')
-		$(use strict && printf -- '--strict\n')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest
index 2202ded4558a..c73e7b6c69f4 100644
--- a/net-misc/npapi-sdk/Manifest
+++ b/net-misc/npapi-sdk/Manifest
@@ -1,6 +1,4 @@
 DIST npapi-sdk-0.27.2.tar.bz2 65811 BLAKE2B 7f746f077bb87ef8de31499cc3ba0f0c15197ebd9da7891096ecb368d66ca2a7a54fc2b27e7ecc78e942c74e1623b09ca1d39df8f4fbb0843a5cc0ab98b9caa9 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842
-DIST npapi-sdk-0.27.tar.bz2 64040 BLAKE2B bfdc271c5968692bc32ea6bfc1db99a9ff8186b572c881ee4b7caf90cc964cb04d5a280495c11ea6b0e9dc957e9a7636609257ad32db7abf7f307c16057d37df SHA512 12e28c354cca36a15578cd507d78644e016dff03e4940140d11ecb598a89464898e8be9fb17e7e86a696906fe9992f3c55da18c41dd1b0b8d33cb049e2056607
 EBUILD npapi-sdk-0.27.2.ebuild 429 BLAKE2B c2fc61cd4cca11e4ada272203874ace0d7e54ae331e025466d55943dcfc558296780d5e7702b7df9b99ced0d6d1660bb1221d8b36b32ab428ac75b5b64ea3c64 SHA512 93358b8b28f8d61accc7288514469458e8b3832a7f125dd9e68d4680fe034efc09312b397e29220fb78b9de2a379921a00d51b0abbab8b6177c15ae01b43ce1b
-EBUILD npapi-sdk-0.27.ebuild 421 BLAKE2B 54736a2eb7bc7be68f6e9f18d073ec4e0855c8f98905a840a79568c86ab2649454f8f3cd85e6486723e91a73edf12c4938821a95ce6719be7252940b5d09f36d SHA512 7d682da51c4d174ce44af8f3a8e61d37fcbdee7f8d7201568c372298223aac892f50adb9528e7db4f2230016712ac0d56013a49357d6fddc832a2f8cfc2e4804
 EBUILD npapi-sdk-9999.ebuild 587 BLAKE2B cd88e534e1a79dfe6c3d76936305c31c7fbe92e48610c4a7df33f3dd9a7fe6c21b1b756dd1d79babb1ac3299fb4b979d70fd6c6b3198a46f679edd09d0d55ae6 SHA512 fac1cd12c7ce982fbc2bb4507b39d5a41a8d34cd6c5a7ffa886d0423eeeb17d7b034d6337215ec5f20ce7c91b3fa8957e8f022ad0e7157169c09bd60b6aec145
 MISC metadata.xml 554 BLAKE2B 59d5b3ef0386ace117d29123793e45f78d3dd8998069a25341c9f56fce1438cd1d5af3fafd84cffd09c6c956496fc493ac0e3af4d010e63e3a01788cbc125f8c SHA512 f64e6e5dcb310e3529ccee303071fe765de9dc1df0230969b654a11e0df90ce011cb6c999151db0e913f4fbaa2b5456395c32fe08ac50885dd92762da7d9e2bb
diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild
deleted file mode 100644
index f6975d378fcb..000000000000
--- a/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools-utils
-
-DESCRIPTION="NPAPI headers bundle"
-HOMEPAGE="https://bitbucket.org/mgorny/npapi-sdk/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/pkgconfig"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index ac989347076a..bd1cb8f0fcfb 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 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.12.14.tar.gz 2850664 BLAKE2B 29a3f4fcefaa970e9bc291ab47c5faa28252086aa284e9461f6c061d0e230680fa09ab654520c0cb4080279dba2c96b06412b6e5f4129fe44bcf972967eb57f6 SHA512 b23ffe0e30ba32c80de627305409d5aab73c6337ac6b253fa1c116a4aadf7ddd6853cd612941d9ae0d9ca3bfa5fc982e43cf2cdec3ebb90d2919f3faa47b58c5
 DIST youtube-dl-2017.12.23.tar.gz 2859430 BLAKE2B 55d30e77e1689b221d554ea0fd6327b42043c9410f74ce35f87956dfbf3da986b254657ca4c71cd4c7bf8bbddb2477cdbd96caebd0d52803b14e5466ac43988a SHA512 f8aa96e2cc328453abaaa84b9a0c0f28ea929a9c3877128d398ec5eb080b187bd01bcfc07ed590e84d1f58af00f0cbb219b4ac3f01045486c0472c6d707e4d9c
+DIST youtube-dl-2017.12.31.tar.gz 2872519 BLAKE2B cbf06f545f580d4bb3c5f58ea9a38291cdb358114787a93a1889e3c07c17fb2a832b7a25fecb6f92cdba8731fc32b9eed5ae4f5a52d0d6a103c3d3d4ef6b9ba5 SHA512 c6cd663627d2291c0eb6e1d711772f6640555d19f34533e1784cba4e6c983522db6dc3e44140dfcdad900db12024548bd5b16f89e60a5531538d7dcb36a8cd93
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
 EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
-EBUILD youtube-dl-2017.12.14.ebuild 3286 BLAKE2B 27dc317b224b7be4752e59ada595412101e6b5d5efa8baf703a61d690b92cc128a6c18e67a741cbced16a7be017555d038e54cebe832cc8980e0314ef3657c78 SHA512 0d49a470d4be463db904d18b3d37adbd5445900f2e0be45912c86a951942c158e3bba9fe4faa8976432d76e6438f199915583c6fb7cec9e5323680363a442d34
 EBUILD youtube-dl-2017.12.23.ebuild 3286 BLAKE2B 27dc317b224b7be4752e59ada595412101e6b5d5efa8baf703a61d690b92cc128a6c18e67a741cbced16a7be017555d038e54cebe832cc8980e0314ef3657c78 SHA512 0d49a470d4be463db904d18b3d37adbd5445900f2e0be45912c86a951942c158e3bba9fe4faa8976432d76e6438f199915583c6fb7cec9e5323680363a442d34
+EBUILD youtube-dl-2017.12.31.ebuild 3286 BLAKE2B e846a48522924ae983a0b5b078b42523a2dccf22d23340e52348507f8718d01965a1a97c7a0c5ab10caaee1133536f8932d327d08eddf8f8982958aa84c29456 SHA512 67e4d6e79fd04259bf95d30ecb051527d0c864002b80f28734f37cd38ad9728743334b2fc786c652582c9ff9d79bde6f46507e68de41e84decefb87db8e8e0d0
 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.12.14.ebuild b/net-misc/youtube-dl/youtube-dl-2017.12.31.ebuild
index b94326c98c67..80eb0bafbd83 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.12.14.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.12.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6