gentoo resync : 18.11.2017

12 files changed, 224 insertions, 8 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 9f6c12aa0e77..55398f80fccb 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,5 +1,8 @@
 DIST nextcloud-client-2.3.2.tar.gz 671944 SHA256 fbebbcfc538654d7a5373062d2165638a9bd9e5dbe62b5f4552a942b0b931617 SHA512 0447a3e5ee3338cb98b9d503a94d32c926f9092a25fee11e3686e5d662362137dce09865350cdc3c9af62ac8a6ebfa7fcd00f817edbb10189512a6df8e587628 WHIRLPOOL f5bf0526ffad6eb12be7169f8b61b35be31e01b44bb5fee4ab03c5d3449e3e30496719cc4f84c587b62a0638d99a70fd2fa1723231f6f7fa9c7ba80d095daeec
+DIST nextcloud-client-2.3.3.tar.gz 708611 SHA256 e3c4393095206648c96980fb23d0520658b3aa8a9a1e31db38b6f59024cb6f8b SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde WHIRLPOOL 35e99285f2761ce126982376190069e1c22c236f9bb94b43670ffbac760d291b0bb1272a4f30002cb23452e5c0a23ce0fe0e3318634f8756e30bc7129015f11c
 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 nextcloud-client-2.3.2-r1.ebuild 2508 SHA256 861cb056714c91c79b3a1f692418c4f397dd854236114bb5637d47f5d8aaaa72 SHA512 563c8391302c808bdc1f513882be4e876533a1dba958c20f33a1fa76ed05375ef5e4d57e902a2c817335e18d226bbbff89ca05e20a5c7d7f6cb605861a17ca45 WHIRLPOOL 05731be35a47719611588f0d4979d883a73c4c4fa9b06514726b0863fdfbc2fd817fbc144765bc2e3419ce3476bef2d82d0479ebae6ccd997f1bfd19750a3292
