gentoo resync : 17.10.2017

25 files changed, 217 insertions, 161 deletions

diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 8af281fb23e9..ed4e015fdb5e 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,9 +1,11 @@
 DIST aria2-1.30.0.tar.xz 1497124 SHA256 bf6c5366d11d2a6038c8e19f01f9b874041793aaf317e0206120e3e8c9c431f6 SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38 WHIRLPOOL c3613212226c1fe6db20b45dce021441fceaf26970e8773064ef254e3a1272550c9c8e69d2fa677d249a70c853d6ba65c91fa1a42c33009127177b496fcbda0a
 DIST aria2-1.31.0.tar.xz 1501388 SHA256 7b85619048b23406f241e38a5b1b8b0bc2cae9e80fd117810c2a71ecca813f8c SHA512 a0a1312522324dc0bc24cf1a5cceaef49d40445668ed0bd98dc3cdd5e2edb428552e97504c8c072f5d1180d6bbd252de01d290ef5c94d1803b8ade330bc2710f WHIRLPOOL 0b5af6d2f9f7e62a2620003a0aa44e842517cb33be00a7e1b0f7ac2720823c5d32deafd91ae096d8ef028f89885c08f459a03955ee349fd6d21dade190895596
 DIST aria2-1.32.0.tar.xz 1502192 SHA256 546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50 SHA512 7c14c395fab3024191145b5c965c6c89211cd36ce405cafeef350aa6df9850bee9de65e756eab7d0bdeccb9409b829ea21552b9aac0166f50dcc17501b3dca8b WHIRLPOOL 763188033573b5928c7935229505cd82f39009952aa78b7871c1c1579dde54b46185a0d378e3d7241230d0611ba1b7d96c04ed4c09049d38d89b6b550391a0aa
+DIST aria2-1.33.0.tar.xz 1526936 SHA256 996e3fc2fd07ce2dd517e20a1f79b8b3dbaa5c7e27953b5fc19dae38f3874b8c SHA512 6b28282b5688444c99c3219d185c5c87f1760300f47fb9a87f9ee5eb62dd366d55a7706bb6edb16957f0a6926b354b0c6cbbe9887c94980c3027775d06589fea WHIRLPOOL 16bf3179f15830cfbfbe8f44781aa1a2fb0a500f650dd342aff114b13a6b3280045036cf5acc937bc22a0eeef95c83165e4cb9c3dd05032b7bed511e8d7b3bcd
 EBUILD aria2-1.30.0.ebuild 4270 SHA256 c26cc95a0ef219c28d79c6e2405c668be7263e2e871feb481b42ee4aac836a69 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a WHIRLPOOL 92e31ad36a7af8f948b30af0c1db18b35a1be0e4e6305abd83e6a14279aab2bed0197d8cdd59673fc3a795a2afddbc060a52182333743dbe3c1ab096b50d5cd4
 EBUILD aria2-1.31.0.ebuild 4272 SHA256 a2378044f2e76f0f484d5b8f456126a74c95eaf57bd18df642e4e726700683e5 SHA512 bf640ec2df8a7949ae45e02f9ae6902e2e1580b02806c47e6aebb68d4042c5babe077e3f0e77d7afcac411afcfc09c5990840b04a9606fde7205630352d41620 WHIRLPOOL 72baf026f1d7afaf5529e82fa332d8d928169ce3abea7ae6f7350e030a49c3f034a534e707fa3469d9becb49f614baa92396ef4344478462e7725f674c0c3c0e
 EBUILD aria2-1.32.0.ebuild 4272 SHA256 9924dfc61b067bea5276b1f7d0e301504ab6c1c532e117825c70c22ae8680a1a SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0 WHIRLPOOL 80eaeadca7709ff684b7ffdf9a5f7cdd07cb5c4790b6a7d1ea69c2f72a9b2094e563fdaeb1401ec6443ce53981199015d5a50553f4b9390a42bd62c022d98d11
+EBUILD aria2-1.33.0.ebuild 4272 SHA256 9924dfc61b067bea5276b1f7d0e301504ab6c1c532e117825c70c22ae8680a1a SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0 WHIRLPOOL 80eaeadca7709ff684b7ffdf9a5f7cdd07cb5c4790b6a7d1ea69c2f72a9b2094e563fdaeb1401ec6443ce53981199015d5a50553f4b9390a42bd62c022d98d11
 MISC ChangeLog 5344 SHA256 c768182e71fa27648d3dff3921210b94d54b15435675050d5c86a9dcdc6ad4c9 SHA512 e4e44765fb208e2d2f738313734ff1752fdbf81c1c3aedcc86f80cd4d1ad861b150d47f637514c4f2756ec9a0e457b68178dfd2c5edc0dfdc7ed18d7992f37de WHIRLPOOL adfb7b2929474b829b2c344ceb562e2b28b177dcca36517d9da58db6a28b8cb389106879eb2bd11169cb629292dedc451bc7144c6280ae3f7c14755ae39e709f
 MISC ChangeLog-2015 18690 SHA256 49174891fb6733e8b06fec8157a893c7bd2cf8fd721a9b344594dec4505cca8e SHA512 d2150927738c9569ee1ed4ab061dda15869a89cfdef3d06c9daa800415841c9d870a27382676b850e56f7ca08c8625d9e0a7158e592128598876323b25d21f1a WHIRLPOOL 1ea59e84acacc1887ff564e33913771e628355cb46034b87d3f40b0169153ee127ce5381c500ce2e2176f1ceb56cfd3ab2a59b3dd62a4ba04622c6f154273a6e
 MISC metadata.xml 1325 SHA256 43d4f4b9ab0bd9c69920bec643be53e2ffa5a67199e076052163874a93528261 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f WHIRLPOOL 872b42cf7a92d97ac4defa4583f705bde77f8165ef8cbf6657961d816ab14081d5e282d24f05ba3bd00a5531429a952ed0f0b5f3f7870b743ec73de9a822eb11
diff --git a/net-misc/aria2/aria2-1.33.0.ebuild b/net-misc/aria2/aria2-1.33.0.ebuild
new file mode 100644
index 000000000000..de956e8d1695
--- /dev/null
+++ b/net-misc/aria2/aria2-1.33.0.ebuild
@@ -0,0 +1,152 @@
+# 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/bopm/Manifest b/net-misc/bopm/Manifest
index 87e26a6d22df..6ac95e44970e 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -1,11 +1,12 @@
 AUX bopm-3.1.3-autotools.patch 7563 SHA256 9b63f8f82dbb3e57b42ffcfecac8e41a4da9137acd9432ad0dd81d3974166786 SHA512 1a44edcc1c9bf154e3d5763bb8e7937050781623d2311bd404efbea96c9949e9bc1472d5c22ab598152195a933146585a3efaaf28a5e7fb369e471167e571d8c WHIRLPOOL 062690bedf89bd3f805ef94b943b1f4733dd10b5fd2f4833275fa6d0153f69d3d93022300765b418aaf2304534c7810ab53eef39d3c847cc853b17031ee3338b
