Fix man pages installation path, thanks Ian Abbott <ian@abbott.org> in bug #507058. Also drop asciidoc dependency, sphinx is the only generator now

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

4 files changed, 92 insertions, 5 deletions

diff --git a/net-misc/owncloud-client/ChangeLog b/net-misc/owncloud-client/ChangeLog
index bec875cc3f23..081558e9b2a4 100644
--- a/net-misc/owncloud-client/ChangeLog
+++ b/net-misc/owncloud-client/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2014/03/17 11:01:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/ChangeLog,v 1.8 2014/04/16 11:33:49 voyageur Exp $
+
+*owncloud-client-1.5.3-r1 (16 Apr 2014)
+
+  16 Apr 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  +owncloud-client-1.5.3-r1.ebuild,
+  +files/owncloud-client-1.5.3-man-page-location-fix.patch:
+  Fix man pages installation path, thanks Ian Abbott <ian@abbott.org> in bug
+  #507058. Also drop asciidoc dependency, sphinx is the only generator now
 
   17 Mar 2014; Bernard Cafarelli <voyageur@gentoo.org>
   owncloud-client-1.5.1.ebuild, owncloud-client-1.5.2.ebuild,
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index f0212e4085f3..f09dfe48c06f 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX owncloud-client-1.5.3-man-page-location-fix.patch 733 SHA256 df564b7b95d1496ab5ecfd26a6d94089e00a83bd67f1d2f47e07e0cf85d913fe SHA512 ca04920a63006df1d5ec784ab1d2e51b7c3d57463f0a543fbd81e32213d012b564ba09211ae20aba5ba5ae25d46f7ac0e2979764c263e66de14311bdc5b7c4c0 WHIRLPOOL 32ed5321f148d16083d0a9676930ed05892525f33fbb305100e6a30aca9076aa2cd9391808890890dfffe54e88849d374555e175942cae245e08afa0ce1023eb
 DIST mirall-1.5.0.tar.bz2 1318514 SHA256 64532680da1c452b7b591550d07f25b554283ec65d448d41366ea2105b959a18 SHA512 63fddfe62260a1ab52bebf64020cb2e70ba8e4f77d80a544fa2a087c95df7981b19e9527df50b8882e4b68e242204383a7ca5d70d1d6a1a00f55cbc10efa6e58 WHIRLPOOL ac62f6bada0c8b4f7d32e63ac71b1656fde2e4b1888a389568d37da006f9470cab60248f81a4d63016506f5ef81365c3c49821fe5128463f228e6269ae4a943b
 DIST mirall-1.5.1.tar.bz2 7824645 SHA256 79c41f8c72c994ab803b7053a1c7e0a46bbd20c25c1eed900e1c98433745daee SHA512 8a86c60150bb32fad2e2eb15ee791e8ed093223fef1f2e9315c18f3bf6dcc8cafe8c2fb7d551877536e9da979e8b8f9dd5eda881db5c5db3f45286d42edfbdfa WHIRLPOOL 978f78daad81610ead4f28f7bc8e9f32aae99012419fcb46f80fdb34940007c9e4e7bf0cb4a25b4aed83d56bf22f639e1ab472e26e93675336dfb36fb4e8aa55
 DIST mirall-1.5.2.tar.bz2 7838700 SHA256 04bc20438873b7f17168ef277fd0221e64d0fd0f954236a02bc28f62297cdfa4 SHA512 456cd9be09470565ec9be6ca557563d1c089ca76a13105eec34ef6884134e5c0bf52bd284994088a62175c23c3b068e9e52f9fff144fd05d2c6482cdd2727e11 WHIRLPOOL 71038d82414bea8964ff202f295831957322cb657e18a7142954c78aa34d006a02525f31d0165eee422c942daeff519c1d94a0b79c54bfd5c94c35c310b53285
