Version bump, drop some old versions

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

4 files changed, 33 insertions, 129 deletions

diff --git a/net-misc/owncloud-client/ChangeLog b/net-misc/owncloud-client/ChangeLog
index 5bca3e66d073..98f65df6468b 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/ChangeLog,v 1.25 2015/06/26 23:01:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/ChangeLog,v 1.26 2015/08/03 07:58:27 voyageur Exp $
+
+*owncloud-client-1.8.4 (03 Aug 2015)
+
+  03 Aug 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  -owncloud-client-1.7.0.ebuild, -owncloud-client-1.7.1.ebuild,
+  +owncloud-client-1.8.4.ebuild:
+  Version bump, drop some old versions
 
   26 Jun 2015; Bernard Cafarelli <voyageur@gentoo.org>
   owncloud-client-1.8.3.ebuild:
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 208132fa8d81..7da902d5fe60 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,34 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
 DIST owncloudclient-1.8.0.tar.bz2 13556481 SHA256 192bec5fe4b60c40d3a5d60abe224a1029af653ce445515290f3f1bb7967b0bd SHA512 d25bd0ef28991c727c99bda6e5b6c44de70eca78c4dededb85784c56c63665ec613c469b1f16d1e6e84f552b5f9a3ae996bd6dffc456765d32bef0208a5875e6 WHIRLPOOL 559ee0046256282ca3f3218ad50b89924b62b9756dd51ebfa64e3fa71296c03045f6d2df8c644995af431091bfe41994ed74400936a1d80f88f28f3b3cc27b68
 DIST owncloudclient-1.8.1.tar.xz 11343868 SHA256 8b9bb4fea2a4b80938a3477813839ac325ac1ed39a85a8f1e0cd3ebb0e430ea3 SHA512 171e378f283ecf51439f9e897bd0111bc5f7bdfdf8b2ae4e6b016a566e3848724419187887a542772f0f5aa6d96ff287b7d3ee45b085bb34771a7db0597138da WHIRLPOOL 5f43592ec59b642dc5ba83511f7d2e9a1e57a3254cd6582618e0c93cd7e3fb539af9a7d5b5524581300528a0e2b8dbf2ec23072fcf13740d4e422907b54094d9
 DIST owncloudclient-1.8.3.tar.xz 11372576 SHA256 8cc4f8f6c146ff163f76d1b149ec92f3f98c07e3ea19c251d99d6a99affd0dde SHA512 e1dc54c99f04b4365af648f0d9a69249cdb7254728827bdf210dd336fc10571a431a9695f063f9abb306430059a6a63ed23ed588a035611725934ccdb1c57f90 WHIRLPOOL f7533d07913ce81a9a07f39eb892229646ccb8e4332159a80c08998c9f95901d57fcf01cca20ebbcb0a2f50e2009996a6659fd94e9e32da9d33cff7f97b3eb42
-EBUILD owncloud-client-1.7.0.ebuild 2441 SHA256 a13374dab4fbb51cadca564fd0b6588a73cc6d64958df77839dd536f2d05112f SHA512 381e4a667fa2a75f761bfd9c820258aa7bba9914858a3bb02e65f96c0b80096126667d7e61203e53e3793ff7a3202e782dd9e4127688383107dac1dde5d56625 WHIRLPOOL 4c2356f53af7da64b10eecba417e3077900a6681bfef29747bbd5438ee82812a8eae696c5bad628403e1541c332d9413761d224bda29014889f0c7a789556c84
-EBUILD owncloud-client-1.7.1.ebuild 2241 SHA256 4f2a03d1ed2037a364336473d1f1fc6fce1daecc2b27fdbe55ced011dc6303e7 SHA512 bfefe213157f568f02a12aec68cbdca8e15dc22328461515aef6c24ff0273905085bc0345aee2099d2fa54f6a2a6cb5098170a2f99d3182131b7b14608f90bf2 WHIRLPOOL 88146b8712feaecc0e60240fb1bc69bd915fc98d57b340ca8c2d6e0938f929524f3d42418098c3c6ec7815b55e3fc52c8f20339e4493c7533f52455d008629a4
+DIST owncloudclient-1.8.4.tar.xz 11371640 SHA256 ebe5ec7e33de6f2072bcadcd2b316a09b9d583d7d41eb1caf467a48896d81cdb SHA512 00aab07f92a2ea9e74af1321d466159abf152dd4899defd635595410258569e74a06071acc67a82371f8e150a4025ca76d1ad0eca5259af7ee7ce0fd3091b76f WHIRLPOOL 5a57c83334ea13eff473bca89970937929442719df7c5f50d35af0101f772adf658796e9fd4eaddb5c40b4c70b8727371baffedce38f4bb39658251eb7ccf26b
 EBUILD owncloud-client-1.8.0.ebuild 2243 SHA256 83db7eabe60fb6adcd53e31308c7f7e8c321dae34ae39efdbdc5afda2f6a983a SHA512 addbbd4c1894d0b6d236a6521ee21aafc36ea54a86bf1cfe7b850aab196ab7ddcd88c8cf2e3bb7f0b14c13525e0c3f8573fda9eac4f518949e005b438ddd3654 WHIRLPOOL 53e30c779cafc7877e1a06d39aabc4f30274a3bd85266ba01265c57806290e86cc779291350b6b33d268360271dd5caa313b1aaf35a5bb06cab7f8d340a48b05
 EBUILD owncloud-client-1.8.1.ebuild 2242 SHA256 3447970e9690a9ca6cd00916de4afc5e117caf0d3aaac4e85f6393d10981f172 SHA512 ab162a110eb1a3b04a02e3dc80e3a72ec1ba61a881f3cf6d2986838ca096678b9407980f8fc724f84d551a2d9640f27b518687b2d46be38158c9b66113e57e3f WHIRLPOOL f48a3f9769146f0531c0d1ed334ad454b94fb5759e4467734126e841b7b9ee03521fa9e8519730bd96fee69013d8c4e9c402e86a39c8eecfc5abbb9e3516861a
 EBUILD owncloud-client-1.8.3.ebuild 2266 SHA256 24903114de4c7f0bee17d827eb3d331ef422b5a6d08ae0e8c4441782336e1fcd SHA512 0ba39411b7d42a85e2e754d8a5e9385e42e6f9d8583cafd9563387e5c74b659e2603dcd07d6c67069cc09926735abc0e201fdde68ec8399f25f4a7ab49ed3b56 WHIRLPOOL 1220ee0495487ef8688ca86aab55bd2e976626681402336614199bcf617c70f6e1e6009af638e8575d153eb93d0bbc199d42b0d9969b38faf2ca164cfee7761e