+AUX bopm-3.1.3-quarantine-bad-pid-file.patch 472 SHA256 8973230f87eebcd34b7041e8818cd79b35fe2d2da8b723b35227c8e4434dc86f SHA512 a255fa27d3dcc1c4ef547ba28af58e4e25f4e94b36c10b954274e49a7dbc776a1da5772afcd1b91f918e704c60de5bc3d451f8b9073123ed3f32aaa8ccc7948c WHIRLPOOL 9ce249c0f1447a3e95266e55364128d1a4d1c18918ced6aff55e5097809ee6771872234e21f66eed2c260c792adfabcd8ddcbdfad73b0d444b327929447eba7d
 AUX bopm-3.1.3-remove-njabl.patch 816 SHA256 566c8c9866dd449a8d88051a2671dca54327783434f37f12eb0ed0d8203bd8a7 SHA512 d74ccfa25c5f70b852647e90e8d9a80d8d848cf0e488004fc8dc0fdc196271659c7b53d47bfa79321f159ec374ecb7626b98b91de82aa62649c3a3c449c4aef3 WHIRLPOOL 348885b0b18cde0e1b77ac4310c57aa1ca40ae5cc9190f0bfddaa6c599362c7a9d3fdc455424d83c2533278b571321b5e8a4b1f4f1e90884badd621921460207
 AUX bopm.conf.d 158 SHA256 2c788cdc23767b1dc2209e4290c1404635ae7875a9370d40a9f0274f3b8ce9a7 SHA512 f47dbcc6c46b9bc4269ebfa0015e3827360f8e78f2485a3217a5b4775d2890b31fb0d6bb56815547aa91208c412079f81bff8c086a0f947ef48171fee1caeb6d WHIRLPOOL 3c97959f0bbca02cac8e9c46730ec84d067fdde2d08b535ac3fea770a51753ad9766dbca281df9a4e4c82204d677d0d8a26bd0a31ac118251510ecd565df9cfe
 AUX bopm.conf.d-r1 221 SHA256 888a8abb73ef3ba977edac00f525c08681c7bd2ad963ec36788e3837312e0684 SHA512 6070b84b90a905be88cf8ac64c67bf057be4c369e9129c877f643e4154c81699ac7084c5377c22afb673e44c696b890d1dc16e653e6bcaa46368a93a09414ec2 WHIRLPOOL 6b2d0a06e0973b9028418866ae72794a13ed56cb74357cd98553f44568b8a61c801b4f947e115bf933799ce4ed669499de9bf2bc763a661d307458da67d32493
 AUX bopm.init.d 450 SHA256 9bdc44a21aa9894488f4a4557c359347a53cdc5a34942107b8cb5a0496e6cf4f SHA512 14f310b94d66d904b83b475210b5b78730a0d7776b725a46c01f3da1a62599fffd964231133e9f4514d49c770bb406e94ce748cf7d67d2b6a3b174c71b8d0e6e WHIRLPOOL 99e51d73eaafae588b6d9cac402572052dbf0b21d442f00525ceedc40f8a5257ef1b50403894ac20341b5d12d9271687d95d29d5148dc68ab851eb98a268497a
-AUX bopm.init.d-r1 362 SHA256 c5b70bffec57c178765f7c40a13d2cb057629ca2e9bf5d82c8f9b8c0b8142abb SHA512 33665898874ad63bbbe9e204952b25d8619013b4599c0566352ffb70a7b02dee9756bb4db5bf171925634ab1c0a237a350e2cb1663e075b0ac56d81e3823bea7 WHIRLPOOL 3e9281cac2084e497cc3369c9134021d23a9394b8ee5a9bc7631d6d01c97ce8e304cf83d8921a717f14a1c62d3890194fb4e32284d87338028401c91287a08a9
+AUX bopm.init.d-r2 435 SHA256 a6e6340a4020bd30d360f68f02c3caee447f87f1b505947a74bfa630aae84ec5 SHA512 ba5dab8f556108a7e273788a8483443c250f8b8c24d17f522b795b8383d2f257babd9543921f038461f16c34e6103e526c63c8c5d2e00be80f5f8ab0fd8040d3 WHIRLPOOL 23d5334de09954888adc31bffdcacf6d9cb3878dd1de143a50089306be447f61712c5260d804c1f1256733b08da05ff2dae6d2eed412c4cfea2062ca157bc8d3
 DIST bopm-3.1.3.tar.gz 819273 SHA256 6062e80e57785b7f992f71c1d1b4c99c12ea0f20bd7c4d2c0fe2c1f57fdcbf59 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af WHIRLPOOL 57e91221e5af5d6eb009aec1bffdbaa1360b0cef4146eb432a971bade1c668195fd50167989acf3ab63ff13197cfd3d933bb96c09069413098ca65d73b2d8820
-EBUILD bopm-3.1.3-r3.ebuild 1333 SHA256 854b43702bef9ff8b2e52dca025a268b9b02923891c13d47685d9ea06176eb96 SHA512 6cae1524c733299bc1a9d9fd7244c5f10ac750408b477faaa8367ccdb084aae5cdcbb395c6ab38f84614da2f4930074b2b91b55a67e812f9f803ccded314d3d5 WHIRLPOOL 858179d32f35c3f1c014f1da9998b818bcaec60c2cdb4e3b3e542a9a037c103a94457a706818a8a2f54f32e12b44a4ae0acb16c19d27d2ddead8c04255b2fff0
+EBUILD bopm-3.1.3-r4.ebuild 1383 SHA256 d06a1344fcc858ddfa7605dd8f72cd5518d2a9174ca57243dfa02ca6aedf17c2 SHA512 2ce8f45a7538aeeab3cfb7e0c9561002a6a217002a388531e79ac0443a7efca1cdd9dd9856f6ae2c5956abefc445f1f56952fdaa026026c75941e8d7bc0f3489 WHIRLPOOL f873b29381ef4dcf56819b1db8250b01f6381f8b073948849dd5c77ca6b2a61ec5f7a981c9deca26898a9d78a524ad10dee2a67ee3eb287b1a93af854273c62a
 MISC ChangeLog 4797 SHA256 5f6cd07aff0857bffd6319f95604e27489474c559ccf816d1f4958363158357f SHA512 8a1d72556ac841848a5bd4c0d68b538fc94d38b57ae672455f04dda41b92fc822e41143fe5347d679644e13f5b26aecb9097e008a3271d26de29af93bcb1c2e0 WHIRLPOOL 3025d3b7546e1aa8ac364098881edfff70045a23240e28b21bab22f21d1d21d859e27d255e5b2a42ea79ec342521b4c4a8af7e28f936771df8d0cdfd65555bb5
 MISC ChangeLog-2015 1347 SHA256 1a0faa6b2fcc9173020c14cd7f5f4a4dede4d66f439fd8ee4e2ab08d18ead2df SHA512 8ffd0ebc09f14fa60e7a12eb050223b08e00b0e7235863c1cf499c58df4273f31176d57f9ec076b6ff7dfd72e4b8ddd816a0e41eb7075a69c70d6afa8c99c6f0 WHIRLPOOL a247afe91fcf47df177700c7ba88968d48557a28eb51fd102cdb7b4f023b453b6823d144f3864bfe3ecafb5e4df54e3286e912e13f1ff70dad8d0f49d285bc3f
 MISC metadata.xml 440 SHA256 757426a5e58d5c01767736972bb5a3532d3d4b01acea35eb32245c0b7558fbb6 SHA512 f55f7dd218a0d3998a847750bad43fc58e947c292f0c31f8a89b5d05bdd2accb8f132b734787f2b4c8802752561dca7ddac07dfea3eaf16a15116ece2301d797 WHIRLPOOL 841904b80c1f0787f1cd0682724935fcf041b0cb70b37f26b7bd01b79beb7f22a061ce132cdd3b99ef4630a56c183f0e33a83f34beefe05331b4fb2375333cff
