[gentoo-commits] repo/gentoo:master commit in: net-misc/ocsync/

2018-01-01 Thread Bernard Cafarelli
commit: ef9e4219ab49bf9b8ff610743c21305c0eb0b306
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Jan  1 17:34:27 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Jan  1 17:34:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9e4219

net-misc/ocsync: remove after last rites

Closes: https://bugs.gentoo.org/501228
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-misc/ocsync/Manifest |  1 -
 net-misc/ocsync/metadata.xml | 11 ---
 net-misc/ocsync/ocsync-0.90.4.ebuild | 60 
 3 files changed, 72 deletions(-)

diff --git a/net-misc/ocsync/Manifest b/net-misc/ocsync/Manifest
deleted file mode 100644
index 93835bed69f..000
--- a/net-misc/ocsync/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ocsync-0.90.4.tar.bz2 4630698 BLAKE2B 
11900f09a9de683f5251cec00984dc0f02a24f066bb696ea11278442eeea9d2555ba9307887e0f3374079deb438262cb464ec78eb9d3e46780be3444672f33ec
 SHA512 
74bf6b083ae4d4c09e3915d777d916a04ebb19aefb21a5a14a49e2079e02c5c60f1f274aa0cab5c227147883eaf1a5f91b6c0546b818c960cc3575cdcdd93d57

diff --git a/net-misc/ocsync/metadata.xml b/net-misc/ocsync/metadata.xml
deleted file mode 100644
index 4ce4054df69..000
--- a/net-misc/ocsync/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   voyag...@gentoo.org
-   Bernard Cafarelli
-   
-   
-   Enable sftp transfer support via 
net-libs/libssh
-   
-

diff --git a/net-misc/ocsync/ocsync-0.90.4.ebuild 
b/net-misc/ocsync/ocsync-0.90.4.ebuild
deleted file mode 100644
index 37369a8f2f4..000
--- a/net-misc/ocsync/ocsync-0.90.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:0
-   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
-
-   sed -e "s/__FUNCTION__/__func__/" -i \
-   src/csync_log.h src/httpbf/src/httpbf.c \
-   tests/csync_tests/check_csync_log.c || die
-   # 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/"
-}



[gentoo-commits] repo/gentoo:master commit in: net-misc/ocsync/

2016-01-04 Thread Bernard Cafarelli
commit: cc201a844ddaec078b07af4c4d1fd729873ed714
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Jan  4 13:10:36 2016 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Jan  4 13:10:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc201a84

net-misc/ocsync: fix compilation with gcc 5

Bug #569072 by Toralf Förster  gmx.de>

Package-Manager: portage-2.2.26

 net-misc/ocsync/ocsync-0.90.4.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-misc/ocsync/ocsync-0.90.4.ebuild 
b/net-misc/ocsync/ocsync-0.90.4.ebuild
index 83e7bf1..a2383be 100644
--- a/net-misc/ocsync/ocsync-0.90.4.ebuild
+++ b/net-misc/ocsync/ocsync-0.90.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,6 +36,9 @@ DEPEND="${DEPEND}
 src_prepare() {
cmake-utils_src_prepare
 
+   sed -e "s/__FUNCTION__/__func__/" -i \
+   src/csync_log.h src/httpbf/src/httpbf.c \
+   tests/csync_tests/check_csync_log.c || die
# proper docdir
sed -e "s:/doc/ocsync:/doc/${PF}:" \
-i doc/CMakeLists.txt || die



[gentoo-commits] repo/gentoo:master commit in: net-misc/ocsync/

2015-10-16 Thread Bernard Cafarelli
commit: 9cdeaac4e1e77f039d8b2b3bec10d48f99df312a
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Oct 16 11:10:08 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Oct 16 11:10:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cdeaac4

net-misc/ocsync: only keep version for bug #501228

0.90.4 is for pyOwnCloud support
For newer versions, code was merged in net-misc/owncloud-client

Package-Manager: portage-2.2.23

 net-misc/ocsync/Manifest |  1 -
 net-misc/ocsync/ocsync-0.91.4.ebuild | 56 
 2 files changed, 57 deletions(-)

diff --git a/net-misc/ocsync/Manifest b/net-misc/ocsync/Manifest
index a6a1983..d9312eb 100644
--- a/net-misc/ocsync/Manifest
+++ b/net-misc/ocsync/Manifest
@@ -1,2 +1 @@
 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

diff --git a/net-misc/ocsync/ocsync-0.91.4.ebuild 
b/net-misc/ocsync/ocsync-0.91.4.ebuild
deleted file mode 100644
index e6410a6..000
--- a/net-misc/ocsync/ocsync-0.91.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="ownCloud fork of csync file synchronizer"
-HOMEPAGE="http://owncloud.org/;
-SRC_URI="http://download.owncloud.com/desktop/stable/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +iconv samba +sftp test"
-
-# Tests only work with iconv
-REQUIRED_USE="test? ( iconv )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-   net-libs/neon[ssl]
-   iconv? ( virtual/libiconv )
-   samba? ( >=net-fs/samba-3.5 )
-   sftp? ( >=net-libs/libssh-0.5 )
-   !net-misc/csync
-   !>=net-misc/owncloud-client-1.5.1"
-DEPEND="${DEPEND}
-   doc? (
-   app-doc/doxygen
-   app-text/asciidoc
-   )
-   test? ( dev-util/cmocka )"
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   # proper docdir
-   sed -e "s:/doc/${PN}:/doc/${PF}:" \
-   -i doc/CMakeLists.txt || die
-   # Fix compilation with USE=-iconv, #500860
-   sed -e "s/_TCHAR/mbchar_t/" \
-   -i src/std/c_string.c || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-   $(cmake-utils_use_with iconv ICONV)
-   $(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
-}