Version bump, remove old.

(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 42618354)

5 files changed, 130 insertions, 65 deletions

diff --git a/net-misc/csync/ChangeLog b/net-misc/csync/ChangeLog
index 253a309edb33..6c4e6ca62d9d 100644
--- a/net-misc/csync/ChangeLog
+++ b/net-misc/csync/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/csync
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.8 2012/11/16 19:39:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.9 2012/12/14 17:18:48 creffett Exp $
+
+*csync-0.60.3 (14 Dec 2012)
+
+  14 Dec 2012; Chris Reffett <creffett@gentoo.org> +csync-0.60.3.ebuild,
+  +files/csync-0.60.2-automagicness.patch,
+  +files/csync-0.60.2-removebadtest.patch, -csync-0.50.8.ebuild,
+  -csync-0.60.0-r1.ebuild:
+  Version bump, remove old.
 
 *csync-0.60.1 (16 Nov 2012)
 
diff --git a/net-misc/csync/csync-0.50.8.ebuild b/net-misc/csync/csync-0.50.8.ebuild
deleted file mode 100644
index b27f1cd34e04..000000000000
--- a/net-misc/csync/csync-0.50.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.50.8.ebuild,v 1.4 2012/08/28 13:21:00 scarabeus Exp $
-
-EAPI=4
-
-inherit base 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 log samba +sftp test +webdav"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/iniparser-3.1
-	dev-libs/openssl:0
-	log? ( dev-libs/log4c )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh )
-	webdav? ( net-libs/neon )
-"
-DEPEND="${DEPEND}
-	app-text/asciidoc
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-automagicness.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# punt owncloud test as it uses weird cmocka framework
-	sed -i \
-		-e 's:add_subdirectory(ownCloud)::' \
-		tests/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOG_TO_CALLBACK=ON"
-		$(cmake-utils_use test UNIT_TESTING)
-		$(cmake-utils_use_with doc APIDOC)
-		$(cmake-utils_use_with log Log4C)
-		$(cmake-utils_use_with samba Libsmbclient)
-		$(cmake-utils_use_with sftp LibSSH)
-		$(cmake-utils_use_with webdav Neon)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/csync/csync-0.60.0-r1.ebuild b/net-misc/csync/csync-0.60.3.ebuild
index c12541ce586e..77346e76c245 100644
--- a/net-misc/csync/csync-0.60.0-r1.ebuild
+++ b/net-misc/csync/csync-0.60.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.60.0-r1.ebuild,v 1.1 2012/10/17 06:30:20 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.60.3.ebuild,v 1.1 2012/12/14 17:18:48 creffett Exp $
 
 EAPI=4
 
@@ -27,11 +27,12 @@ RDEPEND="
 DEPEND="${DEPEND}
 	app-text/asciidoc
 	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
+	test? ( dev-util/cmocka )
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-automagicness.patch"
+	"${FILESDIR}/${PN}-0.60.2-automagicness.patch"
+	"${FILESDIR}/${PN}-0.60.2-removebadtest.patch"
 )
 
 S="${WORKDIR}/o${P}"
@@ -39,10 +40,12 @@ S="${WORKDIR}/o${P}"
 src_prepare() {
 	base_src_prepare
 
-	# punt owncloud test as it uses weird cmocka framework
-	sed -i \
-		-e 's:add_subdirectory(ownCloud)::' \
-		tests/CMakeLists.txt || die
+	if ! use doc; then
+		sed -i \
+			-e 's:add_subdirectory(doc)::' \
+			CMakeLists.txt || die
+	fi
+
 	# proper docdir
 	sed -i \
 		-e "s:/doc/ocsync:/doc/${PF}:" \
diff --git a/net-misc/csync/files/csync-0.60.2-automagicness.patch b/net-misc/csync/files/csync-0.60.2-automagicness.patch
new file mode 100644
index 000000000000..426d83097e64
--- /dev/null
+++ b/net-misc/csync/files/csync-0.60.2-automagicness.patch
@@ -0,0 +1,102 @@
+--- ocsync-0.60.2/cmake/Modules/MacroOptionalFindPackage.cmake
++++ ocsync-0.60.2/cmake/Modules/MacroOptionalFindPackage.cmake
+@@ -0,0 +1,47 @@
++# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
++# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_<name>, which can be disabled via the cmake GUI.
++# or via -DWITH_<name>=OFF
++# The standard <name>_FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++# This is just a helper macro to set a bunch of variables empty.
++# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
++macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
++   if(DEFINED ${_name}_${_var})
++      set(${_name}_${_var} "")
++   endif(DEFINED ${_name}_${_var})
++
++   string(TOUPPER ${_name} _nameUpper)
++   if(DEFINED ${_nameUpper}_${_var})
++      set(${_nameUpper}_${_var}  "")
++   endif(DEFINED ${_nameUpper}_${_var})
++endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++   option(WITH_${_name} "Search for ${_name} package" ON)
++   if (WITH_${_name})
++      find_package(${_name} ${ARGN})
++   else (WITH_${_name})
++      string(TOUPPER ${_name} _nameUpper)
++      set(${_name}_FOUND FALSE)
++      set(${_nameUpper}_FOUND FALSE)
++
++      _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
++      _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
++      _mofp_set_empty_if_defined(${_name} INCLUDES)
++      _mofp_set_empty_if_defined(${_name} LIBRARY)
++      _mofp_set_empty_if_defined(${_name} LIBRARIES)
++      _mofp_set_empty_if_defined(${_name} LIBS)
++      _mofp_set_empty_if_defined(${_name} FLAGS)
++      _mofp_set_empty_if_defined(${_name} DEFINITIONS)
++   endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
+
+--- ocsync-0.60.2/CMakeLists.txt
++++ ocsync-0.60.2/CMakeLists.txt
+@@ -38,8 +38,9 @@
+ # add macros
+ include(MacroAddPlugin)
+ include(MacroCopyFile)
++include(MacroOptionalFindPackage)
+ 
+-find_package(Log4C)
++macro_optional_find_package(Log4C)
+ find_package(CMocka)
+ if (CMOCKA_FOUND AND UNIT_TESTING)
+     include(AddCMockaTest)
+
+--- ocsync-0.60.2/DefineOptions.cmake
++++ ocsync-0.60.2/DefineOptions.cmake
+@@ -1,4 +1,3 @@
+-option(WITH_LOG4C "Build csync without log4c" ON)
+ option(UNIT_TESTING "Build with unit tests" OFF)
+ option(MEM_NULL_TESTS "Enable NULL memory testing" OFF)
+ option(LOG_TO_CALLBACK "Enable extended logging through a callback" OFF)
+
+--- ocsync-0.60.2/doc/CMakeLists.txt
++++ ocsync-0.60.2/doc/CMakeLists.txt
+@@ -2,7 +2,10 @@
+ # Build the documentation
+ #
+ 
+-include(UseDoxygen OPTIONAL)
++option(WITH_APIDOC "Use doxygen to generate documentation" ON)
++if (WITH_APIDOC)
++  include(UseDoxygen OPTIONAL)
++endif (WITH_APIDOC)
+ 
+ file(GLOB _manpages *.[0-9].txt)
+ add_custom_target(man
+
+--- ocsync-0.60.2/modules/CMakeLists.txt
++++ ocsync-0.60.2/modules/CMakeLists.txt
+@@ -1,8 +1,8 @@
+ project(modules C)
+ 
+-find_package(Libsmbclient)
+-find_package(LibSSH 0.4.0)
+-find_package(Neon)
++macro_optional_find_package(Libsmbclient)
++macro_optional_find_package(LibSSH 0.4.0)
++macro_optional_find_package(Neon)
+ 
+ set(PLUGIN_VERSION_INSTALL_DIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
+ 
diff --git a/net-misc/csync/files/csync-0.60.2-removebadtest.patch b/net-misc/csync/files/csync-0.60.2-removebadtest.patch
new file mode 100644
index 000000000000..5b8a3a6e96b1
--- /dev/null
+++ b/net-misc/csync/files/csync-0.60.2-removebadtest.patch
@@ -0,0 +1,9 @@
+--- a/tests/vio_tests/check_vio.c
++++ b/tests/vio_tests/check_vio.c
+@@ -505,7 +505,6 @@
+         unit_test_setup_teardown(check_csync_vio_mkdirs_some_exist, setup_dir, teardown),
+         unit_test_setup_teardown(check_csync_vio_rmdir, setup, teardown),
+         unit_test_setup_teardown(check_csync_vio_opendir, setup_dir, teardown),
+-        unit_test_setup_teardown(check_csync_vio_opendir_perm, setup, teardown),
+         unit_test(check_csync_vio_closedir_null),
+         unit_test_setup_teardown(check_csync_vio_readdir, setup_dir, teardown),