diff --git a/net-misc/bopm/bopm-3.1.3-r3.ebuild b/net-misc/bopm/bopm-3.1.3-r4.ebuild
index 5e306a502712..5c2096926f29 100644
--- a/net-misc/bopm/bopm-3.1.3-r3.ebuild
+++ b/net-misc/bopm/bopm-3.1.3-r4.ebuild
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-remove-njabl.patch
 	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-quarantine-bad-pid-file.patch
 )
 
 pkg_setup() {
@@ -52,7 +53,7 @@ src_install() {
 	# If anybody wants libopm, please install net-libs/libopm
 	rm -r "${ED}"usr/$(get_libdir) "${ED}"usr/include || die
 
-	newinitd "${FILESDIR}"/bopm.init.d-r1 ${PN}
+	newinitd "${FILESDIR}"/bopm.init.d-r2 ${PN}
 	newconfd "${FILESDIR}"/bopm.conf.d-r1 ${PN}
 
 	dodir /var/log/bopm
diff --git a/net-misc/bopm/files/bopm-3.1.3-quarantine-bad-pid-file.patch b/net-misc/bopm/files/bopm-3.1.3-quarantine-bad-pid-file.patch
new file mode 100644
index 000000000000..fedcd0980a04
--- /dev/null
+++ b/net-misc/bopm/files/bopm-3.1.3-quarantine-bad-pid-file.patch
@@ -0,0 +1,16 @@
+Bopm writes its own pid file, but this is handled by the init script via
+openrc-run.
+---
+diff --git a/bopm.conf.sample b/bopm.conf.sample
+index e26dc17..fa5ce1d 100644
+--- a/bopm.conf.sample
++++ b/bopm.conf.sample
+@@ -9,7 +9,7 @@ options {
+ 	 * Full path and filename for storing the process ID of the running
+ 	 * BOPM.
+ 	 */
+-	pidfile = "/run/bopm/bopm.pid";
++	pidfile = "/run/bopm/junk/bopm.pid";
+ 
+ 	/*
+ 	 * How many seconds to store the IP address of hosts which are
diff --git a/net-misc/bopm/files/bopm.init.d-r1 b/net-misc/bopm/files/bopm.init.d-r2
index 6a292f800be2..de6d959b9f74 100644
--- a/net-misc/bopm/files/bopm.init.d-r1
+++ b/net-misc/bopm/files/bopm.init.d-r2
@@ -12,5 +12,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath -o ${BOPM_UID} -d "$(dirname "${PIDFILE}")"
+	checkpath -o 0:0 -d /run/bopm
+	checkpath -o ${BOPM_UID} -d /run/bopm/junk
+	checkpath -o ${BOPM_UID} -f /run/bopm/junk/bopm.pid
 }
diff --git a/net-misc/connman-gtk/Manifest b/net-misc/connman-gtk/Manifest
index 851e14e9a03b..3a3ba3aba705 100644
--- a/net-misc/connman-gtk/Manifest
+++ b/net-misc/connman-gtk/Manifest
@@ -2,6 +2,6 @@ DIST connman-gtk-1.0.tar.gz 50428 SHA256 50ae5498f3a5c2714dca47cf21c197b6272b14a
 DIST connman-gtk-1.1.1.tar.gz 61789 SHA256 fc1da266c4216d34db7c38f7329c698b42666389ce32a8df58a818af9eee2262 SHA512 78fd41a37370c76f118e3fb8a707b96fd6bf1234a8832d047302d4b0fa350f87316f6e2e749860b2cdf0ff6e6eb76e4d7d398dc7fc084403ca2f8682d2907553 WHIRLPOOL a21f2662bb4e95a8a633bcb553fa404a17787778298c3aa0e06709bd28bbaa2a8bf2810fe93d9ab7fd9cdc260c2380da7f01e3298abe74b05abf907f4ddb0752
 EBUILD connman-gtk-1.0-r1.ebuild 696 SHA256 f160dcea2282d26c7ffa9f34bad30de4b4e7f33fb6b6501b66d75159c6d505d6 SHA512 e4e2c69a7fdfa74ed3e9d1cc7e402f5fd2dc4b56c56d3d31511659c2bf47d0cdc92703eef408470d8bde951a22969ef21766ab0b061b472bc64996b3681732d3 WHIRLPOOL 939ba4da20e4ae02b50ea418373b5691c264725407199047c2bba81f477d3e84c2aa6a49a922aa2fa7d3ed35f088fc5272a37be72cdbce1c7f713405984a3d85
 EBUILD connman-gtk-1.0.ebuild 687 SHA256 0f79db95e7929b57eb6c8464cfd730251cdcfa4b9dcff65599fc23215d14fb6f SHA512 4175ab3408837d4af115877ad6336ebf489aeb6c0aa39bc8786ae81602f85cd7824246d018e5d7d38fbf3eb812028c6126845d8ba83d3ae0620e7d177a9a4382 WHIRLPOOL 0c3f67cfb1737fcbf66536a691458481d14b1586eaa8c267f8c006bfb4103c3668e48ab593a208bbc4506cb477cdb989ab4748a1f7e48401b50db810c3b27126
-EBUILD connman-gtk-1.1.1.ebuild 941 SHA256 09b9d598fe505998b8dbc79aee216e14081679e0fb636c151683d8e09d56a3c1 SHA512 adb12aaf2403f91d3fc61a59437bbbbcddabc6da5025b11e3c26e722d1d1b30e4f285aadf693bfcf7ab3a31c98d6082b486dd4c3ac0b60b55c2aee5a4a37d7de WHIRLPOOL 08e432cec3d3aad7adc6c41dc7ab99d05da3e33de725589c4c881798e8f71ee1e58105b4435116cf0b19dc02f423fffeaaa226474bc39f7ca5a410de8074f2c2
+EBUILD connman-gtk-1.1.1.ebuild 940 SHA256 08859faab8762a1335d981b454c066e1adae8c010bfb643ae520c9acd0dbc812 SHA512 ca786dd4116a01da54d2b64fea64c22a5a8a44ba16763ba85b68fd98a1d80885f33fda5c9b45bdb9294e3b21066efc13d8356628f9a98bb2943c66c0b943efee WHIRLPOOL cd39395a3925d0791690f4b704c90fc23ea3c3ff8fbacc4bac81feda00f75d5ab2567cbed30bc692dad8d7d56f9b2503d91dcf90422fea29265e457d5e1d59aa
 MISC ChangeLog 1693 SHA256 417762bd8bed3cafee3837a114c0df17d8b80ece20cea9a74a37de03cbd26ae6 SHA512 83b7f7456017312f1de384cdbccf02671fb880d5760177d4e05b5eb8499690930c88ab77637825e1811df70a3ad1bb0340f0b2f9748382df169749897e6b7acb WHIRLPOOL dbd98a6fa4c896665f06adce83c60562ca83de710496a34fc21ef7071aad0358b1fd232793ac9ccaa383fd76f2cd4cec10b83a32809f2302892fcd09c8a26ac4
 MISC metadata.xml 488 SHA256 acce02fa7d6634eedf5c209c7b4f8f5488beaca5a0a07925642b9e2275adb32a SHA512 f84f35958b032afd49633c59fac3474148d01becdf968d62747c8a2d99aeec4f90cae7242b7f7fc00cee2903a9188bdc206308a7d692e136317959ebf9019867 WHIRLPOOL 92c73f1f886b370dcfb629d03bf834c1d9618b02441df12baae4fe44d153909902d69bd8063d6425f43c9ab7e90a2e6947e8bd6e38c7dbbecef74af02487dd77
diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild
index dae310961eab..79153de6a645 100644
--- a/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild
+++ b/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="openconnect"
 
 CDEPEND="
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index ca39c3f3db53..5bef2c5dbb83 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,13 +1,12 @@
 AUX dropbox.conf 322 SHA256 b45db3c9676cfd8bf568ca5ce86a4e1a6b95cd604edeba2b3e2b3fb604e19ab4 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132 WHIRLPOOL 2093d21df44308b478654457bf753913b56cc64ff76dd037720dcf15ba061307fc65175cf32c3ae54a16dba32614b1f123aff3c69bad599651ed67be0685f791
 AUX dropbox.initd 1581 SHA256 63c002b19573242477b4b3882f77f31ea6580910d859b1fd8d3b80f3435f6ef0 SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912 WHIRLPOOL d563a53c47dae74e8b3a15cbd07d8b92659813a825336ead9a0029664266844e9ff0365c8c01123ab9da12d5f324b04b66a01de9d0ebaf6add792c665cb72aa6
-AUX dropbox_at.service 220 SHA256 8a02c67f98781a781741ab54d5c22ff904871db84e5549bc2e4864b8d5b9cee8 SHA512 cb33bf6aa290be0ba1afce2f5e525489f8bf4144daf09619b15292968657c74ee17678ed1aba6aa9d2dbd068dc394a10896e7dbd0eaf74d74a928368394bc933 WHIRLPOOL eb318ca1804cd023ca3a78eb923ce5be4dce1166187956fc190af23ae9676bcad61e6180869778e2bea53c572d7e53c0e3f9402874d57791b9e728ad9dd3cc4d
 AUX dropbox_at.service-r1 220 SHA256 33f514f89be2136750725ac06700933e5b03ef406ff5cc19968a9d6c7ee702b7 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5 WHIRLPOOL 01587f3ea00445a320d3e91d4f406f94f5ae8b4d4d466b73cc44dfd186e2b16d0b1cf6fe9302a3586cca5f42be627791ad83166a4d46a5b7a55717aaeb2180ff
-DIST dropbox-lnx.x86-26.3.21.tar.gz 66464459 SHA256 fee6936d207a3e675832ac0d8015f0037368f2652b96601f7f965bed9a9ac3fc SHA512 6d730cac63076baf1792ea4cee290fcacb4c55653baa4fdaa51cd4db7d166d13e03df26181662785309bccfd8475ec248cf68b5cc0b7a541a86db97b92127bb6 WHIRLPOOL 790043cd0c26f5f62725fcd4f9c437c028b597ac90cbd9e3089bb6f237f8e69e3a834b8ed405256a0ec41c5c3231bb6ff5645fe63d1ce00e3f3c7153e684bfad
 DIST dropbox-lnx.x86-34.3.19.tar.gz 68452832 SHA256 190faa0334c5a7f51c2dc68da12aee7e9bde2b9d80cdbd9ebd0f8d99dc03cf03 SHA512 d71d7742d603e50d4ce7d8e366eac5a17a9641f7508a33f1a4d7135048d0df0af6f7d6dad11c6f523127ca2bf16e8819221d73b80375ace2850a0d87aee03903 WHIRLPOOL f7a3bdcc6c4cc5ce4da48a4d0f2fa0cf8df367f6461696d04a77d6d31db708409f7b5997f681cfcc2c9d841125aac05e9bbadcb841ab2397beb0562cd85190ad
-DIST dropbox-lnx.x86_64-26.3.21.tar.gz 70341986 SHA256 244f67ea1eca6fc7384dccc8ea14836712663ed269d32b3a0498f9fc6b02cc71 SHA512 b4c9f160184785e4fe14253fb4208a6ba276708547e519a9fe73ad3731a123cf9c410ccb3a2048ecad90261cd7f8a03d127e7c2b6bbce16665e5dd5d8b738234 WHIRLPOOL 793f7953ccb2bc5c10debbb766537f28b6edf8bbe20a44aecc635211d20154a677b2cfb2e3a6b45bd462823f4b96e5b75a0bbee742dd81e8997c08db7ab46004
+DIST dropbox-lnx.x86-37.3.28.tar.gz 69423066 SHA256 059a4a40806db57912dbe4659dfe9f45f09bc18ced96eca220d0f3289f478cc4 SHA512 dd5efea0648be872c6ede947879fbf89138662a7fa3304cce96e03b6b7c9b37b68c55a03917de623a69592339b74805f3d9fb430d0afd62f946f937a40026956 WHIRLPOOL c8a965fbd16ce83b27310cc477ef297bec01fb13cb7547436a5b81197ca3ee85992b5947bf54925222d32eab3e2a09d2166f8ebfed74138e7ca57fa5f4f5e424
 DIST dropbox-lnx.x86_64-34.3.19.tar.gz 72543000 SHA256 19f22d49b49ba9fceefe6115adc70ace8854bad45c22871c3de0eecb598c27cc SHA512 49be921903df05483f222f417538800843fd12d82dff720633640a740859a6a2da28b7137ffbf2dbf178d3908f11801f0a3622d1dec80da53adbe46a60f4c269 WHIRLPOOL 1c9389d649ebe4c3a7d0dfa6dc209a23733885590441502555fdccfe0b622d8acf958852e6f3c63f03e02e8844c61b1f4b4940e005648cbc1b0f753230a4672f
-EBUILD dropbox-26.3.21.ebuild 3225 SHA256 bc325a4ce210f31936fc994db9e46d98f193fc24b6993e2e038b1eb64083d3c5 SHA512 fd9cdf1a28988aa5fc47dc7374743a3580ff911b3664853d1c42a9fd1007408fafbf745408aee1bb76a78f06075442d331aa7a1707e6983712d56788052457d9 WHIRLPOOL 213aa4861babd3c029225fefbc27c815f167dcb63fbcd153fbd70d8b4b916972dc365654589533c237912be7231541b554742fb94050807d61253e1b86d73f70
-EBUILD dropbox-34.3.19.ebuild 3069 SHA256 728fa78254c9482182a99fae6c72a60ace3e88a961abd190315d89813557a4f9 SHA512 e7f218c0f8ef8d7c9cd4c5651f7c08cdec1deda754530fc2c0620f0e452521f21b0d839cea23b902b5ae35a3ae727307277c7d86c17dfd0796d91f55d8d1d605 WHIRLPOOL 2037e3e1ecb1b0a2201f1040402876eaf73628a0775caa97a367b28142d3cf095b7e79586d1c0558f9db458d8b185b6c6ac19348208ee9eb42786f3436c4c33b
+DIST dropbox-lnx.x86_64-37.3.28.tar.gz 73435466 SHA256 a3e33c46d6b2bf2cba5028c35e58755922cb99a75e5d1b3e9f3f8038914e7abe SHA512 b3326e3f35916c847478a2e9c5b78234142499538d73e52d1b676f3b2d7fc428471c6b17518ee536ca0dcf0aa7caadfb81e327e71a7649b8cca6e21b76f2934a WHIRLPOOL 3f434e40d2e6095b4672a1cec6e6267cf91e8a53a2941def1a7682fbf3dacf53eae09879ac2a912d0f126fbcec4273bf34aa830ae58f94ced4124253c3e0e068
+EBUILD dropbox-34.3.19.ebuild 3067 SHA256 371084ea8a49f6f1d426a74264afa68d4872880af8a2ea2a84ff4344f80a05f1 SHA512 351df4410d640e4dbe3b8373291d43957edab99858eea949ff8ea354e228d882d01eefe177dfeaebf371183964b1def71e18e68631482a8489aa6993cc9441bd WHIRLPOOL 68f23613a374db3d86fd697fa34b1bebc6e55d5eeb49f6b8c7f6a2288d90b44fa2f9225d56a773da31673274c292b6e23e833cc16443839275aced76829980b0
+EBUILD dropbox-37.3.28.ebuild 3069 SHA256 728fa78254c9482182a99fae6c72a60ace3e88a961abd190315d89813557a4f9 SHA512 e7f218c0f8ef8d7c9cd4c5651f7c08cdec1deda754530fc2c0620f0e452521f21b0d839cea23b902b5ae35a3ae727307277c7d86c17dfd0796d91f55d8d1d605 WHIRLPOOL 2037e3e1ecb1b0a2201f1040402876eaf73628a0775caa97a367b28142d3cf095b7e79586d1c0558f9db458d8b185b6c6ac19348208ee9eb42786f3436c4c33b
 MISC ChangeLog 6052 SHA256 7c04020528761c421266ad4536e5dafd804e8d31219cfee7b4a4ede7b55b8a0d SHA512 7f665eae9642b85c073f36e1822eebb532dea040a26e9ec25d78442b9cba43f80f914c30d477772c107cec1d14242d503589f2fa76394a2d3d5caf006ce223a8 WHIRLPOOL b35ab46f12125d4840709d2eeed0a69dbf18d601db204bcafb6f2e721d36383a4d3c4142a8236d14e8d7d94cd795314b1329aad0f29720aa693c6a9931cabfe3
 MISC ChangeLog-2015 9677 SHA256 bf4188db8d40baf835df916f62672b477747116d635ad62b1e0c0f3fa63fca05 SHA512 079a472917a28324bdd271de425ec1d7a371459c7e9106cb3106b78ba379a3809983fc4c282acc5c88763c314ed21b15286b2ba239a152043e4b565d75a75d72 WHIRLPOOL 4152b5aae61c435c3df363d774788a7028e4fa8bc0a4383d03db7b35026b46b3261948a9c089d647e2b5bb8fe84dd6ff3efb5397d21ca9638877921fec69706e
 MISC metadata.xml 392 SHA256 1cdc85b2e928a4783c0d3d058e6ff2a69be3e4cca2f3ae6553de95337cc778b7 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141 WHIRLPOOL 336f1ffd2198a65bf957ea3c11f5ff1d11e781b88d043ee325cf868e39ec7c016b8c377d7b93f6cc4b7f9950c82add02414842686b87c7f0852af5b1ea522c4e
diff --git a/net-misc/dropbox/dropbox-34.3.19.ebuild b/net-misc/dropbox/dropbox-34.3.19.ebuild
index 2ea39b1ac76e..a79ed26b4631 100644
--- a/net-misc/dropbox/dropbox-34.3.19.ebuild
+++ b/net-misc/dropbox/dropbox-34.3.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
diff --git a/net-misc/dropbox/dropbox-26.3.21.ebuild b/net-misc/dropbox/dropbox-37.3.28.ebuild
index 1545137de6a1..2ea39b1ac76e 100644
--- a/net-misc/dropbox/dropbox-26.3.21.ebuild
+++ b/net-misc/dropbox/dropbox-37.3.28.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
@@ -73,11 +73,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	local target=(
-		dropbox_sqlite_ext-0.0-py2.7.egg
-		setuptools-20.3-py2.7.egg
-	)
-
 	eapply_user
 
 	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
@@ -94,9 +89,7 @@ src_prepare() {
 	else
 		rm -vf librsync.so.1 || die
 	fi
-	mv ${target[@]} "${T}" || die
 	rm -rf *.egg library.zip || die
-	(cd "${T}"; mv ${target[@]} "${S}") || die
 	ln -s dropbox library.zip || die
 	pax-mark cm dropbox
 	mv README ACKNOWLEDGEMENTS "${T}" || die
diff --git a/net-misc/dropbox/files/dropbox_at.service b/net-misc/dropbox/files/dropbox_at.service
deleted file mode 100644
index 1cea6177ce7b..000000000000
--- a/net-misc/dropbox/files/dropbox_at.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Dropbox
-After=local-fs.target network.target
-
-[Service]
-ExecStart=/opt/dropbox/dropboxd
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=always
-User=%I
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 0ed63ee9ef93..47dfeaa5048b 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,9 +1,9 @@
 DIST owncloudclient-2.3.1.tar.xz 12260696 SHA256 93143752234a0bc4c9798b69d8239996d92130eecdc1d93b75e3d49b899f3914 SHA512 2dec3d4b452faca32e15c1a461d3fec97fc1c2e85bbfe2cb02035371a5426b8458be1382ed6b4a1102a4f38241580c3d49980ea388344365297a4a84f8dc9add WHIRLPOOL 49abeb9b9843a024338cd2d7c3a87625f7cd4f832db03513dc4d7b0d5d1908a5691d6f1e7b7437175084c30a5e3e18d837785afa5647971fdcb8e963db2d54b5
 DIST owncloudclient-2.3.2.tar.xz 12266008 SHA256 a1199d2b957a28081aff11a2a7e471ca09c965bbb1b51b1b7b7a8706304f5f09 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c WHIRLPOOL 099c963940b6fec67d5d14b8d3a62eaf378617a7e8a73ca9b82c6f82451a6e80a6da4f0f0ea44e6064d5fceada68f6e1591e499e3ea2f6dfe14c6e0efa01537a
 DIST owncloudclient-2.3.3.tar.xz 33801712 SHA256 aac1bbc16629041795ebb67151abfe109b0c220161e1f7a3f431311e2c6dade4 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2 WHIRLPOOL bbfb895d9724868c941fa178f6d350f0091254aad0552c73f78d30daa199dacfe8068e1a94d07349b1c3f355712eb2c1f12e06877466dc56260180489d8b2ec2
-EBUILD owncloud-client-2.3.1.ebuild 1974 SHA256 d1a250fa572d97a4c8ae4956255453bf395c9b6522887c2728a74cea947e9940 SHA512 7da968c1018e7cda21233f8cbca4accb5f0558745552bbbd31fb0a17500c4277c9b6422846ff10fdb0f870faa0528036771df4b68e4bb5c36d591b9a085049f2 WHIRLPOOL 2b5d4fb5969f7e02a194ece71fadac9ed8503164941058a41e70991ab862aed2cfda8f4a19d86ee531507b9355ed73289b2d62519b6f1c407f8ba701f4fb2505
-EBUILD owncloud-client-2.3.2-r1.ebuild 2059 SHA256 453035b5fc69237c57902564da17bc2572763382aef17199a1982898267eade9 SHA512 13a669882636fe51b729c3eb0d8610b5cfcdc1555bc373cbb52681860d8e28cb9f4469d2fafab52d1e93da48d94ca582dd02f8eeff0bb384ae5c342d3a69287e WHIRLPOOL 5b507107fd2de49784c749cbc7fc4ed3b5ae4ffde44e46075b4cf02de84e8f638aa23d1494fb321af857d423f60f807875ac1ce7433eae98822248b9c3538728
-EBUILD owncloud-client-2.3.3.ebuild 2077 SHA256 daf7b27c35e4af9fa3391bcbeb6e47fbd61d19bb021962e97c3f5d3488075fff SHA512 d3f159f8f909ce8adfa9546fb4a0809f2671b410d246fa47e500607f7736ec194b89c5605129f2b218b73d9130365fad3e9e506ebd4f8f60efc4bb2efad51682 WHIRLPOOL ce8d84c1f96c602c8af802915d1e4caffeeb5a21ddeaad771d0a45eb2ee6f0c2d0759b54853006a77be6debceb4d3e471b85c5892e9c87c159543abc40cba7c3
+EBUILD owncloud-client-2.3.1.ebuild 1990 SHA256 4eb4d5662a4ccb493bd4605bc53f18e6e07f434f947c0e01844a25850f7a1c7c SHA512 ca3e03abbfbf9a8e36d78790899d9e73df5961153754f548ab5cd54709f3c3c53a3145b9e1fc903bf718d1f1ed07d7d0a2cf12a2928ad6a35c62ad5fa2ee928f WHIRLPOOL d779b0b2c7c2c3716efcfdd0b1a6e13496bc48bd1560c3de6f21dfdfc3ac8dce1a05a61db7327fa42c986617044956a42cfcab022562e763d82415ed00a3dee6
+EBUILD owncloud-client-2.3.2-r1.ebuild 2075 SHA256 98bd702df9e1b9ec409b636946182481a77ff9f0493f5a558fa1eb4e0849cc9a SHA512 753debe97f113725fb94db37e60a370fdbdf25c790b78ba576d1f2cdd2dff5e41dd883ab67eb3ee3796af70c103aeb267e81b34f03947bccbd3a4384f440cd26 WHIRLPOOL 62b3ffe4fd5263f1e3fb385465f0677621478602f8385a22a961b0f2b4f630bb238c78365222e7883be42386c4655036a157dbcf0a700c79de4282d0618533c7
+EBUILD owncloud-client-2.3.3.ebuild 2093 SHA256 1884c9cda7c7ddc83dd1d451ae5ba9ca27ea28b1cbdede1fc62ab785172e4741 SHA512 d9122c03b40f780d5efc866adc4ecfc77767f3f0bbfc06276c38b8e9d54b6ec5198f4f046c162584a2edb728b509af9548ad280dcf15eac9d01f80491afcaa6f WHIRLPOOL a6ca2673763dff323b2d3656322246d0fa2f026b01964d3755b0148323378bb50f7bf3393ba013cad2335664357e32b8410d678dcd3a3ab6cc274ec142c3b9ff
 MISC ChangeLog 6990 SHA256 3fe0fff70b8b24b3b5321a1720175c42f87de6d5a870329421e3f91838701d51 SHA512 890741b1efe2f672f17541e959be5924b7bf6a82802f6b79db950569bd892ccc65e352a479973322582889aa2829a0e70d9376e466cb594fa2ebc1097dad362e WHIRLPOOL e4b11e5eef0d97edd114407da52a317bc5115000899031bbe7f38ecfc9fd9916b5ae27661b28e597db0679c7aeab6b2a1f026bc0a77369bc5881638dafecc155
 MISC ChangeLog-2015 10097 SHA256 673578e906e89dac0261e0ddf19c7e75826c7279aad31055a31442bfc41b4d97 SHA512 10a22ef76af33e303a040d7b679e5cfc1cf55aaeba44d9af9b0baa6ec5a487c98ee2d1fe9fc3cb9b81573f04e53fb0817205e73891613d03204cf22b13e0aa98 WHIRLPOOL bbaf12ebee36097cb213298ae6602027b0e3a0459e6d6bf943e39c77b40e9d3a6e01f3f0e8a4f2eca7c5385b7cf817b47aa3228b73f2754403aa18bbed84e232
 MISC metadata.xml 595 SHA256 43f756c2fd8954f0dc2fbd6a329254c4c203a897488030153aa31ee94ff18dee SHA512 3c79d7e86cdd5451171bc649488559cb028dfafbda29e260bb92af2db3ae0c60a486c4643bbe8685b8499be07b51424223b57f8da6437eac948ede96dffc12cc WHIRLPOOL c53e446ffb0ee45385187e873a47ea10fd83cdbddba7a07a9d9e5d810a951364eea30cd06f2c63f3373184aef6f496c3634b83959901c508d53a25198e654506
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild
index dc30d73d71a8..819a6751f1ca 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild
@@ -62,7 +62,7 @@ src_prepare() {
 		cmake_comment_add_subdirectory nautilus
 		popd > /dev/null || die
 	fi
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild
index 760ab9d1d28e..26efb0fcf18f 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
 		cmake_comment_add_subdirectory nautilus
 		popd > /dev/null || die
 	fi
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild
index 13d14f0cca47..4bce7edfa29f 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild
@@ -64,7 +64,7 @@ src_prepare() {
 		cmake_comment_add_subdirectory nautilus
 		popd > /dev/null || die
 	fi
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 77d3b1d28a09..28cf32402d9a 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,9 +1,9 @@
 DIST remmina-1.2.0_rc16.tar.gz 1008438 SHA256 edb347f9e4d0a2e682f7ffd22caa364b477653a1aca31d1c1922a86d81df4995 SHA512 a6d2fb95a3fc68ee7ce4c8205c775cbc7bb83fa2f90b68d04f355b4ca8b4d0956a29ecbc028260c432b55c582802e9f243ad62426212d9fd0f02f7e50a56856f WHIRLPOOL a5d136e1abaeafcc1ad070c400a0c7456e29d1406ea3542add5eb36c4cb1e32cedf0a2bac855298a5e1e703e19774d007ec70c822c49ec13a9f565123b33181d
-DIST remmina-1.2.0_rc19.tar.gz 864828 SHA256 e5a5bc76caf78f873030e0fe9709a2981c9900cfd153775309e358fb783840a3 SHA512 4cc834376392f3bc31a0c695df69d516679cddfefcbba95a7c71be25e8216a0429e0573dadbe72fd1a3bee2b1fd1847ae3618f2ba5ce3896a1b52769f1f87394 WHIRLPOOL 216c63599d851acb684fa5a92864f30f707c628c17f7be96eea48ab557b5104554a736792da70a117d4be2ffc4aedb9abe7a27f7495a4e504e3475ad547ae4bd
 DIST remmina-1.2.0_rc20.tar.gz 1016674 SHA256 5663105735600cfe5dbbcd62e64ffb27bb6587e1035b04b2b63a32a98d25ef30 SHA512 096cbb9cf45e911466a6123eead727d45365ee434bf371603733de4e7ab9b445ce67019f2a66d45fe33aecab4d163f6f31ca38811adadc125494f8575fa3a64a WHIRLPOOL b3b218c32e46516f80f637dd8fefc59c16ed437b24b0d7a20336ee90b5364e29e618dfb1705de31341b3dfd0220df3ff38021f782e57127b193f6b58193b761e
+DIST remmina-1.2.0_rc21.tar.gz 1028685 SHA256 9b4ac39a4ca40fffc9ce52e4a504839626eb4e0b3d1cdddf54217beef1fcd535 SHA512 5b3f0bab14c57ae91375373b0181bdb4e6d933332ef1b5c590988b29d6afccfd77cece371e3bbf98bedc6c35a9ee8eefa37201ec09fb44d62de83a1cdaf706b0 WHIRLPOOL 560779b36f2efe830f69121ac532f4558acf3e6c82fe826308d4402d8710b1976b3f773ba3873387d9e0b2575c2be63531cecd272305ebdde47046ce342bef71
 EBUILD remmina-1.2.0_rc16-r1.ebuild 1987 SHA256 30f663885a1b1445d73bcf2eddf4d85b7849a6133cef5a48b55acd4a2e4c114a SHA512 8301d870a34688124dafbd9199c5364ab9fe7d3b4439e0d3fd62258bb64d89544b212ecd73dcb194ddbee17d8aa7308e09182f127bc74319c5ee27ac7c7627ce WHIRLPOOL 78a68b2640c79b49b550ae0350e399a831c8b5296b4df75ce0ebbc68fb13ccdd345ecb154b1e5b1321b0a1d4043da741ae13eb2e9d7364849fe8b2ba7d23b4a7
-EBUILD remmina-1.2.0_rc19.ebuild 1917 SHA256 13c1105f0bd4d23be4cca821ae81f16a32f86af93bd47683729f25e807fa35fd SHA512 3312e56870c95d24962805d2fa7bc6bab8d31b52f69650501ba7c25deec47ddddfd93aa8fffb4dfcad931744c1a48b63f361286a89235286044645e79660688c WHIRLPOOL 7b40e3cef3d7bc85e2d2ebad679107308814f0cd1c06509c6101247226ab2cb1d43c1306b52d3c7f6e3cf7d363796b70b1771dc05e6ae5cf9e2d1cf08f90ccc2
 EBUILD remmina-1.2.0_rc20.ebuild 1917 SHA256 13c1105f0bd4d23be4cca821ae81f16a32f86af93bd47683729f25e807fa35fd SHA512 3312e56870c95d24962805d2fa7bc6bab8d31b52f69650501ba7c25deec47ddddfd93aa8fffb4dfcad931744c1a48b63f361286a89235286044645e79660688c WHIRLPOOL 7b40e3cef3d7bc85e2d2ebad679107308814f0cd1c06509c6101247226ab2cb1d43c1306b52d3c7f6e3cf7d363796b70b1771dc05e6ae5cf9e2d1cf08f90ccc2
+EBUILD remmina-1.2.0_rc21.ebuild 2009 SHA256 61d372997400ed98e827d0ce926cdfad57e6b9931e8c50b1bf41a1fe127141dc SHA512 e3da5aa9cdbe94bc3bc61f2540495879d6ee1b69931f673ed126dfcf071379c5ee96d18a0c9e3e2a076029172e94333ebd81dbfe816d5b28bc35ca48d6eb5fe7 WHIRLPOOL 1cd9cb78054c71b5ff79f931dbd086f0c9c9853d28f39db19a8469e3df2d810fbc742e4367904e42a7ca3704d864971d37cf7563adf901445bc053d88da2e27a
 MISC ChangeLog 7914 SHA256 4cd426f03bede791325c1b418f3cd0f0741aa13290cbbc7b43b6e9eec8c8aa6c SHA512 432595f86ba602b39daa9fb421c4113a534e3f04e1de6cf2c0c36f2dde817e68e655c74d5485c16861593c1adcb616065b96d881715fd4abb7b4c02f4c3c1b40 WHIRLPOOL 77f28921d4bcafd53a7e34020f6c08246d372b066696ad7fddcf96eda25a9eba3a0eab444e509ae3b2a81c54fbe8b4a9c016e989f418632b0e3af673757c893c
 MISC ChangeLog-2015 9985 SHA256 eab7fd33caffb1587ad50d8e4b5045d3ae8838d43c3bcab12d6a501889ae878b SHA512 9f8975961cbcf0d454e866619682c5443921db015ad5df0869666c379a558f4e241555a4d75be93fcaaad9e7a9c27cca833db4e870640e84d466d7fc7ff52776 WHIRLPOOL 2b8d6b906e127ebe13bbd3c308a0704d96ea3cc481ccab62366565656a4c434171daddb85a18e0e38abdebc311a327d2374123cda2ed8456a1a3514facca5552
 MISC metadata.xml 1246 SHA256 a3dcd2337b18f953e5f388ae9b80611ac0f78be5fbeec90b08a7cfcbea16c2d9 SHA512 4116cdb618584c5b95ff0330fb9c9efad2736cafcf4e3622fd074d5026f1adc5b7ab8e420188bc3a689b31cc285318db953bfa66c54b7fe91de242136787a5d8 WHIRLPOOL ea28c105a203978b44ea8aad120ca0f3754f1fe3a21d0ec414808dbfd1d63ba57b39c7f6409539114c6072a79303bf5f9d2cc9fe6754e891675a7995dce6dd26
diff --git a/net-misc/remmina/remmina-1.2.0_rc19.ebuild b/net-misc/remmina/remmina-1.2.0_rc21.ebuild
index da10825a7c66..e0491b743f19 100644
--- a/net-misc/remmina/remmina-1.2.0_rc19.ebuild
+++ b/net-misc/remmina/remmina-1.2.0_rc21.ebuild
@@ -7,40 +7,42 @@ inherit cmake-utils eutils gnome2-utils
 
 MY_PV="${PV//_rc/-rcgit.}"
 
-DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
-HOMEPAGE="http://remmina.org/"
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
 SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy zeroconf"
+IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf"
 
-RDEPEND="
+CDEPEND="
 	dev-libs/glib:2
-	net-libs/libvncserver
-	x11-libs/libxkbfile
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
 	x11-libs/libX11
-	virtual/freedesktop-icon-theme
+	x11-libs/libxkbfile
 	ayatana? ( dev-libs/libappindicator:3 )
 	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_pre20161219 )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0 )
 	gnome-keyring? ( app-crypt/libsecret )
 	spice? ( net-misc/spice-gtk[gtk3] )
 	ssh? ( net-libs/libssh[sftp]
 		x11-libs/vte:2.91 )
 	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver )
 	zeroconf? ( net-dns/avahi[gtk3] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
 
-DOCS=( README.md )
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
 
 S="${WORKDIR}/Remmina-${MY_PV}"
 
@@ -48,14 +50,15 @@ src_configure() {
 	local mycmakeargs=(
 		-DWITH_APPINDICATOR=$(usex ayatana)
 		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_FREERDP=$(usex rdp freerdp)
 		-DWITH_LIBSECRET=$(usex gnome-keyring)
 		-DWITH_GETTEXT=$(usex nls)
 		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
 		-DWITH_SPICE=$(usex spice)
 		-DWITH_LIBSSH=$(usex ssh)
 		-DWITH_VTE=$(usex ssh)
 		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
 		-DWITH_AVAHI=$(usex zeroconf)
 		-DGTK_VERSION=3
 	)
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 66e42fd5640a..c4ce3443a26f 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -7,9 +7,9 @@ DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 3c021ec0bee4611020c0bcbab995b0ef2f6f1a
 DIST tigervnc-1.8.0.tar.gz 1433830 SHA256 9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a WHIRLPOOL 4001182ec2da3551b0eb2d6ee863c225340b474dc6d32cbe4c0941e421852a10913ee80706009b1a59043b6983ac2bc42f070d1a5aa97eefe1cff3c97497b2f0
 DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
 DIST xorg-server-1.19.1.tar.bz2 6041792 SHA256 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7 WHIRLPOOL 9fab4118e866e11a7742ba63d7f681490d43718a329416fb742e268fdf56f348bc9f1f2b5229fbaac98ce78f41fc1e9e5aa7587ee120fcccaba752ff4bac1555
-EBUILD tigervnc-1.7.1-r2.ebuild 4637 SHA256 249210856391fe17a3d7b07056d38aa8fbe843be20959091effb7da3a3677e39 SHA512 4ccc3ece00c4c9bd4e35f7160cd85effb66c3f2c90c844447e3e1a02cd009bc435cf9be58e5a6b478be11b832adcc0f4bc58385d2cb4f6d8510b0eefa9c155c7 WHIRLPOOL 13aef55fa4da3b483f9f4c35a24d4527cf82aeae3955e4dddae67f890f4facaf80571e3223360ac5c5818ac664da47cea5db9ad3d52e5fc165de868f73ad098f
-EBUILD tigervnc-1.7.1-r4.ebuild 4722 SHA256 466b11c47fbc7147e068f4ac65da00b61603ee347040c7c5b65a43589cace47d SHA512 8852901f22f45a263f6d5b7d6a58e56a926306fab94836826fbcb65a6ba3428c82a7b25db6476a6dbb3428b4374684649a18959cc029aa5574e9ca20113d5286 WHIRLPOOL db1ce346de70416b12bd0b7bd0a50aae773999e6d37495894322f60ae83941fec8a75a9f680b0dabefbb8e01d8ef1d3a14b73754eec1c0e582d67dd3ed45d672
-EBUILD tigervnc-1.8.0.ebuild 4526 SHA256 79754f7e609b3444ec63d458849591be416dfb3dae70bb9c066c9f354a31e116 SHA512 b0749605633022f185df75d65f04f04ebf21f1d9a0bdbb06f3a19947c9c9167e93b3e0e2ca19602b7ffe56763008cfe6156cce0949335328ff6f15a56899c6b2 WHIRLPOOL d72e2cb6f58db5c22ad46052e7d1a0071775375d9f64858cc146f02c381f9b726e1f1611fc4e18faa7ee842749a853b995392e9eb26c38a91324da7b49b45e2b
+EBUILD tigervnc-1.7.1-r2.ebuild 4653 SHA256 c06a12d6de05a428ac407cbfa9136f69cb2a9fa91f0eb759e0ffc20d91fec52f SHA512 22cc6f1fd7db870a615b88ebd775fe8afe41021c48278c12d5a3258196b08fe30ac529010f42cce2f3ac0839fbf1f63aaa8878c61d5fb3bc18e688fc7e3ae458 WHIRLPOOL 85f31c903b0c9c9f51d7bb08c980b1f03efd9194ab6acbd9dc994304e771d8a287fbe40dc7ad50533e532f2a1c27d416a0593d2bde6f16021eb91fdd50bfb53d
+EBUILD tigervnc-1.7.1-r4.ebuild 4738 SHA256 4adaad15eda35db69128b2773d5fd28c1921758a678f9ba57cbd47a710943073 SHA512 96805da2397ac252fb7238cd7ddb06af21e78e3b6c0af8d54dbe49ee99645f49f871e55cc7bc44369656c5f356c8192c08e89516b962dfa5c6b8e948d8ea313f WHIRLPOOL ff0be42183fdcbb608b5c607fa5a9b5ebd8ece1fa46d0c7411aaab57117bcee49c7bac2fd567ca9291324059952ef0e565a3b5515047379574689237a0d2d748
+EBUILD tigervnc-1.8.0.ebuild 4542 SHA256 874b9b028fa68057c36008d8eea5db3be5fbb50d9e30911bd4f099d641d0b902 SHA512 4291982d69e1a650ed57a49d9948ce2862149b1a685ba4e599f8236a99aadd1f60cbf2454b3c3cda1575f6e1a4008dfb58092bbe2155d1b7a49a62d43bc6eb7c WHIRLPOOL 6d29cd82db6588a1ce33bb7bf4de5124cf37ef93e3bc02cf6fd47ba85eafb47654de735cf27c3c9b71fdf9ee140019ad25313bd6c48b83adda286557fc04c82d
 MISC ChangeLog 8410 SHA256 bd682137413d956f17d33752f2cc480623e91c92a6e209bd902ba173fe451809 SHA512 877b097f78fb01467b31decde5dfd34b66b984feb5df398effc3447b1fe90800e380d80919babad8deb6ba54d828f8e6542915f46dda24e42495221aed2c57d6 WHIRLPOOL 47292baea39ebb7a25b1e2d71a4721be78e2c5cf48e4d0bb6240a452e93824f70283afcf9c443cd11ee9f3feec8bfdcf37c0f897258de23e7f763629a886d27e
 MISC ChangeLog-2015 28816 SHA256 2accf9b750570af369f0a2b8bb23db0a4f032fbf9ff5a8761ddbc604ec74d281 SHA512 1d645ee4e13d8639b6e27685b78e5b0a41167bd76ab5e4375404e6e106548dff000fe2b309a249557afdbdb4dc6dc7dbaf3ba15c3acb9088a71d9520490f1b68 WHIRLPOOL 20f0137d3ef189d90bdf7663c82172cb54c25149539e709dcd4b1201edecafa6256bb20097d3081d77778529f22c120767b7c30cfcf4abd8c2b33cba325d63ac
 MISC metadata.xml 671 SHA256 d98d7ab061b2970005b38a491a5c6cbf46e81e4a149b540ec3e390c715c083b0 SHA512 e2416162e344db1025f15b89754c6f84f9b69217b86abe15bb6d048ae80bcc0a84df6943ada53c71f6bc6236f13f7add3e5f03a9e52cc61da060a391b8a69a44 WHIRLPOOL d9a1ca79d5f1b3340ff40db17cb88a21e7c578250ebab1758fb0ee73e1687e9620bb819a3fb3142d43e77778cc1f978b6deab6bbd62364e10d7af3a042eae356
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
index 297e4521dbd1..0f71cfb4d1be 100644
--- a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
 		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
 	fi
 
-	default
+	cmake-utils_src_prepare
 
 	if use server; then
 		eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch"
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild
index 40b8ab883d80..3cac464560b0 100644
--- a/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild
@@ -91,7 +91,7 @@ src_prepare() {
 		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
 	fi
 
-	default
+	cmake-utils_src_prepare
 
 	if use server; then
 		eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch"
diff --git a/net-misc/tigervnc/tigervnc-1.8.0.ebuild b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
index e4ab6ef621c3..305e756aaf3b 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
 		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
 	fi
 
-	default
+	cmake-utils_src_prepare
 
 	if use server; then
 		cd unix/xserver || die
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 0f77f3b1fd29..7bd537ee94e3 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,11 +1,9 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.09.24.tar.gz 2810181 SHA256 7d7140ce63377e84a2072b4922809c7a2e90e3916cde2f4f1cc8860664395548 SHA512 de96406aeabb993a39941f5c67947fd1b77ec003be36b215cb3df1e5c90d63c7c570a5ca7627f5b2faae6a15ee07d45cf339cac6b511890acf49c5c38e6c5672 WHIRLPOOL e248990cce1bcbe50ae9e0ac6a95d760948809ec371b93126011d71599e721f1e9b0784690b832d3c5c04fb55c048b08c091193f821b18e1211f4c393ab2d017
-DIST youtube-dl-2017.10.01.tar.gz 2813364 SHA256 0b4f0e12b099c46ad47597764b10f45ceae3935834abf99d49ccd8cfb48dff10 SHA512 f1eafecb2418276df7e7bdb73402779521197f551be3431eda9727390884d42c50a73895d0c58fc3783ab04712e4bf5aa072dad6d3241724e19e6c4c80c0080d WHIRLPOOL 281b7cdb288c1890e785d15cf1aa7c1f8e33976c521559551924b0f18b26981fb33a0b60ff86df796613ef34d273a13b3ada3c5f3e851534dad4bf124260f509
 DIST youtube-dl-2017.10.07.tar.gz 2816312 SHA256 d9a8935087c1e2fa3307594ae15f1e9ea0f8676e825fa676a50a3a3d471bba83 SHA512 4842c8b324a10a4eff398226749ff8394ca60cf1e47873c1dfb5cf9828b77772670ea30891f32b26bab421aa0e7ca95e2815e062061a2cbaf22e6c5f76e1d87d WHIRLPOOL 525eb2eb3f18bf5ed1776f1a4d43dd010793b3b1681f27b3ed4ed4afdbd0c3dcd2c18b8e532de1fa3c318ac6a5f186c0bdf60fa4c7c69fe939335a7235679c3c
+DIST youtube-dl-2017.10.15.1.tar.gz 2820437 SHA256 da6ae68b2fbe81da7cf4ac6b989fa7bf27b3beb214eed551d466cc6e41d7297f SHA512 6093747f732dac4eda4c71d334ed01fc24ba70d29e5660c38ff795861f06c4029441c3a4576e6a5463974488aeb7732687e5634481c8b04127f77499a2405a1c WHIRLPOOL cc8fca27f2a110fde556e6c6506a88715d4e4a03c971b7e74e77a91a5b28916c66146afd6e476a19aca2fff3270719da102d254a05f62dbabb5dc2a10040d839
 EBUILD youtube-dl-2017.03.16.ebuild 2381 SHA256 9503230e2716a18498b74f5047095216fa36cdf4801cc6446e6f2075fa5cde50 SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862 WHIRLPOOL ded7fa74a8649db1cc5c16eb98ab557853d264bcc458429374b0bbb29773f993a8621285bcfcbe243cf3892d982f91ff5278c45cb0e50b824b156a0a57786911
-EBUILD youtube-dl-2017.09.24.ebuild 2383 SHA256 e959a1068b24172b3b4ef9a21277befd8161fe9d514ed6924e79f194e011d39b SHA512 212115024819c4ace4aa20c649202883bfa78488e1cc903b49d05e6abc704cbb6051ec12c0f7942c1e7cef8c40925a9e5c984058be9183a367b8b91d20226174 WHIRLPOOL 0313b71a631fac8a921e718d7de6d9ef8e8803e6c18c05dccd80caa22aec292e5566f98fde2a12473feaa6ac0e174bcd49cca8920f5860503d034c91b40cea76
-EBUILD youtube-dl-2017.10.01.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-2017.10.07.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
+EBUILD youtube-dl-2017.10.15.1.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-99999999.ebuild 2089 SHA256 a46031a2c229d820634b16d31efc904c44bafe1d04c3367b9e40e5e0c8b1c953 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11 WHIRLPOOL a358657c660c533e1b506339c615e781998aa5465408629c51722f6999fc3e5d3fd11b617b89314ada35df0d93aeaa514837ac1a2e3b7573c43657394f6ef4ae
 MISC ChangeLog 32089 SHA256 377c688fd528de367a40230423162256199da2c475ef85d3dc986b622e322fd6 SHA512 955715fa5304b1ee5ab4436e232b4ac5c882e28f4755d2edcd23cc4c760575518dc8c349c20b2e1b41145ca55bbd8df292d12a1b34768acf55ae1d6b80e2f2ca WHIRLPOOL a925103ccb1de53ada47dd94f927a42eff5f97e14b47c607ddfaeda4e719a2eb8be78be8e008e4b3036ab48acb946e283876d646388745288ad5b992e2574104
 MISC ChangeLog-2015 75434 SHA256 71ef7accb3e09eadb601b4541ead4ed3019cbd1e86b56df23130cc0e49572dd5 SHA512 3517da9014199375d7bb8d4841b52ad12eb3a25ca7a225e767dd9b60f8b81848cf7f6763066fb7c7bb7826602711e22f56d710fa319cb8172843a31eb69228e6 WHIRLPOOL 32aee6516cd3e7848eeb08ccd47cb60bc04da646b2e448970ce40fa5d0e8dc591ae5d7c8e1dfe99229b6ee70805e070d8dee2353a41515377083bd7d2f02b073
diff --git a/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild b/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild
deleted file mode 100644
index fa2e8cbf808f..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex motherless myvidster
-			porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
-			ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
-			vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
-			youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube pornhub redtube tnaflix xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/completions
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild b/net-misc/youtube-dl/youtube-dl-2017.10.15.1.ebuild
index 975ce26c347e..975ce26c347e 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.10.15.1.ebuild