Version bump.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

1 files changed, 101 insertions, 0 deletions

diff --git a/net-misc/csync/files/csync-0.60.4-automagicness.patch b/net-misc/csync/files/csync-0.60.4-automagicness.patch
new file mode 100644
index 000000000000..07ed73c46345
--- /dev/null
+++ b/net-misc/csync/files/csync-0.60.4-automagicness.patch
@@ -0,0 +1,101 @@
+--- 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,8 +38,8 @@
+ # add macros
+ include(MacroAddPlugin)
+ include(MacroCopyFile)
++include(MacroOptionalFindPackage)
+ 
+-find_package(Log4C)
+ find_package(Iconv)
+ find_package(CMocka)
+ if (CMOCKA_FOUND AND UNIT_TESTING)
+
+--- a/DefineOptions.cmake
++++ b/DefineOptions.cmake
+@@ -1,4 +1,3 @@
+-option(WITH_LOG4C "Build csync without log4c" ON)
+ if ( NOT WIN32 )
+     option(WITH_ICONV "Build csync with iconv support" ON)
+ endif()
+
+--- 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}")
+