Put back older version for pyowncloud (#501228) update blockers on owncloud-client

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

4 files changed, 76 insertions, 8 deletions

diff --git a/net-misc/ocsync/ChangeLog b/net-misc/ocsync/ChangeLog
index d6b7a5b25431..76992c59c370 100644
--- a/net-misc/ocsync/ChangeLog
+++ b/net-misc/ocsync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/ocsync
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ChangeLog,v 1.3 2014/02/10 13:41:28 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ChangeLog,v 1.4 2014/02/24 13:55:54 voyageur Exp $
+
+*ocsync-0.90.4 (24 Feb 2014)
+
+  24 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org> +ocsync-0.90.4.ebuild,
+  ocsync-0.91.4.ebuild:
+  Put back older version for pyowncloud (#501228) update blockers on
+  owncloud-client
 
   10 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org> ocsync-0.91.4.ebuild:
   Fix compilation with USE=-iconv (and enable USE=iconv by default), restrict
diff --git a/net-misc/ocsync/Manifest b/net-misc/ocsync/Manifest
index 93452b5f4d41..7215d80c1ad5 100644
--- a/net-misc/ocsync/Manifest
+++ b/net-misc/ocsync/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST ocsync-0.90.4.tar.bz2 4630698 SHA256 f2146577c977dc82a24e0baf84f3970efc3b004f2730669aae3816f48ff15728 SHA512 74bf6b083ae4d4c09e3915d777d916a04ebb19aefb21a5a14a49e2079e02c5c60f1f274aa0cab5c227147883eaf1a5f91b6c0546b818c960cc3575cdcdd93d57 WHIRLPOOL d71ed0a1f6483be579225d577482795e4773d32ed8b5eee441125f0d34cd77a9a72664cb40a6fdc9e4674bb6e6327da0b4bf7fd8cea0d935c21151ba937661a1
 DIST ocsync-0.91.4.tar.bz2 6010999 SHA256 9ce5d04ff0475be4c3d3bfff43a554980d88277e95de4128a3f18611529b2cb6 SHA512 ec942ace1a215120cb8c764abe35b81ae48d979469c87feee8fcacb00740b35479095ed1a913f711736acd6fc8d83e148e4d597baff6d7a2de721981410ac896 WHIRLPOOL 7a8db0fa94ffa690863e51d3c58201f6d63803a6af00a2124c03c68ed4ece911bf5bf8862158c86c372caf02ee1bea7bbf4a2cfb3473a36f08e605a515ccde60
-EBUILD ocsync-0.91.4.ebuild 1378 SHA256 ed008dc6c86cbd66ca6349861952bc4efad9c3aab49e3c123e6af003f2093a39 SHA512 0c0eae79ad84c024de8706e15374b789f4bfe08722bf2c7c586e1dd0f0b7fb10c9c8ec22205f18796ce5e6b94975d13a6e69a75e3e090b6c4b064ca97a25a922 WHIRLPOOL d80d3dbcdaa2d8ee32fb59940728d6b7d4fac9c9439629eb8b765268cc0e6ea463a75f0406cf6c903a64bcedca557367ac33c651514c94361e5ffc8669539c18
-MISC ChangeLog 725 SHA256 fb40461edfd7770fa608e8757f9534624aceba89605259bc864ba51250486f32 SHA512 61adbf03dbae80c6252514aae4386d5bc61340bcc2ec550452bead62200b132af9bf6bcab34e78c17b525b002a509e57fbaf2b37f9802be965fab2d41e1dc726 WHIRLPOOL 311dfb5383ec74c7766b5977de3f3d5165e6270c43877536b0a0c52117c18288d11c06f5487738e22045ec605b434dd25e5104ef7e3d5de1ca1941875dfbc684
+EBUILD ocsync-0.90.4.ebuild 1327 SHA256 dbd6051f11a8789294034e21a7de733a1558fc411d8782a0e7e005ac2b3311ea SHA512 100d08963de7d2d486b721afc74817230e6c46f017893751f7e010cdbf10c8d29cded2327fc4551eb06a8bdceeef37237711c4161712c2eeae993e49df711bcd WHIRLPOOL a1b402ce909a7a5fb3cb464eeaed71e4c36f771042a4ae7dceaa4ec666a35803a8f7636c9de18451006278f88d73538e9a8a578f6e3819a19cf08c7a60a0be06
+EBUILD ocsync-0.91.4.ebuild 1413 SHA256 15144338999a797fce02656e1c667750270a8391bebfdbfe822d19d58ea0f8b8 SHA512 b1be65d4e2703f791f93c2262d9d735a1e7ba4890335efeb1b76513f9b69e993a8643e5eef97ff43f8a8170d17d3f83902feca37d6be4e907026b43f05e5b96a WHIRLPOOL aab615668c534c961ed93e744402a977bd8de47e7306dbfe235744c92789a84d95355820b41a6e5b4f618134f2263f133835aa34e3ec923724a41f712ee56c94
+MISC ChangeLog 945 SHA256 ab0d2bbfcc2110700264aea0a20741c49ad3d731e4514a39792f4781f8ca629e SHA512 1a1dc3f24b8350ced40ba9a10132b163a4e525c286f89b6af918b09a4c68bfc1c400318f0bea14fc7fc0ee242224b1384cc9e3bcb0e0657c433b3a19b0ceecaf WHIRLPOOL 834c7c49a8158e01e510ae5c5d4eb05045c1316775a7c61524eb83d1f871988928a6515e37426d4aa096d0a1e5f6030cb8e6d9c65ceb5ead77217c1bbf225990
 MISC metadata.xml 340 SHA256 c5c40a72df05ec9d8dfc3ecb271645226480e30f635847dfa0192fdf868104b8 SHA512 ca9a12a90e3d0a254a64c64529bd66bc427afb8161685b2dedcc433aec208a5c6b68bd501cdfddf137171ff90d57e8a416815f562ec5fee9bf466e389815dd08 WHIRLPOOL baab644f7192bb71a79fc60d12766c196169863686da3c9a3fd388d079798bb7e8bb55fb956899b27f431ac741fbfecdf11bf17b3aa9184b555cb1fafc639db7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlL41w4ACgkQFYEBGcdFJfLz3QD/Re8WreqEJ7nXVvlQiw3YQ98Q
-bNqKJRZ+DEhrcJq92EsA/08OOew8sKwwYAzzHpEPzLg+SfGF9xtHKOcTnJTD/o0Z
-=5YXY
+iF4EAREIAAYFAlMLT28ACgkQFYEBGcdFJfJzFgD8D3eZSXHwj5QNSgK7dx9LNdUi
+0BVocPkjGOXm3l42bmwA/2f9LHAAOncN6Aj+qYrZZpEYruwLkb4ZuWrjBER9MFoC
+=UEh6
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ocsync/ocsync-0.90.4.ebuild b/net-misc/ocsync/ocsync-0.90.4.ebuild
new file mode 100644
index 000000000000..5f7bf33336de
--- /dev/null
+++ b/net-misc/ocsync/ocsync-0.90.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ocsync-0.90.4.ebuild,v 1.1 2014/02/24 13:55:54 voyageur Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A file synchronizer especially designed for you, the normal user"
+HOMEPAGE="http://csync.org/"
+SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc iconv samba +sftp test"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/iniparser-3.1
+	net-libs/neon[ssl]
+	iconv? ( virtual/libiconv )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh )
+	!net-misc/csync
+	!>=net-misc/owncloud-client-1.5.1
+"
+DEPEND="${DEPEND}
+	app-text/asciidoc
+	doc? ( app-doc/doxygen )
+	test? ( dev-libs/check dev-util/cmocka )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# proper docdir
+	sed -e "s:/doc/ocsync:/doc/${PF}:" \
+		-i doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use test UNIT_TESTING)
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use_find_package samba Libsmbclient)
+		$(cmake-utils_use_find_package sftp LibSSH)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}/usr/etc/ocsync" "${D}/etc/"
+	rm -r "${D}/usr/etc/"
+}
diff --git a/net-misc/ocsync/ocsync-0.91.4.ebuild b/net-misc/ocsync/ocsync-0.91.4.ebuild
index 949fc7343834..4496e0d218cc 100644
--- a/net-misc/ocsync/ocsync-0.91.4.ebuild
+++ b/net-misc/ocsync/ocsync-0.91.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/ocsync/ocsync-0.91.4.ebuild,v 1.3 2014/02/10 13:41:28 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ocsync/ocsync-0.91.4.ebuild,v 1.4 2014/02/24 13:55:54 voyageur Exp $
 
 EAPI=5
 
@@ -23,7 +23,8 @@ RDEPEND=">=dev-db/sqlite-3.4:3
 	iconv? ( virtual/libiconv )
 	samba? ( >=net-fs/samba-3.5 )
 	sftp? ( >=net-libs/libssh-0.5 )
-	!net-misc/csync"
+	!net-misc/csync
+	!>=net-misc/owncloud-client-1.5.1"
 DEPEND="${DEPEND}
 	doc? (
 		app-doc/doxygen