@@ -8,13 +9,14 @@ DIST mirall-1.5.3.tar.bz2 7841424 SHA256 a50f235eba7a24915e583c3c5bb68ccd8617129
 EBUILD owncloud-client-1.5.0.ebuild 1380 SHA256 197030670977c4ae33c11fe668241b50d835ff80efe569f4c065f6cd06208e53 SHA512 a7f7556ef1fd191b1da2a5ce335b559cbb027ea819c20475d23098dbf268ec835d97490200039c2f4bfa5ae044ad89f67fe5c1ca20628f54423376188b08befc WHIRLPOOL 316ef39fc5adc6f7f5a376d618b9d7646bba93072786a1995830cbd870b9f5b827405406cd5aba97f4b487d5c69ccd98cf109b1f8dfe00f0c891ccb9535a4d24
 EBUILD owncloud-client-1.5.1.ebuild 1507 SHA256 f19e88480a62d9f73fe781ada8c5f9aecf06b3e4eb7f0dd610003f04257d275a SHA512 a9d86468b9796a29563cd4a3b1b4b12804360379088b263fde494057de21a52ffbcd1bdd22698d0b25398f76ddc3742dfe793798be5da474785e173b1f49ec05 WHIRLPOOL 566a3af1d16532590ce2d0aabda022a2c0174d2989df9d0ad233a58695e547f500fa21a562001e104944045cb1dfae305dc1a2f4d0fbc839325dbef81ffa5fe2
 EBUILD owncloud-client-1.5.2.ebuild 1507 SHA256 5fd83df7455bb677eb9acc1453d593e5c9f813a9451c3ae435c233a56a2636d2 SHA512 f3c4d8be91d9f544bc371e88bc05ba57d98ca9e4e370c946b382ef71d7d9e08d0ce383423db7bf61fee64a7291ba5bc85435b44516c1d945031062ab3a9eda03 WHIRLPOOL 3c6477fe90cc4e0648299469cb0a86be994aff9cf2b7a37173b1539890ab06687d31d67410d24ab60f181ce366cebaefc2ee83906b1e26aab0a8b1fabc6d36d2
+EBUILD owncloud-client-1.5.3-r1.ebuild 1551 SHA256 95b46a1ec87b1515419eb137862929a193d782c20ed0860f772ff9cdfc2794b6 SHA512 45254c38ddf6e71085001997b4114365b27c82f91583c72fe7743f007c3e460d918630efbf222f35b899008d6a416d2714d92dadfb1fa49659022d4e4e08a506 WHIRLPOOL ce255aec376ce64245f592df846a6c12df6a5a0eb563fc0b9872210e7139d9f93d897ed0b1e6fb486f1325d6c11d26efdf5238313c93b8879512d931e820a531
 EBUILD owncloud-client-1.5.3.ebuild 1507 SHA256 2b3d19371f25780a64b938ef94e1391cd9fc5c35f849f8b7b9f588ca21172297 SHA512 9f856dcd91716653a72516fcf658adcc1bc082e9f66b48ad49aed4045b4d7dc478931a9634c93e346e164b2dcc69e3292699a38e05e129664cee46938cdb6b15 WHIRLPOOL 171b05e00c3d15048f62b17562c82b9fa5a6323a3f764877b85ca7755f08f0e520c265dbeaaa623243ec1a70473ac09d75dffb44cd2a139f6432614f6f70df56
