Version bump, improvements for timeout handling, as well as fixes for syncing multiple folders. Also fix nautilus extension when XDG_RUNTIME_DIR is not set

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

3 files changed, 111 insertions, 5 deletions

diff --git a/net-misc/owncloud-client/ChangeLog b/net-misc/owncloud-client/ChangeLog
index 13d710c984a1..c9ebb260a761 100644
--- a/net-misc/owncloud-client/ChangeLog
+++ b/net-misc/owncloud-client/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/owncloud-client
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/ChangeLog,v 1.20 2014/11/20 14:03:38 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/ChangeLog,v 1.21 2014/12/18 15:58:54 voyageur Exp $
+
+*owncloud-client-1.7.1 (18 Dec 2014)
+
+  18 Dec 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  +owncloud-client-1.7.1.ebuild:
+  Version bump, improvements for timeout handling, as well as fixes for syncing
+  multiple folders. Also fix nautilus extension when XDG_RUNTIME_DIR is not set
 
   20 Nov 2014; Bernard Cafarelli <voyageur@gentoo.org>
   owncloud-client-1.7.0.ebuild:
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index c3020f999ce9..f552b69790e4 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -7,17 +7,19 @@ DIST mirall-1.6.2.tar.bz2 8632229 SHA256 853bb5440f72b662dfc4fc381987a77cbd273a1
 DIST mirall-1.6.3.tar.bz2 8635406 SHA256 89e4488881a53956cdedab21d05eb61b2c00bb31a20286b72836e39a3126204b SHA512 80300a97fe937e85e9d695ec30f2c34ff991fb634669210255e2e17e867a202c396eb6d9c0cb6a1af633cb1c97394a21a6255ad8062d676e563c0faf5547c439 WHIRLPOOL 05dadd9dacde6c3acfb7062071bd5b308ba78271d83a1998c45da0440ccd06f97140feb1fb1f83f9092d57a0c6f941fb7c315ef38068e504bf90a584c005cc96
 DIST mirall-1.6.4.tar.bz2 8636203 SHA256 dda3329688c4525cf51cc409fe9ba701042b536d9fb4b3cb14a89f22dde0ae63 SHA512 e620802ac9de7d7308273507dd807a2171161074051e29e1b3aaff15063baef7dd62e5550c77c878da5dae9126906315fbdeef107f82c6b5b7f8750527ae88b9 WHIRLPOOL 94531b9865f877242a63dc1058c92a47e8b84abc0912c28a0655fe337733dc4639fcb80296d70be2047b92ee1c53d47ac440c269d7c18d35ac6294273c5a5801
 DIST mirall-1.7.0.tar.bz2 12634961 SHA256 b1cb0612e5022de263dc4c6309eba8207d694a40a80dae6762b4a56fa8d4d944 SHA512 f563720c4303138799d74d0d813fb77821cc2092e951409a69eee9bf03b78dd024d1e32430598b77a6d7f8d1614cf732cd1aada39259f3cea06670281bf6603f WHIRLPOOL 9076744aa072fb634294be8c47dcd6806ca4ae09d4a057422e074fc8d539da7d510bcbed4f3484acd26adb7c7ce6dff2c01b33fdf4585850d2d9ad1a98514f6c
