gentoo resync : 19.10.2017

4 files changed, 4 insertions, 93 deletions

diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 47dfeaa5048b..eacf30e03f3f 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,9 +1,7 @@
-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 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
+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
 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
deleted file mode 100644
index 819a6751f1ca..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-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 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/qtwebkit: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 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-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}/${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)
-		-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
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild
index 26efb0fcf18f..6c54b7309917 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild
@@ -23,6 +23,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-fs/inotify-tools
 	virtual/libiconv
 	dolphin? (
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.3-r1.ebuild
index 4bce7edfa29f..4652bd7a7a88 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.3.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.3.3-r1.ebuild
@@ -23,6 +23,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-fs/inotify-tools
 	virtual/libiconv
 	dolphin? (