gentoo resync : 19.10.2017

3 files changed, 2 insertions, 110 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 8ed2407740d6..9f6c12aa0e77 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,8 +1,5 @@
-DIST nextcloud-client-2.3.1.tar.gz 654810 SHA256 5fc6f9f981d68110982ab006cdf9d68caa0c59015e57f4491b9a705fb6c83dd6 SHA512 f8210c8cc08e0bfb80e63b18af305c2a8e2309f673caca5bc748c130d960d444ab2db3fad3e43dbfffbe072748c85e15a50d0ebe1fd491dec7553ac8d9552cfe WHIRLPOOL 5a38a708647758ddb54d7d47dd30a71e59b03c3c45e6cfd9ac218c013da9dfc56d07b247982056f58e083d82c138576679525d994665717c739cc9f5cdd0238b
 DIST nextcloud-client-2.3.2.tar.gz 671944 SHA256 fbebbcfc538654d7a5373062d2165638a9bd9e5dbe62b5f4552a942b0b931617 SHA512 0447a3e5ee3338cb98b9d503a94d32c926f9092a25fee11e3686e5d662362137dce09865350cdc3c9af62ac8a6ebfa7fcd00f817edbb10189512a6df8e587628 WHIRLPOOL f5bf0526ffad6eb12be7169f8b61b35be31e01b44bb5fee4ab03c5d3449e3e30496719cc4f84c587b62a0638d99a70fd2fa1723231f6f7fa9c7ba80d095daeec
-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
-EBUILD nextcloud-client-2.3.1-r2.ebuild 2474 SHA256 f5c397e9512b17f80b9b0466dba8294605290248046c69f8d85dca1fe37bffd6 SHA512 8cad340d97bee8bc20d3d49a8796ab0da92689487dbf5fb0e2d39a24df5cc599f807661b142650b3fd80bf23581e23fe3710f5b6a62711f3fe2f5eebd4ea49ba WHIRLPOOL 6f5365e1ce5245f0a2bdbfd30452bd4a39e382761e2d8131ec9492f11a4b807c29329131c108f0644b77e9aeda179b2f2cb2ccb674e7c7501cc2bf809ea707fd
-EBUILD nextcloud-client-2.3.2.ebuild 2492 SHA256 b8dbcae35054dcb20c939c644c7ef691c59b5a527167b4e8303201d15934cb7d SHA512 511bb30b06975fc585eaac6ad50581689997a9b9575aaf35dec607ed35211f43d207abfecd1c0eed1fae5bcffc037cdcc9c3b3bffd2a814d4a00d90785dd2fc6 WHIRLPOOL f00ca0209ef1f19e37c1cf1dda18c4f7b33dc090351393a96e0c0a744b2dc5ca8a08fb1abcb67ef1dd430af1aa1193a59d1c142b3c682bba353545a96b6812ce
+EBUILD nextcloud-client-2.3.2-r1.ebuild 2508 SHA256 861cb056714c91c79b3a1f692418c4f397dd854236114bb5637d47f5d8aaaa72 SHA512 563c8391302c808bdc1f513882be4e876533a1dba958c20f33a1fa76ed05375ef5e4d57e902a2c817335e18d226bbbff89ca05e20a5c7d7f6cb605861a17ca45 WHIRLPOOL 05731be35a47719611588f0d4979d883a73c4c4fa9b06514726b0863fdfbc2fd817fbc144765bc2e3419ce3476bef2d82d0479ebae6ccd997f1bfd19750a3292
 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.1-r2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild
deleted file mode 100644
index 01e8d34e1547..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-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
-	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-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
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild
index 67f8b9ea2be2..cdb6c39811b5 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild
@@ -24,6 +24,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-fs/inotify-tools
 	virtual/libiconv
 	dolphin? (