+DIST mirall-1.7.1.tar.bz2 12668153 SHA256 ce1bc5784eb42d3f510c6d012d0ad86eefbab99f54f4e8653f546d2c4fda2f59 SHA512 fc9c690c0bf7c1e2577d472ee429e62a274c1e5ee92f6db8134c5539e11df64abcaeaf0cdd64b915247cd7ceb3b00522ef0dd0527e522f344719d12a86e98ea7 WHIRLPOOL 6ba577408910e688ac2924f3cc7579d551ae870ac2c377407fd5e96a3a86b19f571926a1a59583a53b7de04c01d5b712c530fb3886855806304b26020825e505
 EBUILD owncloud-client-1.6.1.ebuild 1988 SHA256 f9874faf3babd189168c29b3b56923a0da996ff3f371d3f093ed0b1689b22ddd SHA512 69e9c76a1a51d5e9ba84918fcff9576ff3532c044607011b18dab41b813a0df62af482fd4c5405be75026431577c87f0c10601ee65cb7d82a47b2835fae165a4 WHIRLPOOL 5a5f2f49351dbee757ad1bad1a9750b9d6819783682dd7db13b356307b297b99ce4ebd89b506356aa6399abe18345b929059eb89933d0330f0909311bec138d3
 EBUILD owncloud-client-1.6.2.ebuild 1988 SHA256 a128cccbfd5ae06e30a55e537ea20e0e4f4dd02c59d8a1a848b69a66ff85e881 SHA512 92388679bc58363d218347da587fc7fd21452fb4783932bfd7c2cdc027958d1374c3ea2a247cd73d43347bf187dd3cb32924cabb5bd9dd34517af9f4f84f9ec9 WHIRLPOOL 3d7c354b1c31826f48878c245bca65dce47a9c36d259f99348b008ea46841ef245a397aec5032a42432bf6399be7f8424096f8a3a4aedb401443887897aa62d7
 EBUILD owncloud-client-1.6.3.ebuild 1921 SHA256 b16f5b6127324795635b52cbaba0aee65ef9d592f58b3d1819a0ee6f801499e4 SHA512 b78c3baf5c8b788565d819a680a15565b3f6c23e902ae5132405e32860138b5d127772e61cfe3f859b8a64abe236ba8d0f5804824079d087105705a43b44a2db WHIRLPOOL 87aba562a6c74fb1d32ceb2b1d0f19252546c3c71750a73dc4a7fa0645c2ec70947b8258206dfa574d7d10248ae7e060ef0d8af951c0134465c319175ee27381
 EBUILD owncloud-client-1.6.4.ebuild 1919 SHA256 4b70189fff8862157d3e6197be2156dd54a60843fdb0bdc08df4eb0d1141f7b6 SHA512 c208c34afacc85a951d277ea029047d2c64496862b959a01cb910581d1a02e0b19dee211e36af6b4e430b30519867df79ea011dc79d350092bf8dcb4716f2ccc WHIRLPOOL 31b1a3ff582e323fec6a3ece041104dbc778cb987d77633dbcca641d4816943b6d25560b9ee5c5aa6d5ad91a3f0abfd67bdcff220d0f464597ab33bcb3473a6f
 EBUILD owncloud-client-1.7.0.ebuild 2441 SHA256 a13374dab4fbb51cadca564fd0b6588a73cc6d64958df77839dd536f2d05112f SHA512 381e4a667fa2a75f761bfd9c820258aa7bba9914858a3bb02e65f96c0b80096126667d7e61203e53e3793ff7a3202e782dd9e4127688383107dac1dde5d56625 WHIRLPOOL 4c2356f53af7da64b10eecba417e3077900a6681bfef29747bbd5438ee82812a8eae696c5bad628403e1541c332d9413761d224bda29014889f0c7a789556c84
