* [gentoo-commits] proj/kde:master commit in: net-misc/csync/files/, net-misc/csync/
@ 2012-11-29 16:30 Chris Reffett
0 siblings, 0 replies; 3+ messages in thread
From: Chris Reffett @ 2012-11-29 16:30 UTC (permalink / raw
To: gentoo-commits
commit: b922e4f2a46ceaf8222da4bba87e832e523b9329
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 16:29:13 2012 +0000
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Thu Nov 29 16:29:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b922e4f2
[net-misc/csync] Version bump for testing. Tests restricted until I have an ebuild for cmocka available.
Package-Manager: portage-2.2.0_alpha142
---
net-misc/csync/csync-0.60.2.ebuild | 71 +++++++++++
.../csync/files/csync-0.60.2-automagicness.patch | 102 ++++++++++++++++
net-misc/csync/files/csync-automagicness.patch | 123 ++++++++++++++++++++
net-misc/csync/metadata.xml | 10 ++
4 files changed, 306 insertions(+), 0 deletions(-)
diff --git a/net-misc/csync/csync-0.60.2.ebuild b/net-misc/csync/csync-0.60.2.ebuild
new file mode 100644
index 0000000..4e9f5b8
--- /dev/null
+++ b/net-misc/csync/csync-0.60.2.ebuild
@@ -0,0 +1,71 @@
+# 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.1.ebuild,v 1.1 2012/11/16 19:39:11 johu 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/o${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 )
+"
+
+RESTRICT="test"
+#until we have an ebuild for cmocka at least
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.60.2-automagicness.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
+
+ # punt owncloud test as it uses weird cmocka framework
+ sed -i \
+ -e 's:add_subdirectory(ownCloud)::' \
+ tests/CMakeLists.txt || die
+ # 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.60.2-automagicness.patch b/net-misc/csync/files/csync-0.60.2-automagicness.patch
new file mode 100644
index 0000000..426d830
--- /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-automagicness.patch b/net-misc/csync/files/csync-automagicness.patch
new file mode 100644
index 0000000..ed24341
--- /dev/null
+++ b/net-misc/csync/files/csync-automagicness.patch
@@ -0,0 +1,123 @@
+diff -urN csync-0.50.8.old/cmake/Modules/MacroOptionalFindPackage.cmake csync-0.50.8/cmake/Modules/MacroOptionalFindPackage.cmake
+--- /dev/null
++++ csync-0.50.8/cmake/Modules/MacroOptionalFindPackage.cmake 2012-08-28 13:35:55.312298632 +0200
+@@ -0,0 +1,48 @@
++# - 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)
++
+diff -urN csync-0.50.8.old/CMakeLists.txt csync-0.50.8/CMakeLists.txt
+--- csync-0.50.8.old/CMakeLists.txt 2012-08-28 13:35:05.005298638 +0200
++++ csync-0.50.8/CMakeLists.txt 2012-08-28 13:42:05.150298588 +0200
+@@ -38,9 +38,10 @@
+ # add macros
+ include(MacroAddPlugin)
+ include(MacroCopyFile)
++include(MacroOptionalFindPackage)
+
+-find_package(Log4C)
+-if(NOT LOG4C_FOUND)
++macro_optional_find_package(Log4C)
++if(NOT WITH_Log4C)
+ set(WITH_LOG4C FALSE)
+ endif()
+
+@@ -64,11 +65,11 @@
+ add_subdirectory(config)
+ add_subdirectory(doc)
+
+-find_package(Check)
+-if (CHECK_FOUND)
+- include(MacroAddCheckTest)
+-endif (CHECK_FOUND)
+ if (UNIT_TESTING)
++ find_package(Check)
++ if (CHECK_FOUND)
++ include(MacroAddCheckTest)
++ endif (CHECK_FOUND)
+ add_subdirectory(tests)
+-endif(UNIT_TESTING)
++endif (UNIT_TESTING)
+
+diff -urN csync-0.50.8.old/DefineOptions.cmake csync-0.50.8/DefineOptions.cmake
+--- csync-0.50.8.old/DefineOptions.cmake 2012-08-28 13:35:05.004298638 +0200
++++ csync-0.50.8/DefineOptions.cmake 2012-08-28 13:41:44.838298591 +0200
+@@ -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)
+diff -urN csync-0.50.8.old/doc/CMakeLists.txt csync-0.50.8/doc/CMakeLists.txt
+--- csync-0.50.8.old/doc/CMakeLists.txt 2012-08-28 13:35:05.004298638 +0200
++++ csync-0.50.8/doc/CMakeLists.txt 2012-08-28 13:38:05.055298617 +0200
+@@ -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
+diff -urN csync-0.50.8.old/modules/CMakeLists.txt csync-0.50.8/modules/CMakeLists.txt
+--- csync-0.50.8.old/modules/CMakeLists.txt 2012-08-28 13:35:05.003298638 +0200
++++ csync-0.50.8/modules/CMakeLists.txt 2012-08-28 13:40:25.254298600 +0200
+@@ -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/metadata.xml b/net-misc/csync/metadata.xml
new file mode 100644
index 0000000..a8da389
--- /dev/null
+++ b/net-misc/csync/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+ <use>
+ <flag name="log">Enable logging support via <pkg>dev-libs/log4c</pkg></flag>
+ <flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
+ <flag name="webdav">Adds support for HTTP/dav content via <pkg>net-libs/neon</pkg></flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-misc/csync/files/, net-misc/csync/
@ 2012-11-30 4:49 Chris Reffett
0 siblings, 0 replies; 3+ messages in thread
From: Chris Reffett @ 2012-11-30 4:49 UTC (permalink / raw
To: gentoo-commits
commit: 824b1a28d43b664a70fac0ed4bc555b1c9370eba
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 04:47:12 2012 +0000
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Fri Nov 30 04:47:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=824b1a28
[net-misc/csync] Unrestrict tests with addition of cmocka. Add patch to remove one bad test.
Package-Manager: portage-2.2.0_alpha142
---
net-misc/csync/csync-0.60.2.ebuild | 9 ++-------
.../csync/files/csync-0.60.2-removebadtest.patch | 9 +++++++++
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/net-misc/csync/csync-0.60.2.ebuild b/net-misc/csync/csync-0.60.2.ebuild
index 4e9f5b8..d94e409 100644
--- a/net-misc/csync/csync-0.60.2.ebuild
+++ b/net-misc/csync/csync-0.60.2.ebuild
@@ -27,13 +27,12 @@ RDEPEND="
DEPEND="${DEPEND}
app-text/asciidoc
doc? ( app-doc/doxygen )
+ test? ( dev-util/cmocka )
"
-RESTRICT="test"
-#until we have an ebuild for cmocka at least
-
PATCHES=(
"${FILESDIR}/${PN}-0.60.2-automagicness.patch"
+ "${FILESDIR}/${PN}-0.60.2-removebadtest.patch"
)
S="${WORKDIR}/o${P}"
@@ -47,10 +46,6 @@ src_prepare() {
CMakeLists.txt || die
fi
- # punt owncloud test as it uses weird cmocka framework
- sed -i \
- -e 's:add_subdirectory(ownCloud)::' \
- tests/CMakeLists.txt || die
# proper docdir
sed -i \
-e "s:/doc/ocsync:/doc/${PF}:" \
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 0000000..5b8a3a6
--- /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),
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-misc/csync/files/, net-misc/csync/
@ 2012-12-14 17:23 Chris Reffett
0 siblings, 0 replies; 3+ messages in thread
From: Chris Reffett @ 2012-12-14 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 20a224cc50e11d023e7a49e8c9cc1753c98473fe
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 17:21:26 2012 +0000
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Fri Dec 14 17:21:26 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=20a224cc
[net-misc/csync] Moved to tree.
---
net-misc/csync/csync-0.60.3.ebuild | 66 -----------
.../csync/files/csync-0.60.2-automagicness.patch | 102 ----------------
.../csync/files/csync-0.60.2-removebadtest.patch | 9 --
net-misc/csync/files/csync-automagicness.patch | 123 --------------------
net-misc/csync/metadata.xml | 10 --
5 files changed, 0 insertions(+), 310 deletions(-)
diff --git a/net-misc/csync/csync-0.60.3.ebuild b/net-misc/csync/csync-0.60.3.ebuild
deleted file mode 100644
index d94e409..0000000
--- a/net-misc/csync/csync-0.60.3.ebuild
+++ /dev/null
@@ -1,66 +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.60.1.ebuild,v 1.1 2012/11/16 19:39:11 johu 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/o${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-util/cmocka )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.60.2-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.60.2-automagicness.patch b/net-misc/csync/files/csync-0.60.2-automagicness.patch
deleted file mode 100644
index 426d830..0000000
--- a/net-misc/csync/files/csync-0.60.2-automagicness.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- 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
deleted file mode 100644
index 5b8a3a6..0000000
--- a/net-misc/csync/files/csync-0.60.2-removebadtest.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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),
diff --git a/net-misc/csync/files/csync-automagicness.patch b/net-misc/csync/files/csync-automagicness.patch
deleted file mode 100644
index ed24341..0000000
--- a/net-misc/csync/files/csync-automagicness.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -urN csync-0.50.8.old/cmake/Modules/MacroOptionalFindPackage.cmake csync-0.50.8/cmake/Modules/MacroOptionalFindPackage.cmake
---- /dev/null
-+++ csync-0.50.8/cmake/Modules/MacroOptionalFindPackage.cmake 2012-08-28 13:35:55.312298632 +0200
-@@ -0,0 +1,48 @@
-+# - 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)
-+
-diff -urN csync-0.50.8.old/CMakeLists.txt csync-0.50.8/CMakeLists.txt
---- csync-0.50.8.old/CMakeLists.txt 2012-08-28 13:35:05.005298638 +0200
-+++ csync-0.50.8/CMakeLists.txt 2012-08-28 13:42:05.150298588 +0200
-@@ -38,9 +38,10 @@
- # add macros
- include(MacroAddPlugin)
- include(MacroCopyFile)
-+include(MacroOptionalFindPackage)
-
--find_package(Log4C)
--if(NOT LOG4C_FOUND)
-+macro_optional_find_package(Log4C)
-+if(NOT WITH_Log4C)
- set(WITH_LOG4C FALSE)
- endif()
-
-@@ -64,11 +65,11 @@
- add_subdirectory(config)
- add_subdirectory(doc)
-
--find_package(Check)
--if (CHECK_FOUND)
-- include(MacroAddCheckTest)
--endif (CHECK_FOUND)
- if (UNIT_TESTING)
-+ find_package(Check)
-+ if (CHECK_FOUND)
-+ include(MacroAddCheckTest)
-+ endif (CHECK_FOUND)
- add_subdirectory(tests)
--endif(UNIT_TESTING)
-+endif (UNIT_TESTING)
-
-diff -urN csync-0.50.8.old/DefineOptions.cmake csync-0.50.8/DefineOptions.cmake
---- csync-0.50.8.old/DefineOptions.cmake 2012-08-28 13:35:05.004298638 +0200
-+++ csync-0.50.8/DefineOptions.cmake 2012-08-28 13:41:44.838298591 +0200
-@@ -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)
-diff -urN csync-0.50.8.old/doc/CMakeLists.txt csync-0.50.8/doc/CMakeLists.txt
---- csync-0.50.8.old/doc/CMakeLists.txt 2012-08-28 13:35:05.004298638 +0200
-+++ csync-0.50.8/doc/CMakeLists.txt 2012-08-28 13:38:05.055298617 +0200
-@@ -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
-diff -urN csync-0.50.8.old/modules/CMakeLists.txt csync-0.50.8/modules/CMakeLists.txt
---- csync-0.50.8.old/modules/CMakeLists.txt 2012-08-28 13:35:05.003298638 +0200
-+++ csync-0.50.8/modules/CMakeLists.txt 2012-08-28 13:40:25.254298600 +0200
-@@ -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/metadata.xml b/net-misc/csync/metadata.xml
deleted file mode 100644
index a8da389..0000000
--- a/net-misc/csync/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
- <use>
- <flag name="log">Enable logging support via <pkg>dev-libs/log4c</pkg></flag>
- <flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
- <flag name="webdav">Adds support for HTTP/dav content via <pkg>net-libs/neon</pkg></flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-14 17:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-29 16:30 [gentoo-commits] proj/kde:master commit in: net-misc/csync/files/, net-misc/csync/ Chris Reffett
-- strict thread matches above, loose matches on Subject: below --
2012-11-30 4:49 Chris Reffett
2012-12-14 17:23 Chris Reffett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox