Version bump, reported by Frank Krömmelbein <kroemmelbein@gmx.de> in bug #526794. Drop some versions

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

3 files changed, 33 insertions, 77 deletions

diff --git a/net-misc/owncloud-client/ChangeLog b/net-misc/owncloud-client/ChangeLog
index 3ba0e88b4db5..455d545a1e59 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.17 2014/09/24 12:59:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/ChangeLog,v 1.18 2014/10/27 09:07:41 voyageur Exp $
+
+*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,
diff --git a/net-misc/owncloud-client/owncloud-client-1.5.4.ebuild b/net-misc/owncloud-client/owncloud-client-1.5.4.ebuild
deleted file mode 100644
index 9b9851026fb2..000000000000
--- a/net-misc/owncloud-client/owncloud-client-1.5.4.ebuild
+++ /dev/null
@@ -1,65 +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.5.4.ebuild,v 1.1 2014/04/22 12:07:19 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}"/${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_src_configure
-}
-
-src_test() {
-	# 1 test needs an existing ${HOME}/.config directory
-	mkdir "${T}"/.config
-	export HOME="${T}"
-	cmake-utils_src_test
-}
diff --git a/net-misc/owncloud-client/owncloud-client-1.6.0.ebuild b/net-misc/owncloud-client/owncloud-client-1.6.4.ebuild
index ca7cd5ef1153..c3b52ade68f7 100644
--- a/net-misc/owncloud-client/owncloud-client-1.6.0.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.1 2014/06/07 20:06:23 voyageur Exp $
+# $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 $
 
 EAPI=5
 
@@ -15,16 +15,30 @@ 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"
+IUSE="doc samba +sftp test +qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
 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
+	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
@@ -41,8 +55,6 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${PN}-1.5.3-man-page-location-fix.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
@@ -52,6 +64,7 @@ src_configure() {
 		$(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