-MISC ChangeLog 8655 SHA256 3c4c45ddb53631936e01c1cb5bd9cb0c67113e16fcf11f32c546a2210d166a24 SHA512 28723b7c2765ab2e47db0e63563d8fa57edbd9a3042bbcd09363c9a2b385d96d34c6a94f671df701b95d4743122fa77f065c6915a883e73fd790464f4f362ac2 WHIRLPOOL 1d01ea3ed9edc4199c72736e2ec90f2e1708238215b9cf6b4d9611a7e89246ea912d43a460392b5d2fc8d48eb306059c1cb15b0bd3c5052128cc94a54907f54c
+EBUILD owncloud-client-1.7.1.ebuild 2241 SHA256 4f2a03d1ed2037a364336473d1f1fc6fce1daecc2b27fdbe55ced011dc6303e7 SHA512 bfefe213157f568f02a12aec68cbdca8e15dc22328461515aef6c24ff0273905085bc0345aee2099d2fa54f6a2a6cb5098170a2f99d3182131b7b14608f90bf2 WHIRLPOOL 88146b8712feaecc0e60240fb1bc69bd915fc98d57b340ca8c2d6e0938f929524f3d42418098c3c6ec7815b55e3fc52c8f20339e4493c7533f52455d008629a4
+MISC ChangeLog 8942 SHA256 d5abb8d572545e9f85c88c4d9b79218c48fdf6c29f0efe59bc5f1ca83cd921e2 SHA512 e3b1530c57e0715414ef91619fde0f6d44691c64a496ec49ed211c616a4bd0bdc1617959d44ac297b7b82e0a6530ef00bd7467a11537f5cf329e1c399c76dc37 WHIRLPOOL 35d530c63b4e2d78f847fd409e21c7d8a4af352c96d7bb077890a208eda7eceab7aabe547f1dfb0d15560205124d98f6b69a5b52a7ae019a834d329ce6724b2a
 MISC metadata.xml 424 SHA256 054589e15da0e968baa1f7227c7e3cd602cfcf816097bba63818948672ee80d2 SHA512 f95180819ab60ada7609dff5e536f65c3e75a47a7ef1ca162b61d3e229e7ad12b854a3d7000b30eba067072db2c0b12f2b45a181e4885dc0553072462697c342 WHIRLPOOL 00b3c8f623cf2b6d301d866473e8cbe4fcd4871099ad5d5971cd0c18c5e004e0ffa8c2190657a6712ea55517cbc35a50dc01914a9af68dafd3449df10b960728
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRt9MAACgkQFYEBGcdFJfL9TQEAj6MHjyLJlZ4HAUO9sOJf1XbA
-yOSy9UuAAEcK0dL5Wg8A/iJMa+Izrp/nbZKNKj1TsU2LV4YAaM2eE7m49TiywDQt
-=DhpK
+iF4EAREIAAYFAlSS+dAACgkQFYEBGcdFJfLtMgD/XIsmxuYSZyL6Fp4nza4mYqcM
+L/0eQ6dJPsitaNm3W5kA/AlVZK+DX03rzvYDIn5WIJw3I1jLthmUmQaJO6Sbr1MD
+=zstY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/owncloud-client/owncloud-client-1.7.1.ebuild b/net-misc/owncloud-client/owncloud-client-1.7.1.ebuild
new file mode 100644
index 000000000000..cd196983bf4d
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-1.7.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/owncloud-client-1.7.1.ebuild,v 1.1 2014/12/18 15:58:54 voyageur Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_P="mirall-${PV/_/}"
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${MY_P}.tar.bz2"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc nautilus samba +sftp test +qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND=">=dev-db/sqlite-3.4:3
+	net-libs/neon[ssl]
+	sys-fs/inotify-tools
+	virtual/libiconv
+	nautilus? ( dev-python/nautilus-python )
+	qt4? (
+		dev-libs/qtkeychain[qt4]
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4
+		dev-qt/qtwebkit:4
+	)
+	qt5? (
+		dev-libs/qtkeychain[qt5]
+		dev-qt/linguist-tools:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtquickcontrols:5
+		dev-qt/qtsql:5
+		dev-qt/qtwebkit:5[printsupport]
+	)
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	!net-misc/ocsync"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-util/cmocka
+		qt4? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.h || die "sed failed"
+
+	use nautilus || sed -i -e "s/add_subdirectory(nautilus)//" \
+		shell_integration/CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		$(cmake-utils_use_with doc DOC)
+		$(cmake-utils_use test UNIT_TESTING)
+		$(cmake-utils_use_find_package samba Libsmbclient)
+		$(cmake-utils_use_find_package sftp LibSSH)
+		$(cmake-utils_use_build qt4 WITH_QT4)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# 1 test needs an existing ${HOME}/.config directory
+	mkdir "${T}"/.config
+	export HOME="${T}"
+	cmake-utils_src_test
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}