Version bump, drop 1.6.x versions

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)

6 files changed, 32 insertions, 538 deletions

diff --git a/net-misc/owncloud-client/ChangeLog b/net-misc/owncloud-client/ChangeLog
index cf6465bf35c0..756481f2bd8b 100644
--- a/net-misc/owncloud-client/ChangeLog
+++ b/net-misc/owncloud-client/ChangeLog
@@ -1,259 +1,13 @@
 # ChangeLog for net-misc/owncloud-client
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/ChangeLog,v 1.22 2015/03/17 16:10:06 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/ChangeLog,v 1.23 2015/05/07 15:06:57 voyageur Exp $
 
-*owncloud-client-1.8.0 (17 Mar 2015)
+*owncloud-client-1.8.1 (07 May 2015)
 
-  17 Mar 2015; Bernard Cafarelli <voyageur@gentoo.org>
-  +owncloud-client-1.8.0.ebuild:
-  Version bump, default to qt5 as recommended upstream
+  07 May 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  -owncloud-client-1.6.1.ebuild, -owncloud-client-1.6.2.ebuild,
+  -owncloud-client-1.6.3.ebuild, -owncloud-client-1.6.4.ebuild,
+  +owncloud-client-1.8.1.ebuild,
+  -files/owncloud-client-1.5.3-man-page-location-fix.patch:
+  Version bump, drop 1.6.x versions
 