-MISC ChangeLog 9867 SHA256 6482326995fee20008344b07f9a9c57a985fa9fc29610c3904e489185668c087 SHA512 b7a5762ef247dbf488c8cb9f3c3e9d5ba55b090c85115fa11b8302d4dc6f29f6c5646cd8fd86736627f55c0649ec18a9d8fd110ee7b4ed4273a6e6cab95141c9 WHIRLPOOL 659d8c117a4abf8df93b6c84a4f967417b8531fecf43e757ae00605032d6b3fa4cf880c1ada42ab4fa8a1468c65d5a2b4a575719a8e2f00be558554f9fe996a5
+EBUILD owncloud-client-1.8.4.ebuild 2266 SHA256 8b308c318b9cfaaa8042d8adc1bc646cce2a49f6408f85ec26696cbc06e13d3e SHA512 e0f462b6c2c02e88c6780b3a079177ed311967665b87c7e07f343af2bdb0c03504b8cb904a22749bc41135ed8d9684c8e0d860434119e7b9346c12aa015ea3f5 WHIRLPOOL 88b39d00bc3b0b462b2bb196cae58a933b7f99a17f86c90a92c5ac0ee605f6424d6eb858625c3583795a9d5c30e6e68bf43d2aee3ed478b4ef687e4662c2e56d
+MISC ChangeLog 10097 SHA256 673578e906e89dac0261e0ddf19c7e75826c7279aad31055a31442bfc41b4d97 SHA512 10a22ef76af33e303a040d7b679e5cfc1cf55aaeba44d9af9b0baa6ec5a487c98ee2d1fe9fc3cb9b81573f04e53fb0817205e73891613d03204cf22b13e0aa98 WHIRLPOOL bbaf12ebee36097cb213298ae6602027b0e3a0459e6d6bf943e39c77b40e9d3a6e01f3f0e8a4f2eca7c5385b7cf817b47aa3228b73f2754403aa18bbed84e232
 MISC metadata.xml 424 SHA256 054589e15da0e968baa1f7227c7e3cd602cfcf816097bba63818948672ee80d2 SHA512 f95180819ab60ada7609dff5e536f65c3e75a47a7ef1ca162b61d3e229e7ad12b854a3d7000b30eba067072db2c0b12f2b45a181e4885dc0553072462697c342 WHIRLPOOL 00b3c8f623cf2b6d301d866473e8cbe4fcd4871099ad5d5971cd0c18c5e004e0ffa8c2190657a6712ea55517cbc35a50dc01914a9af68dafd3449df10b960728
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVjdnRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVvx8lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
-MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/mi4P/j0yCqMOzee23NynQLX8e2eB
-FJpIaYYAvcpzNIb3n7CEjiljdhdjCCCbXC4OuZZtZmAbfeMCeKEJbVs9YKv4Lq/X
-YLc1Q9OmQ9yHp2bVD7rfz3/huShYsc9KQUHhbats2oUWKnbtQMV+PYjxw7yjwRjT
-lIrbD8mdiNr4fqpBCq01V5TWiCAIJtqvebL2dmv3tsbPIj2UtE6iCIgRFbu3C47q
-mQXrn2LR6mqA02EWrv7rp5uMgoZ7o8hYIhxA+aW5idUdWtqsachiQZxVBJz7+hbB
-CO9FuRvZvigvXu2TVL9vAkWXlbaL2aKpWlrFR7ZhpjUhGHDDKrOlFPN0QxVfS3Jt
-S/kdICX/U/J++EtQSzCzuDfXj8/6HU+E5IWhwhEFHuFfuuh9OSSu23h0fPAB2NyL
-AETr3kgTCIdpzS32fgjuQ+Gxsui49POE6FDLEe5C4FUfZsKycBpYxfgbKeuMC3Kr
-oZBjiAfEbuvjrRbe55oO4yF2bivqEk3fAFd+Ka1+fGC6MWqQM0rIdS8kHLlegR0r
-/+dBhDZaDwjVHkxWoLTcYGfNb5z+iRkbUHXwjfHPnxJk2Vw7VO5HWMiAnD00uhoQ
-aLwfN8kFeIrS3eKWpWCpEsuDZ8fmRJZ1t77m9sAe3mn1qV2fkG1E8GDMx5A+TvRa
-i5jKHYkoUK0y+oT4fPRO
-=5u2l
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/DisQANml8/YVvl9maDndZlizEUVs
+kOJLhbEDl5DeilJE1iS+wP1rWtzZYhpurevJ2nLlQbBoBmApVRNThRc5tEMBoDC2
+zXDFMKK9EpMBLoHcPSAdkMFq9SYUhB+zNuy1gBbdisvSht572dIeH0pLz9pR+zLt
+MU9pNqMQ5cPrhSCmYcRkSgrr5VN68tOEbAwOlv1oX5RyMVp91K7whg9P1hgDeR5k
+uAezuQAYAmZ2xLoq+fdwLDU698XZa34A3fbfHcarlQ8u3H88XqnFUQ9WUOSSU3cl
+zg7qDepQ9zAeVzmB859qrV3j5y+RQTA5KVA9X8v+K8MZRHTyg64GFP443L9iyjP8
+mqvWc1XTKbfLHSL7V0AXAfpsCK5sUAJzzRTYJ1sZFGdf4KVAcdgDgxSoOjW0BFFe
+w27d+M5TvOEZY3euy8jA5Kx9aInLQnnCw4ZO2j7JJiHjXTZpI2/03iNi5Jqcvgi/
+Ivv2KC5Z/wa5R4Vmt52nFVF/ua4LS9sUZWo04alIk4qs7nMuxTHZDDkpjyr140Uz
+8RKK50pI687PQs2dqB3+E1fPqiSmbAQdMRkgRHN/RDRzfF+/fu7fMgaNlIyxxLR9
+jIbNfRX926oEA+eH0vAes29Fi5jT8B54WLZejSn/rEEzo3Ip0Ibi4mv6EJ+SOZs0
+Z2Bd2YtuZiheQzpfuD1f
+=MPNW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/owncloud-client/owncloud-client-1.7.0.ebuild b/net-misc/owncloud-client/owncloud-client-1.7.0.ebuild
deleted file mode 100644
index eaa804370423..000000000000
--- a/net-misc/owncloud-client/owncloud-client-1.7.0.ebuild
+++ /dev/null
@@ -1,101 +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.7.0.ebuild,v 1.2 2014/11/20 14:03:38 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
-	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
-}
diff --git a/net-misc/owncloud-client/owncloud-client-1.7.1.ebuild b/net-misc/owncloud-client/owncloud-client-1.8.4.ebuild
index cd196983bf4d..8d62e31450e5 100644
--- a/net-misc/owncloud-client/owncloud-client-1.7.1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-1.8.4.ebuild
@@ -1,26 +1,23 @@
-# 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.7.1.ebuild,v 1.1 2014/12/18 15:58:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/owncloud-client-1.8.4.ebuild,v 1.1 2015/08/03 07:58:27 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 nautilus samba +sftp test +qt4 qt5"
+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 )
@@ -31,12 +28,15 @@ RDEPEND=">=dev-db/sqlite-3.4:3
 		dev-qt/qtgui:4
 		dev-qt/qtsql:4
 		dev-qt/qtwebkit:4
+		net-libs/neon[ssl]
 	)
 	qt5? (
 		dev-libs/qtkeychain[qt5]
 		dev-qt/linguist-tools:5
+		dev-qt/qtconcurrent: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
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
 		qt5? ( dev-qt/qttest:5 )
 	)"
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${P/-}
 
 src_prepare() {
 	# Keep tests in ${T}