summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-04-15 18:22:08 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-04-15 18:22:08 +0000
commit9649f0cf0f277f950ccc09fe2709557031d9bb6f (patch)
treeb10b7f66a2a8a82ddbd1f5b3523708eae1b65e6b /net-misc
parentFritzing doesn't need minizip (diff)
downloadgentoo-2-9649f0cf0f277f950ccc09fe2709557031d9bb6f.tar.gz
gentoo-2-9649f0cf0f277f950ccc09fe2709557031d9bb6f.tar.bz2
gentoo-2-9649f0cf0f277f950ccc09fe2709557031d9bb6f.zip
Version bump. Remove old.
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/csync/ChangeLog9
-rw-r--r--net-misc/csync/csync-0.70.6.ebuild (renamed from net-misc/csync/csync-0.70.3.ebuild)39
-rw-r--r--net-misc/csync/files/csync-0.60.2-automagicness.patch102
-rw-r--r--net-misc/csync/files/csync-0.60.4-automagicness.patch101
-rw-r--r--net-misc/csync/files/csync-automagicness.patch123
5 files changed, 24 insertions, 350 deletions
diff --git a/net-misc/csync/ChangeLog b/net-misc/csync/ChangeLog
index fe5f40259797..4853cc3a4698 100644
--- a/net-misc/csync/ChangeLog
+++ b/net-misc/csync/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-misc/csync
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.14 2013/03/11 19:39:39 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.15 2013/04/15 18:22:08 kensington Exp $
+
+*csync-0.70.6 (15 Apr 2013)
+
+ 15 Apr 2013; Michael Palimaka <kensington@gentoo.org> +csync-0.70.6.ebuild,
+ -csync-0.70.3.ebuild, -files/csync-0.60.2-automagicness.patch,
+ -files/csync-0.60.4-automagicness.patch, -files/csync-automagicness.patch:
+ Version bump. Remove old.
*csync-0.70.4-r1 (11 Mar 2013)
diff --git a/net-misc/csync/csync-0.70.3.ebuild b/net-misc/csync/csync-0.70.6.ebuild
index e2eb48fbf256..bf354493ed18 100644
--- a/net-misc/csync/csync-0.70.3.ebuild
+++ b/net-misc/csync/csync-0.70.6.ebuild
@@ -1,10 +1,10 @@
# 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.3.ebuild,v 1.1 2013/01/31 15:25:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.70.6.ebuild,v 1.1 2013/04/15 18:22:08 kensington Exp $
EAPI=5
-inherit base cmake-utils
+inherit cmake-utils
DESCRIPTION="A file synchronizer especially designed for you, the normal user"
HOMEPAGE="http://csync.org/"
@@ -13,17 +13,15 @@ SRC_URI="http://download.owncloud.com/download/o${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc iconv log samba +sftp test +webdav"
+IUSE="doc iconv samba +sftp test"
RDEPEND="
dev-db/sqlite:3
>=dev-libs/iniparser-3.1
- dev-libs/openssl:0
+ net-libs/neon[ssl]
iconv? ( virtual/libiconv )
- log? ( dev-libs/log4c )
samba? ( net-fs/samba )
sftp? ( net-libs/libssh )
- webdav? ( net-libs/neon )
"
DEPEND="${DEPEND}
app-text/asciidoc
@@ -32,36 +30,31 @@ DEPEND="${DEPEND}
"
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
+ cmake-utils_src_prepare
# proper docdir
- sed -i \
- -e "s:/doc/ocsync:/doc/${PF}:" \
- doc/CMakeLists.txt || die
+ sed -e "s:/doc/ocsync:/doc/${PF}:" \
+ -i 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_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/"
+}
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 426d83097e64..000000000000
--- 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.4-automagicness.patch b/net-misc/csync/files/csync-0.60.4-automagicness.patch
deleted file mode 100644
index 07ed73c46345..000000000000
--- a/net-misc/csync/files/csync-0.60.4-automagicness.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- 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}")
-
diff --git a/net-misc/csync/files/csync-automagicness.patch b/net-misc/csync/files/csync-automagicness.patch
deleted file mode 100644
index 76e033c283d1..000000000000
--- 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
---- csync-0.50.8.old/cmake/Modules/MacroOptionalFindPackage.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ 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}")
-