Version bump, with nautilus integration

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

4 files changed, 113 insertions, 6 deletions

diff --git a/net-misc/owncloud-client/ChangeLog b/net-misc/owncloud-client/ChangeLog
index 455d545a1e59..108bbb1a3932 100644
--- a/net-misc/owncloud-client/ChangeLog
+++ b/net-misc/owncloud-client/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2014/10/27 09:07:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/ChangeLog,v 1.19 2014/11/12 13:58:39 voyageur Exp $
+
+*owncloud-client-1.7.0 (12 Nov 2014)
+
+  12 Nov 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  +owncloud-client-1.7.0.ebuild, metadata.xml:
+  Version bump, with nautilus integration
 
 *owncloud-client-1.6.4 (27 Oct 2014)
 
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 325943460dda..02d203e4961c 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -6,16 +6,18 @@ DIST mirall-1.6.1.tar.bz2 8630925 SHA256 3b6a013db097479ff3c3682aa40d2abef3f3ab8
 DIST mirall-1.6.2.tar.bz2 8632229 SHA256 853bb5440f72b662dfc4fc381987a77cbd273a15cbf53ba26ca1211bcf11a063 SHA512 0cf6c55f480b2212339cd18085a65b33d915b489b1beaae4d41a5f58e0b953e583578700c40536ac16bb2ba900118a392cdebd8958841cb4f9ff4e025ada19b2 WHIRLPOOL 4ba59d7c9e3775d96c5b9f73677c5276b7a3e72c7f9b7ff22a52ed7a7d68af3f7068c35b52eb682a59628620ac103af4be598b8f0d64c1e295b21602f71efca7
 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
 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
-MISC ChangeLog 8292 SHA256 67705e8121e44c9484fdf86a1f3eeaf6233c7e57d78d4dc41379fd36b921e4fe SHA512 22ae9339c7c6f464b0d945c6c6aaa8174bbd7899a3bd37c132dbff843e39f0871ec159615d95d7377915929c222cb2f429cc2e00f363fcc7a3773a9cb5055f19 WHIRLPOOL 54198823e756c6525e5caf95d096ed1988e2ba061bc128cbf8dd754b707c954e51f7b9348814c0f293662cae87cc1149b3d0fca911601d9a4137b6b65be56a91
-MISC metadata.xml 340 SHA256 c5c40a72df05ec9d8dfc3ecb271645226480e30f635847dfa0192fdf868104b8 SHA512 ca9a12a90e3d0a254a64c64529bd66bc427afb8161685b2dedcc433aec208a5c6b68bd501cdfddf137171ff90d57e8a416815f562ec5fee9bf466e389815dd08 WHIRLPOOL baab644f7192bb71a79fc60d12766c196169863686da3c9a3fd388d079798bb7e8bb55fb956899b27f431ac741fbfecdf11bf17b3aa9184b555cb1fafc639db7
+EBUILD owncloud-client-1.7.0.ebuild 2393 SHA256 08dd3e0be932b6f0499fe60428acd082b780dabaf35d79be49df13feea736611 SHA512 ed4eacf5b24ca298c019278d4f2054b0fac11c9d12c3a1356bc7e173f63f9eb9ca19d9f2a3c33066e6f5128c66082852af20ece549d08e91c6e1fce7fda5750d WHIRLPOOL b8e580d1246c3ec4e4b1ab4f7e8bce0919e415c1a6f2829166cd2e26b03a65f7d580f48fd29decbc257d44c0e48e43bfea1aac052d119423963e326777757986
+MISC ChangeLog 8475 SHA256 8d6928cdc7595d7b11c6e04debdb89588441d1a33a12c1f7fc7effdca5bb398c SHA512 79692c388f58c745a15b0aa0452f8f73c00045eb01fa577403245e16d17a1936474192686e66906063e66460d9db04108af3ccb74d3acfbf90cee768f75c4cc0 WHIRLPOOL e44397336fe6c2be4e20eddd3b052c61e5fb2a50cda88006c2c5ea692b4980e2591f0eda4e573d9858eafb4a8702fe401b01dc86bcac0a2519ab9876a7cc2284
+MISC metadata.xml 424 SHA256 054589e15da0e968baa1f7227c7e3cd602cfcf816097bba63818948672ee80d2 SHA512 f95180819ab60ada7609dff5e536f65c3e75a47a7ef1ca162b61d3e229e7ad12b854a3d7000b30eba067072db2c0b12f2b45a181e4885dc0553072462697c342 WHIRLPOOL 00b3c8f623cf2b6d301d866473e8cbe4fcd4871099ad5d5971cd0c18c5e004e0ffa8c2190657a6712ea55517cbc35a50dc01914a9af68dafd3449df10b960728
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlROC2IACgkQFYEBGcdFJfIrQgD/Smqk1+BMav1YNTH8n0Ne3XQw
-xPSwoImEPtUDAdCWhiEBAKcghS2sgPGDH4cigtByXav1CMAl/KJx0CCcON8UtYMR
-=Bcaa
+iF4EAREIAAYFAlRjZ5YACgkQFYEBGcdFJfLWMQD+KIVLwO2nhGj1y+oJ0NdrFCMW
+YbC5Ih7G48xMK0lFRpcA/2/qN0j1do9oakarXTp1kmqqUGdntBsSzs4jZD1gsNPH
+=2Utb
 -----END PGP SIGNATURE-----
diff --git a/net-misc/owncloud-client/metadata.xml b/net-misc/owncloud-client/metadata.xml
index f713f2a74b47..0242106b0192 100644
--- a/net-misc/owncloud-client/metadata.xml
+++ b/net-misc/owncloud-client/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<use>
+		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
 		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/owncloud-client/owncloud-client-1.7.0.ebuild b/net-misc/owncloud-client/owncloud-client-1.7.0.ebuild
new file mode 100644
index 000000000000..81d19d42d6d7
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-1.7.0.ebuild
@@ -0,0 +1,98 @@
+# 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.0.ebuild,v 1.1 2014/11/12 13:58:39 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/qttest: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/qtsql:5
+		dev-qt/qttest: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 )"
+
+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
+	if use nautilus ; then
+		elog "The XDG_RUNTIME_DIR environment variable must be set for the nautilus extension"
+		elog "Check https://github.com/owncloud/mirall/issues/2477 for more information"
+	fi
+}