-MISC ChangeLog 6017 SHA256 7b61f757750c63d53822715e1664c77fc546f256105a6f338c3d2621255376a0 SHA512 2e4da8ee3673be2866ba1bc60e1239d0b4f9d07f36c1de953d653accf40e4a5c11cf38124bbaaeeb6263b86093adaae380dfbd454cb6bebca44a0a121d632315 WHIRLPOOL e1dd4f9ce28c3ef84624c95e1e470b3f666740da7371d1d0bd115a5c5316ec7cc16817e13ac9f50f0314bd23292a3b756ac233376ff5f667b1c69cebed3789e2
+MISC ChangeLog 6362 SHA256 815e4bb1badbdcd337325ce8b966cf45a27667f191a4512f5afbcaeb5214b20a SHA512 9c283096ead559ce041984f1a04a65288fdca9e0904546b79552b0301b4eefa9cd61b9b1536f8404dcdabfe215895e4366091fd057c272f0aca7b3d5e50386f7 WHIRLPOOL 1bac8fde84ea27d81dd91ab0e01e3a172ea58613b9d88936341d179d21cdcc7a661061097d6804b320e4f31ac55e3b448e2b12250a200c57f5fdef9c12ab05f7
 MISC metadata.xml 340 SHA256 c5c40a72df05ec9d8dfc3ecb271645226480e30f635847dfa0192fdf868104b8 SHA512 ca9a12a90e3d0a254a64c64529bd66bc427afb8161685b2dedcc433aec208a5c6b68bd501cdfddf137171ff90d57e8a416815f562ec5fee9bf466e389815dd08 WHIRLPOOL baab644f7192bb71a79fc60d12766c196169863686da3c9a3fd388d079798bb7e8bb55fb956899b27f431ac741fbfecdf11bf17b3aa9184b555cb1fafc639db7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMm1fQACgkQFYEBGcdFJfKxvgD+LGYEVebDEgnSpX8XX6VqHTrZ
-EwkHsyAraQL6km6GjK8A/3yG5k0cXK6ZlreCvnnQF8f1umUIs36vvaDIPx+LBr6C
-=xDWi
+iF4EAREIAAYFAlNOaqIACgkQFYEBGcdFJfIMWgD+OPUx8vNy0GUb87HzjlTw5guV
+ZL6Joh9QkTAeyv5unYUA/AubiPSLv/CohHSILLjoy2f5ZHZBa6xPkMT3tHSoxPPV
+=Eblw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/owncloud-client/files/owncloud-client-1.5.3-man-page-location-fix.patch b/net-misc/owncloud-client/files/owncloud-client-1.5.3-man-page-location-fix.patch
new file mode 100644
index 000000000000..297e579c67b3
--- /dev/null
+++ b/net-misc/owncloud-client/files/owncloud-client-1.5.3-man-page-location-fix.patch
@@ -0,0 +1,12 @@
+diff -ur mirall-1.5.3/doc/CMakeLists.txt mirall-1.5.3-new/doc/CMakeLists.txt
+--- mirall-1.5.3/doc/CMakeLists.txt	2014-03-10 11:22:06.000000000 +0000
++++ mirall-1.5.3-new/doc/CMakeLists.txt	2014-04-07 19:17:56.000000000 +0100
+@@ -4,7 +4,7 @@
+     set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
+     # HTML output directory
+     set(SPHINX_HTML_DIR     "${CMAKE_CURRENT_BINARY_DIR}/html")
+-    set(SPHINX_MAN_DIR      "${CMAKE_CURRENT_BINARY_DIR}/man")
++    set(SPHINX_MAN_DIR      "${CMAKE_CURRENT_BINARY_DIR}/man1")
+     set(SPHINX_PDF_DIR      "${CMAKE_CURRENT_BINARY_DIR}/latex")
+     set(SPHINX_QCH_DIR      "${CMAKE_CURRENT_BINARY_DIR}/qthelp")
+     set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp")
diff --git a/net-misc/owncloud-client/owncloud-client-1.5.3-r1.ebuild b/net-misc/owncloud-client/owncloud-client-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..b7ef42134b3d
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-1.5.3-r1.ebuild
@@ -0,0 +1,65 @@
+# 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.5.3-r1.ebuild,v 1.1 2014/04/16 11:33:49 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 samba +sftp test"
+
+RDEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	dev-qt/qttest:4
+	dev-qt/qtwebkit:4
+	net-libs/neon[ssl]
+	sys-fs/inotify-tools
+	virtual/libiconv
+	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}
+
+PATCHES=( "${FILESDIR}"/${P}-man-page-location-fix.patch )
+
+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_src_configure
+}
+
+src_test() {
+	# 1 test needs an existing ${HOME}/.config directory
+	mkdir "${T}"/.config
+	export HOME="${T}"
+	cmake-utils_src_test
+}