Version bump. Remove old.

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

4 files changed, 17 insertions, 117 deletions

diff --git a/net-misc/csync/ChangeLog b/net-misc/csync/ChangeLog
index 4853cc3a4698..5623470d50f1 100644
--- a/net-misc/csync/ChangeLog
+++ b/net-misc/csync/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2013/04/15 18:22:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.16 2013/04/29 15:53:42 kensington Exp $
+
+*csync-0.70.7 (29 Apr 2013)
+
+  29 Apr 2013; Michael Palimaka <kensington@gentoo.org> +csync-0.70.7.ebuild,
+  -csync-0.70.4-r1.ebuild, -files/csync-0.70.1-automagicness.patch:
+  Version bump. Remove old.
 
 *csync-0.70.6 (15 Apr 2013)
 
diff --git a/net-misc/csync/csync-0.70.4-r1.ebuild b/net-misc/csync/csync-0.70.7.ebuild
index 625115cb2dfe..8ee0d8705a7a 100644
--- a/net-misc/csync/csync-0.70.4-r1.ebuild
+++ b/net-misc/csync/csync-0.70.7.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.4-r1.ebuild,v 1.1 2013/03/11 19:39:39 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.70.7.ebuild,v 1.1 2013/04/29 15:53:42 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,25 @@ 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
 }
diff --git a/net-misc/csync/files/csync-0.70.1-automagicness.patch b/net-misc/csync/files/csync-0.70.1-automagicness.patch
deleted file mode 100644
index 127ec8bc65d1..000000000000
--- a/net-misc/csync/files/csync-0.70.1-automagicness.patch
+++ /dev/null
@@ -1,91 +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,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}")
- 
diff --git a/net-misc/csync/metadata.xml b/net-misc/csync/metadata.xml
index a8da3891d8ce..788713115f6a 100644
--- a/net-misc/csync/metadata.xml
+++ b/net-misc/csync/metadata.xml
@@ -3,8 +3,6 @@
 <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>