+EBUILD nextcloud-client-2.3.3.ebuild 2591 SHA256 203cd9638b82fc4833dfba3ad2066cfc529a4582dcad3b018336787d58472558 SHA512 499c966a9b2634e20093ad1b595b5248620e3d7a0c0c386ce9b1d2c49c90cf7f11a2d69c296e5cad350720306ecafd568c56e948abf70dfb2bd21a83fab3da64 WHIRLPOOL cfa6bf4f104411ded4af19e44260dc05d2e10a76a81ac4f390cace772eff23bc8d12264968c4ea5a88f27d6e8c2f2cf51ae4af0170b32d59318e4a3d4c748b04
 MISC ChangeLog 1236 SHA256 eb0a61a70ba44c3ed03b635747bb00f7aa58a9a6dbf5b0e5b443b5678cc40be7 SHA512 d9545757f9886ac6d9b879c65dfe03964953f63abecf552cfa2390f346fe149993824c8688c428f0163d9f724a5d78a85f3cf3048a2b54f5927236ff188c6884 WHIRLPOOL 817122fc1fdcd790fd67625a6d6637532ad400795d6cabaf6b9b3f527277c867e8e7435e69ab0dac888a4f131e1d48958de6045fcd8b205a6003007413eb9f6f
 MISC metadata.xml 684 SHA256 40590dbeba611ac96fab673d198b0a6843d3b0dceecaf00e1a01171af72ed14b SHA512 914f49b010493ae3019d678fcaf92e2d41a2cdd7cee3b7041db7a65a8c122dba81fc3e6df237201d6a69b8755768fee5b65fb9df83c977449a48eb5fc1479b29 WHIRLPOOL 63ad89fc1c3fdcf6cbeca2bb243dc841f292cac37cf80c2e27c14ab7e14ad1899b89b59b1e81def7f211995c4bffdfa2eb91ea892b91a5bd85149c7898ddf746
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild
new file mode 100644
index 000000000000..9c1fb0aca247
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Nextcloud themed desktop client"
+HOMEPAGE="https://github.com/nextcloud/client_theming"
+SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
+	https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	virtual/libiconv
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/owncloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/client_theming-${PV}
+
+src_unpack() {
+	default
+
+	rmdir "${S}"/client || die
+	mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
+		|| die
+}
+
+src_prepare() {
+	CMAKE_USE_DIR="${S}"/client
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
+	# Fix icon name
+	sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
+		-i client/mirall.desktop.in || die
+
+	if ! use nautilus; then
+		pushd client/shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_WITH_QT4=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+		-DOEM_THEME_DIR="${S}"/nextcloudtheme
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index a850666a210a..0a4930f3de86 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -29,7 +29,7 @@ DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 SHA256 11060be996b291b8d78de698c68a
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 SHA256 fd877cf084d4eb682c503b6e5f363b0564da2b50561367558a50ab239adf4017 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974 WHIRLPOOL 8410dc9dad24d8b3065ba85e7a7a66322b4d37eac0ef68e72143afa3aba2706e91c324798236b9d3e320e6903d27a7e426621bde92ded89ce26a16535e8c3d3c
 EBUILD openssh-7.5_p1-r1.ebuild 11026 SHA256 4454081691292f2bc218292e09724693fb1b9fc54e65d31042a93bf329728a96 SHA512 2441bff83bba61ead49ce69f7682d6ff9e6629eebc7dd9208da86043c07519a4ee1b9639b5ab22b04298b214ef8ccf94149269d3980d5d48ed01bfde409e015d WHIRLPOOL a0e20cbbe1899a18697e64f33c2bf8d4f9ae51c777032d2f994eda31dc70ac6c0a66c65a9fc46783419656554ac6098b32bb27132becb284c8ccfbdc36e44aff
 EBUILD openssh-7.5_p1-r2.ebuild 10966 SHA256 9aa4c233f5832ae36ea3c793828d240577f37ae96b28d3cf60c62df51623e15d SHA512 a461598a75ecb04c04c1c7e7bac216bb8a0e47ea493e8ce95d1545e96f9d0109cfd63b8be3845f31ba53b6d54e2ca99a9416c94ac9428c51666475a0ae65d3ef WHIRLPOOL a97c29508e3359d1d26d7c6f470fd96194e55fa4564e6692153385d839c5f64d37788026ba6123d8350615a515246404ef691ab6bcf079fe1e3ac8d6b05bfde3
-EBUILD openssh-7.5_p1-r3.ebuild 11020 SHA256 4b5b197384608884ea260117e77aea551b4358543aaff110c6ca667491933c0e SHA512 4eb8a416abdfe2565b444581a5c8daa3a186cc1c0902183b9d57339d27fad3efed3d81a040cc36f625eb2869b44d94569536dda5565d880e41a2bcb1bd74bd13 WHIRLPOOL da1e6a8522093185e79e4e9a61199ed42c78fecb19f442bbd6facec6dcaee4c7578ca1a5de1bbc35b8608a574612359d60be6fafd6a1fb888d6f61ffba11615b
+EBUILD openssh-7.5_p1-r3.ebuild 11016 SHA256 9465f59e4061fb9f89515fc4f04eac2cbf61b2771827cdb449466096792c27ba SHA512 24ecb1b0e8b81909ae3a24ee16ae6ace008beafa4b1d66c854e12f576ca40dc6033dbab3b7ec34ee81cef6ae8eda049380dc6dd593a8ac71e472bd1cee70cd52 WHIRLPOOL 4121c2e02d6f6cd05eceeb3f7a35448124f48765febcc96358e91abd32ce8bcda5626a96f3ee9e738921e279c2ed483e789c93683acd4b3b86b3ea211719bc7e
 EBUILD openssh-7.6_p1-r1.ebuild 11178 SHA256 1ad539dbf506ce51952326cd2856475caf99ff3fdfca391925f260a8f637d3f8 SHA512 104338ec2dc27e632a47117684805abc0a65c549bed4d7cc45e33a3f3875b7650b241b8c92956498e4d2e2ec170f96e731c392bcf4c67a35810daa691b00f70f WHIRLPOOL 77c184f0803ba6b5b44f8b9b28573b1374fdeddc0a02e46b6ef612529d3fad1e8e205b33f45788820bf8cb03e5558da432c657b001d945d30ddac00da63d1f90
 EBUILD openssh-7.6_p1.ebuild 11177 SHA256 3df0b2d33d7d4b672edf0e2d681b7796709b2731ba6d7b757e34d725ca9b20b7 SHA512 1c8703088b8c16db32f46f6794d182cb37e7da86fa4baa5a2f74cf4ed8240fbac8710be08086f8ada096d4cfa831910205b64c5dd502b7a3edd98784f6fe1aad WHIRLPOOL b04012a4430e2ab1a58947edf2ad23cfbf91fcbea0233d8a501d0286b65aa53b58586487747b859ec37b6c993539e416ffb8bbe5ea73e6f5e78a932b7ca8c5ad
 MISC ChangeLog 25370 SHA256 ad091426a190d89906e9f866e3f9545599b156b39e4b0feeb4f862997faab147 SHA512 cff2020279e7738e82fd0202b0e6de74c837d64a95f931c5ba159a8cc557f596d4b750c1527b96b9a74a8ec16bdaf0ed51457d074046f8049fdf262599394644 WHIRLPOOL ddb4f6ea4aa8051dac3da94bd4ffd94168d4e2cf2030de7841f10384c17f2e803847ccb6777c92ea5e48ce9b65d0bb5d9c77d04aa8e34fcc8fd5cfce04d8e304
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
index f4089727b01a..7ec593e326e0 100644
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index eacf30e03f3f..e4e0c73aeab0 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,9 @@
 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
+DIST owncloudclient-2.3.4.tar.xz 33796736 SHA256 89409e68f8290930088c5ed1da483a1c1b56d45695ac9192e81a2d71690df1ba SHA512 2a66182c1f679f4bb6d13c8b21d280dd6b530b8ef82e71a4fa0fecfed9a3f1a55f181ae3d96b24ff040a6f3c0b12777df035ee951264186ad3409e66da05b87b WHIRLPOOL 0f28e0585a625b346778a4965801ef075d051226efa922cfeea7274be77af354af966b938b52683620aa8bc5588dee6670fda24eb8ee1c6af461fdfdbf752420
 EBUILD owncloud-client-2.3.2-r2.ebuild 2091 SHA256 3b5a3cc722a96070fe3faacbeabd0a31cc42c3f72fc6934b5f272c87512be178 SHA512 2932984e45006b625032674bf5d38d2b3f8decdd70f6c3a307492fc9cafbdf197b03388189d25c7fb848fa019470aa7cd5d65957a01b8ffd0ece20b0c88b5d00 WHIRLPOOL 4b8e9aca566c775046052f9c6bded020965b367fbbc9a6c3ab86984833a1d49d39880dacaae30dcbcb26e5038208916a3f891f7a51dfa01bca28a2086c71154a
 EBUILD owncloud-client-2.3.3-r1.ebuild 2109 SHA256 c3edd1a597c3a1bcec1076b5aac6ef0471b7231698f65bbc0c4ee0ae873c5db4 SHA512 3723864eddf5fb24d52c778287ed68c5d8f262dd4358bfc484307af5267cfdcd0a89de2d2a48d8dd3cdecffb797a5fd190cd852cad0a372f55eaa0b02bc1b88a WHIRLPOOL 2fce84d49792c495e38a7bbed29726bd6eb7ea9e5d46f78fae1d92adef3e8a1e657338c3aed6858aea23e87b7a8432c2a7d1c11126d20da33529811931332ce4
+EBUILD owncloud-client-2.3.4.ebuild 2192 SHA256 94bd2a87c73347903269aef3ccbb9ec8a008ea4620df1740bba3136cf7647833 SHA512 dab8e6d7ee5d2f5dc529135ba0dbaaecbb0c0140da0f5e37974982baba44e78d69bfa61e2b22a2659c09cb7f042ce4fc48b3f912bb76b82c0198eaa068209522 WHIRLPOOL b19ddcbc07cadac4aed2a8b50c39750ca460fb9e917a5ac0795f2e5067a039ea8aed75cd4cfda50719f42940f1974fd86473152e56c510f51c0f2d365a6ddac1
 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.4.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
new file mode 100644
index 000000000000..ea90ebbbe5e6
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	virtual/libiconv
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DBUILD_WITH_QT4=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index e8fca5a82d93..e43d64cc3d56 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -10,7 +10,7 @@ DIST radvd-2.17.tar.gz 214937 SHA256 53757e7f2164899e1145482f1ae91829600a6e2f6fe
 EBUILD radvd-2.14.ebuild 1706 SHA256 ff8790adf9ad6c003fddd45f5768da6117d57d20d5226537b7590dd47a3539bb SHA512 8d0035cb5309556841e87769b6839ded82e0fa17b7664eb7a732c8cc31561ceb0482d2ffe687ff80fc65110e9e6ec6753152c99b9ab6a7722324734137b989b8 WHIRLPOOL 255cdaf68c303a684e8c27d6f05496ecec7a660d0ce847398109f8aa8c5ed57a49ce0f5a7360653ae6eb3ebcfb3e92f973b68d5ec43a1c9ebbb3b175cc203400
 EBUILD radvd-2.15-r1.ebuild 1611 SHA256 6065e220dbdc0696ecc939289e5c01429a3885ee04d62527b1f211a1286fc42a SHA512 e3308079562df0696c5832ae6e6d5b2d70ca7e11a0c618516493b46606e2cacca244b0d63673823cd1bc7508395b966c89e495783b65f2301b69d037a1ce90d7 WHIRLPOOL bad69e787779d9c0d56f957c2a025d807bc9838aa40c10b09b52e788acf954022639cfe4e293387a6369dfd87adfc0031da04501b325ca09aedd5a0be917c90b
 EBUILD radvd-2.16.ebuild 1703 SHA256 36fc006e7f000959908372facf37fb615c56b6c0bca310dcaf7c8c2b4928d8e7 SHA512 34806e03c4fbd9e0d319c7149e4b72b081436a1a97ff7bdb29c0f089cce0da947bb4c606e489718197505240e77625c7ad489afe6f7ac9fa12013fdaa0f13b6a WHIRLPOOL b5f70bf68359c7f70193d924a1930bb7865d9307760d8804478e57f0f6f4f27172d31ab2c2a72b5185594c19bbd292587849ad1246d07275d049457b8c37fefb
-EBUILD radvd-2.17-r1.ebuild 1580 SHA256 5c7544d2a25174b93575857db005d7cca16fce9732af7b0c1beb19b0bf2ba4cb SHA512 d8886d33ccd16206ccb4a9d33c9835ec06de4747389a202f0d663aaef6abde8334a538601849045c84ea11c1e2fe83c59ded070de85bbccfd5cc590910112aa6 WHIRLPOOL b2fd9518712d56693509cbf2b3a19ba84b480aedc2d55f858d4cd1e6c7e6fee57bac510b8d70f2e917f5b31765cf7faf5ec915e86939e9987c64dcdb8f8e2ae6
+EBUILD radvd-2.17-r1.ebuild 1578 SHA256 8022125d9c3e95e15139a3e0ed08bbf8697668abf7275150e994dd61313c57fc SHA512 d4eee12e1bdfc38b0c10fbafe236b9cb3e3eec959dedfb62228c2fe7089d69b6901a7032036c96d998027dad6ca78e5db94a23023b8e64a6ef695de033f0754a WHIRLPOOL 5fb1aff917cabd96c8904d2d35549de7be3fd8099a30415d487a0af2ae859f19d2b9d45602cfa8bd7bd8d5388a57dfb65ce7fc7177f0841f7534710616555a65
 EBUILD radvd-2.17.ebuild 1703 SHA256 36fc006e7f000959908372facf37fb615c56b6c0bca310dcaf7c8c2b4928d8e7 SHA512 34806e03c4fbd9e0d319c7149e4b72b081436a1a97ff7bdb29c0f089cce0da947bb4c606e489718197505240e77625c7ad489afe6f7ac9fa12013fdaa0f13b6a WHIRLPOOL b5f70bf68359c7f70193d924a1930bb7865d9307760d8804478e57f0f6f4f27172d31ab2c2a72b5185594c19bbd292587849ad1246d07275d049457b8c37fefb
 MISC ChangeLog 6649 SHA256 07fc1f9fb14e7469c8e9381fecd3d3233223dddf1584199eec900ffdf6cb9dd8 SHA512 07921ed184f455c6fb2e188bccaee8a5db54a3141432e39661671b78010773132c04bd6053b58b2d815fbabfcb71acc422f0f63bc69fb9f2f3650b0503b04ac1 WHIRLPOOL e71a3982a8ece5a6a49edbc6792de8f07f84b33b0602c2ef54a7aa3c8df6eb156fe0f2f3fec0fe3890ee8035eee242e1b5d7ac7a9807568233fc4a705acd380f
 MISC ChangeLog-2015 17563 SHA256 80c549ebab66ad96ad575cd79b43ffb286d1f3bec0434f97b53c9cc1aa07b131 SHA512 c8960da10a1d6baaec4218b5c01fcc2a1abf5377afdfd9a22256b9039676bb5bf5b04ec7bd9075f6205722627f0be54af36be0bb65ad53e7808ad882dcbb5b27 WHIRLPOOL 5de9a9c7c5ccd5982f83c1257b097d8a3196424ef26f6eb28c3c38c9ec218deb6b9daccad0881c6d4572ec491c74a869d608a31438fbfa0b7e5916d0281177a2
diff --git a/net-misc/radvd/radvd-2.17-r1.ebuild b/net-misc/radvd/radvd-2.17-r1.ebuild
index 6027a80445ad..5e240ace24c3 100644
--- a/net-misc/radvd/radvd-2.17-r1.ebuild
+++ b/net-misc/radvd/radvd-2.17-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ppc sparc ~x86 ~x86-fbsd"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 2715c9d1d620..75e8aed72ad7 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -6,7 +6,7 @@ AUX rsyncd.logrotate 105 SHA256 eb54100686a253d4d14c9c67fcc20f92d88c0616692bffea
 AUX rsyncd.service 206 SHA256 e4396236f554cb57eed133370dd74ff79ea495f5d7535734bc736b716931fb00 SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 WHIRLPOOL 7ea8a774c4b22cc631b86f54ca6bf5e1dabe5d837072b491eb2638e44afd67dc57e7372fbbf26a6214417c7da32521a48c0fddfafb4c9a4249fc35d1271c8651
 AUX rsyncd.xinetd-3.0.9-r1 194 SHA256 17162f014242c9d5003578bed44b89cd2dc4f0ce2a200ac1facaa10a9aac8692 SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 WHIRLPOOL 733f734e70d0c74ab6e472e656b8c83ddf816dca7e6c1130b999c2579713740db9362e5d517d0a8cf792b6859fd16d363f43ea8b531388f7abe93dcc1380ae42
 DIST rsync-3.1.2.tar.gz 892724 SHA256 ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b WHIRLPOOL ba793bfc7f0bdd70dba812a4a782c6ed703c7e83e2d04ca714e67e6153b31f6fc49e224ef7622bf5abb1e0ba0f633bc88b2640548028944b5dfa0443ae8c585e
-EBUILD rsync-3.1.2-r1.ebuild 2872 SHA256 e82a575fa31c0214d6eabe5e9bd10b6195342b258f70ee1ef3ad5ca6338ae2a0 SHA512 6f6f7de803038521861f3a85e65826065b4c5d223d1c49c8b4fd377d3ad17a1ea0221024a87ef51cd626f785d0053ded79fdaf4a427a667deef466637d29c809 WHIRLPOOL d141b470cf491c15e737cbb4b3d1f44300726d0c3925578ebef9e872e221a7999233b8b7acb2af8e11422a382914ff985e5f6fbcc3af9a8844802f846096542b
+EBUILD rsync-3.1.2-r1.ebuild 2870 SHA256 292f84b17a223dacccc58afae796e3c5b1421d92ad61d781eff88704fcd0fe54 SHA512 b4b38c4cd2642c4f62995964af115a5a7b5f89cf3eef102b88d42101eb3aeba5c79aec1c826f483f08ca5d52dcbb4c54dac8308f3e8a067934b575eb7796e829 WHIRLPOOL b30950a5c7e610aa12c4d8ff4b0ab8f94893df631747006802eab726c9bdd33fde80778fc56cd5daa0409957b5dade4f104206307c6ee1e342194a60548d2e6e
 EBUILD rsync-3.1.2.ebuild 2840 SHA256 c451d5a2ab8edf560c8dec38ca4e0ae8ca50ffc4a7778063865c7319c9c4db06 SHA512 2f0998787e96cfbb29398923998905fc029520a1352ae4420561471f8342e3876e0ed9dec935d4d5677bed2693aa6aa810b7f713914633ba97676a2dfa1edcb1 WHIRLPOOL b79f5f27f437e08510015467e53cca343fd9f1a5b14ca486961e0bd5ecac42e7615a3ba7ec46e39222725c36e0c6493dd270ac2be348c2215a044e045686c6d5
 MISC ChangeLog 5878 SHA256 f0322d72d76c1694bf9cedea6aa1974632fa923e96796866105f4675f4807814 SHA512 2867072a12b3ccbaac4541752f35b6377f42e981d5ae683da10c94107b58440787a28a593d81e8c6b3c4f77620d1c28ffe2888a98ec6753cf606d9a4cdd4d836 WHIRLPOOL 54c25e67f2f3dea9bbbacd805a9078e604ec5576bd690554a1b162a2315deeb5efdb2453d98efc5a073424df736be193cbaaba268aa7467172a2afe5fecc2f33
 MISC ChangeLog-2015 33945 SHA256 e9e1a4a05400f058f5bb7f33eee548ab322dff34570082ac63f0c32f349aada8 SHA512 57cd87723516841f3e87f0d88a9b73d0920e7a65f7a35816cfa568a9f54844224664c94acfb27faa7295c0aacda9a6a1d7131372918c40cead089c28290339b9 WHIRLPOOL 1cb3950f7deb2ff2c9c86968922ce6852ad0f75a36d2a284090bc82f1f014b01b9813e5bc3e93c1f1e55848e2de1ffa251b6f1cafb2bb03242678d6fbb1fb673
diff --git a/net-misc/rsync/rsync-3.1.2-r1.ebuild b/net-misc/rsync/rsync-3.1.2-r1.ebuild
index 9b1ff6e123fd..c8989ef7a83c 100644
--- a/net-misc/rsync/rsync-3.1.2-r1.ebuild
+++ b/net-misc/rsync/rsync-3.1.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 if [[ ${PV} != *_pre ]] ; then
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="acl examples iconv ipv6 static stunnel xattr"
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 3d2c6d657f7b..81a8b14e8628 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,9 +1,9 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.10.29.tar.gz 2831813 SHA256 8fe003472048113ed6fcc422cc48cc76a49cfdd12f189b832c40a2cc44e452f9 SHA512 50781f792fa01ad64b6f7b6fc05730dff09b10007ef5c23ee558148affb2a126958bd5ed8d1ac4499ddc48a56a5b9df47f20612ae09f41084e6dbac5fc3f3426 WHIRLPOOL 1393943e90c096feaf0d7902408a965ae4fac961cb6cab1bc3f77a1d75478d91e5a0da5a72a3da71c09c44b05778e5b5481a44bd1494112dfe3ec5af3de5f78d
 DIST youtube-dl-2017.11.06.tar.gz 2831531 SHA256 6d0c0226a1e914c94a9a68e8bff5a6498bdf783ffb9513ecf18646139c1e58b6 SHA512 0f7707084f84e7375ae61ffa88979990ba27cf2afb44992d75172415190f5959fe317313b127cbdde33500ed6b0525e9ff03872116dfa7ca188a97e74d562574 WHIRLPOOL a077a96023aec039e74380f91c34c59208cae3e2e06635003547bf8ed7fbb80756bdc73fac7b5607449b9740ea61ce2f1185d2adc738ccd7f6cbfbc32fe9b4ad
+DIST youtube-dl-2017.11.15.tar.gz 2834012 SHA256 88b177baaad0ceafc496bbef790c24b35272cbd9527e2b64f536131aad040ce8 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96 WHIRLPOOL a9d82b0881c91ed410cb57c14a80417e1791a44a51e2a59f14b039ca8bed25715b8de5e70b4434d5b0e87ebbde9b17399e04cf468e878a14b09e3729f239f66f
 EBUILD youtube-dl-2017.03.16.ebuild 2381 SHA256 9503230e2716a18498b74f5047095216fa36cdf4801cc6446e6f2075fa5cde50 SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862 WHIRLPOOL ded7fa74a8649db1cc5c16eb98ab557853d264bcc458429374b0bbb29773f993a8621285bcfcbe243cf3892d982f91ff5278c45cb0e50b824b156a0a57786911
-EBUILD youtube-dl-2017.10.29.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-2017.11.06.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
+EBUILD youtube-dl-2017.11.15.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.10.29.ebuild b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
index 975ce26c347e..975ce26c347e 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.10.29.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild