Version bump. Reroll automagic patch, add dev-libs/check dependency

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

3 files changed, 166 insertions, 2 deletions

diff --git a/net-misc/csync/ChangeLog b/net-misc/csync/ChangeLog
index 4a8a379994e9..764bc5f43369 100644
--- a/net-misc/csync/ChangeLog
+++ b/net-misc/csync/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2012/12/21 13:23:42 creffett Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.11 2013/01/22 20:51:58 creffett Exp $
+
+*csync-0.70.1 (22 Jan 2013)
+
+  22 Jan 2013; Chris Reffett <creffett@gentoo.org> +csync-0.70.1.ebuild,
+  +files/csync-0.70.1-automagicness.patch:
+  Version bump. Reroll automagic patch, add dev-libs/check dependency
 
 *csync-0.60.4 (21 Dec 2012)
 
diff --git a/net-misc/csync/csync-0.70.1.ebuild b/net-misc/csync/csync-0.70.1.ebuild
new file mode 100644
index 000000000000..076485da9242
--- /dev/null
+++ b/net-misc/csync/csync-0.70.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.70.1.ebuild,v 1.1 2013/01/22 20:51:58 creffett Exp $
+
+EAPI=5
+
+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/testing/o${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc iconv log samba +sftp test +webdav"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/iniparser-3.1
+	dev-libs/openssl:0
+	iconv? ( virtual/libiconv )
+	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 dev-util/cmocka )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.70.1-automagicness.patch"
+	"${FILESDIR}/${PN}-0.60.2-removebadtest.patch"
+)
+
+S="${WORKDIR}/o${P}"
+
+src_prepare() {
+	base_src_prepare
+
+	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}:" \
+		doc/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/files/csync-0.70.1-automagicness.patch b/net-misc/csync/files/csync-0.70.1-automagicness.patch
new file mode 100644
index 000000000000..127ec8bc65d1
--- /dev/null
+++ b/net-misc/csync/files/csync-0.70.1-automagicness.patch
@@ -0,0 +1,91 @@
+--- a/cmake/Modules/MacroOptionalFindPackage.cmake
++++ b/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)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,6 +38,7 @@
+ # add macros
+ include(MacroAddPlugin)
+ include(MacroCopyFile)
++include(MacroOptionalFindPackage)
+ 
+ find_package(Iconv)
+ find_package(CMocka)
+
+--- a/doc/CMakeLists.txt
++++ b/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
+
+--- a/modules/CMakeLists.txt
++++ b/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}")
+