-*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:
-  Add qtquickcontrols dep with USE=qt5, fixes bug #529860. Also make qttest
-  deps optional
-
-*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)
-
-  27 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  -owncloud-client-1.5.4.ebuild, -owncloud-client-1.6.0.ebuild,
-  +owncloud-client-1.6.4.ebuild:
-  Version bump, reported by Frank Krömmelbein <kroemmelbein@gmx.de> in bug
-  #526794. Drop some versions
-
-  24 Sep 2014; Michael Palimaka <kensington@gentoo.org>
-  owncloud-client-1.6.1.ebuild, owncloud-client-1.6.2.ebuild,
-  owncloud-client-1.6.3.ebuild:
-  dev-qt/qtwebkit:5 no longer has a widgets USE flag.
-
-  11 Sep 2014; Michael Palimaka <kensington@gentoo.org>
-  owncloud-client-1.6.1.ebuild, owncloud-client-1.6.2.ebuild,
-  owncloud-client-1.6.3.ebuild:
-  Pin dev-qt/linguist-tools to SLOT 5.
-
-*owncloud-client-1.6.3 (05 Sep 2014)
-
-  05 Sep 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  +owncloud-client-1.6.3.ebuild:
-  Version bump
-
-*owncloud-client-1.6.2 (05 Aug 2014)
-
-  05 Aug 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  +owncloud-client-1.6.2.ebuild:
-  Version bump
-
-  30 Jun 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  owncloud-client-1.6.1.ebuild:
-  Make qt4/qt5 builds exclusive
-
-*owncloud-client-1.6.1 (27 Jun 2014)
-
-  27 Jun 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  +owncloud-client-1.6.1.ebuild:
-  Version bump, handle qt4/qt5 thanks to everyone in bug #512726
-
-*owncloud-client-1.6.0 (07 Jun 2014)
-
-  07 Jun 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  -owncloud-client-1.5.3-r1.ebuild, +owncloud-client-1.6.0.ebuild:
-  Version bump, fixes bug #512322. Also adds a postinstallation message with
-  USE=-doc, bug #bug 509716
-
-*owncloud-client-1.5.4 (22 Apr 2014)
-
-  22 Apr 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  -owncloud-client-1.5.0.ebuild, -owncloud-client-1.5.1.ebuild,
-  -owncloud-client-1.5.2.ebuild, -owncloud-client-1.5.3.ebuild,
-  +owncloud-client-1.5.4.ebuild:
-  Version bump, reported by Clemente Aguiar <clemente.aguiar@gmail.com> in bug
-  #507886, remove some previous versions
-
-*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,
-  owncloud-client-1.5.3.ebuild:
-  dev-qt/qtsql dependency was lost in the ebuilds merge from ocsync, thanks
-  again Daniel Kenzelmann in bug #504696
-
-*owncloud-client-1.5.3 (10 Mar 2014)
-
-  10 Mar 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  +owncloud-client-1.5.3.ebuild:
-  Version bump
-
-*owncloud-client-1.5.2 (26 Feb 2014)
-
-  26 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  +owncloud-client-1.5.2.ebuild:
-  Version bump, mostly bugfixes
-
-*owncloud-client-1.5.1 (24 Feb 2014)
-
-  24 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  +owncloud-client-1.5.1.ebuild, metadata.xml:
-  Version bump, update ebuild for ocsync merge, fixes bug #501372
-
-  07 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  owncloud-client-1.5.0.ebuild:
-  Requires dev-qt/qtsql, thanks Daniel Kenzelmann in bug #500558
-
-*owncloud-client-1.5.0 (06 Feb 2014)
-
-  06 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org>
-  +owncloud-client-1.5.0.ebuild, +metadata.xml:
-  Package move from net-misc/mirall, take ownership, version bump. Bug #494314
-
-  05 Feb 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml:
-  Send to maintainer-needed.
-
-*mirall-1.4.2 (03 Dec 2013)
-
-  03 Dec 2013; Chris Reffett <creffett@gentoo.org> +mirall-1.4.2.ebuild,
-  -mirall-1.4.0.ebuild:
-  Version bump wrt bug 489582
-
-  18 Sep 2013; Johannes Huber <johu@gentoo.org> mirall-1.4.0.ebuild:
-  Add missing dep on dev-qt/qtwebkit, bug #485264.
-
-*mirall-1.4.0 (17 Sep 2013)
-
-  17 Sep 2013; Chris Reffett <creffett@gentoo.org> +mirall-1.4.0.ebuild,
-  -mirall-1.2.4.ebuild, -mirall-1.2.5.ebuild, -mirall-1.3.0.ebuild:
-  Version bump wrt bug 483696. Remove old.
-
-  02 Jul 2013; Michael Palimaka <kensington@gentoo.org> mirall-1.3.0.ebuild:
-  Raise net-misc/csync dependency. Add missing dev-qt/qtdbus dependency wrt bug
-  #475268 by Johannes Kimmel <johannes.kimmel@gmx.de>.
-
-*mirall-1.3.0 (29 Jun 2013)
-
-  29 Jun 2013; Pavlos Ratis <dastergon@gentoo.org> +mirall-1.3.0.ebuild:
-  Version bump, bug 475112
-
-*mirall-1.2.5 (29 Apr 2013)
-
-  29 Apr 2013; Michael Palimaka <kensington@gentoo.org> +mirall-1.2.5.ebuild,
-  -mirall-1.2.1-r1.ebuild:
-  Version bump. Remove old.
-
-  29 Apr 2013; Michael Palimaka <kensington@gentoo.org> mirall-1.2.4.ebuild:
-  Raise net-misc/csync dependency.
-
-*mirall-1.2.4 (15 Apr 2013)
-
-  15 Apr 2013; Michael Palimaka <kensington@gentoo.org> +mirall-1.2.4.ebuild,
-  -files/mirall-1.2.0_beta2-automagicness.patch, -mirall-1.2.0.ebuild:
-  Version bump wrt bug #464612. Remove old.
-
-  02 Apr 2013; Michael Palimaka <kensington@gentoo.org> mirall-1.2.1-r1.ebuild:
-  Fix build with USE="doc" wrt bug #463712.
-
-*mirall-1.2.1-r1 (11 Mar 2013)
-
-  11 Mar 2013; Chris Reffett <creffett@gentoo.org> +mirall-1.2.1-r1.ebuild,
-  -mirall-1.2.1.ebuild:
-  Revision bump, move files from /usr/etc/ to /etc/ wrt bug 460760
-
-  02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> mirall-1.2.0.ebuild,
-  mirall-1.2.1.ebuild:
-  Move Qt dependencies to the new category
-
-*mirall-1.2.1 (28 Feb 2013)
-
-  28 Feb 2013; Chris Reffett <creffett@gentoo.org> +mirall-1.2.1.ebuild:
-  Version bump wrt bug 459476
-
-  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> mirall-1.2.0.ebuild:
-  Move Creative Commons licenses to shorter names.
-
-  03 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> mirall-1.2.0.ebuild:
-  Drop languages as the setup as now is broken because it does not match
-  linguas.
-
-*mirall-1.2.0 (31 Jan 2013)
-
-  31 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> +mirall-1.2.0.ebuild,
-  -mirall-1.1.2.ebuild, -mirall-1.1.4.ebuild, -mirall-1.2.0_beta2.ebuild:
-  Version bump to mirall-1.2.0. Punt older.
-
-  22 Jan 2013; Chris Reffett <creffett@gentoo.org> mirall-1.2.0_beta2.ebuild:
-  Fix use of { instead of ( in cmake-utils_use_with (though documentation
-  doesn't build right now to start with).
-
-*mirall-1.2.0_beta2 (22 Jan 2013)
-
-  22 Jan 2013; Chris Reffett <creffett@gentoo.org>
-  +files/mirall-1.2.0_beta2-automagicness.patch, +mirall-1.2.0_beta2.ebuild:
-  Version bump. Add patch to fix some automagicness.
-
-*mirall-1.1.4 (21 Dec 2012)
-
-  21 Dec 2012; Chris Reffett <creffett@gentoo.org> +mirall-1.1.4.ebuild:
-  Version bump.
-
-*mirall-1.1.2 (14 Dec 2012)
-
-  14 Dec 2012; Chris Reffett <creffett@gentoo.org> +mirall-1.1.2.ebuild,
-  -mirall-1.0.5.ebuild, -mirall-1.1.0.ebuild, -mirall-1.1.1-r1.ebuild,
-  metadata.xml:
-  Version bump, remove old.
-
-  30 Nov 2012; Chris Reffett <creffett@gentoo.org> mirall-1.1.1-r1.ebuild:
-  Make the USEs enabled by default in the csync ebuild enabled by default here
-  too.
-
-*mirall-1.1.1-r1 (30 Nov 2012)
-
-  30 Nov 2012; Chris Reffett <creffett@gentoo.org> +mirall-1.1.1-r1.ebuild,
-  -mirall-1.1.1.ebuild, metadata.xml:
-  Add USE-conditional deps on csync USE flags wrt bug 433165
-
-*mirall-1.1.1 (16 Nov 2012)
-
-  16 Nov 2012; Johannes Huber <johu@gentoo.org> +mirall-1.1.1.ebuild:
-  Version bump.
-
-  15 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> mirall-1.1.0.ebuild:
-  Fix finding csync when we are not using the internal one. Resolves bug#438290.
-
-*mirall-1.1.0 (13 Oct 2012)
-
-  13 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> +mirall-1.1.0.ebuild,
-  mirall-1.0.5.ebuild:
-  Version bump to latest.
-
-  09 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> mirall-1.0.5.ebuild:
-  Depend also on qt-test. Failed on one of my boxes without.
-
-  28 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> mirall-1.0.5.ebuild:
-  Shutup repoman.
-
-  28 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> mirall-1.0.5.ebuild:
-  Do not use kde eclass as it is just pure qt stuff.
-
-*mirall-1.0.5 (28 Aug 2012)
-
-  28 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> +metadata.xml,
-  +mirall-1.0.5.ebuild:
-  Add mirall to access owncloud services and so on. Fixes bug #412507.
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
deleted file mode 100644
index 297e579c67b3..000000000000
--- a/net-misc/owncloud-client/files/owncloud-client-1.5.3-man-page-location-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.6.1.ebuild b/net-misc/owncloud-client/owncloud-client-1.6.1.ebuild
deleted file mode 100644
index 04492a23e3a9..000000000000
--- a/net-misc/owncloud-client/owncloud-client-1.6.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.6.1.ebuild,v 1.4 2014/09/24 12:59:21 kensington 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 +qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	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]
-	)
-	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}"/${PN}-1.5.3-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_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
-}
diff --git a/net-misc/owncloud-client/owncloud-client-1.6.2.ebuild b/net-misc/owncloud-client/owncloud-client-1.6.2.ebuild
deleted file mode 100644
index 7805343d9fbc..000000000000
--- a/net-misc/owncloud-client/owncloud-client-1.6.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.6.2.ebuild,v 1.3 2014/09/24 12:59:21 kensington 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 +qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	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]
-	)
-	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}"/${PN}-1.5.3-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_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
-}
diff --git a/net-misc/owncloud-client/owncloud-client-1.6.3.ebuild b/net-misc/owncloud-client/owncloud-client-1.6.3.ebuild
deleted file mode 100644
index 4710cd1457ba..000000000000
--- a/net-misc/owncloud-client/owncloud-client-1.6.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.6.3.ebuild,v 1.3 2014/09/24 12:59:21 kensington 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 +qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	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]
-	)
-	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}
-
-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
-}
diff --git a/net-misc/owncloud-client/owncloud-client-1.6.4.ebuild b/net-misc/owncloud-client/owncloud-client-1.8.1.ebuild
index c3b52ade68f7..3741fffd8fa1 100644
--- a/net-misc/owncloud-client/owncloud-client-1.6.4.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-1.8.1.ebuild
@@ -1,47 +1,46 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.6.4.ebuild,v 1.1 2014/10/27 09:07:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/owncloud-client-1.8.1.ebuild,v 1.1 2015/05/07 15:06:57 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"
+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 samba +sftp test +qt4 qt5"
+IUSE="doc nautilus samba +sftp test qt4 +qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
 RDEPEND=">=dev-db/sqlite-3.4:3
+	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
+		net-libs/neon[ssl]
 	)
 	qt5? (
 		dev-libs/qtkeychain[qt5]
 		dev-qt/linguist-tools:5
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
+		>=dev-qt/qtnetwork-5.4:5
 		dev-qt/qtgui:5
+		dev-qt/qtquickcontrols:5
 		dev-qt/qtsql:5
-		dev-qt/qttest:5
 		dev-qt/qtwebkit:5[printsupport]
 	)
-	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"
@@ -51,9 +50,21 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
 	)
-	test? ( dev-util/cmocka )"
+	test? (
+		dev-util/cmocka
+		qt4? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
+	)"
+
+S=${WORKDIR}/${P/-}
 
-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=(