Version bump. Remove old.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 28 insertions, 129 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/Manifest b/net-misc/csync/Manifest
index b12e33e08136..a4f2ef422de5 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -2,21 +2,20 @@
 Hash: SHA256
 
 AUX csync-0.60.2-removebadtest.patch 549 SHA256 4a25b6a123d67bdf71175baedf382fae93c51d2a578dc50648fde79a322f9c90 SHA512 ac66409b68160d7e0af269707cb35f4a3de0eebcb8c114fa355e2dad18a28e0e11906d1b2cedce1e2c54e1f222db081c0574a36421390cdfb4b89e08c63579f1 WHIRLPOOL 0f9118824c220d154fedd49bb5503d43697646b9c9c6a48315da0ab6d155aeba48b979b45921533f1ee661fc6b08c8bcba6a62a58261ef83bf59a61710246099
-AUX csync-0.70.1-automagicness.patch 3028 SHA256 bbf7a1cf87cb606f9bbff3a7de032f90d1f010c5340ca047771bdaf00a7821a4 SHA512 243a8d4d88557d9a9bbf1bef175c01cf923ec3a71080ca0df4f675049cc1ec21a005f69e5a568c96138bab67b01871a9c79ad7aba57676c3471b0b89e7e4d459 WHIRLPOOL 5ef63a97730f6d3afee08e01d5f6f6305471647234f8b7125f14fa06074390e01bcf15e646d552a1f3a5dcec1380c70b9b16401ebd40bc4d32ff4aa81df61aca
-DIST ocsync-0.70.4.tar.bz2 2105772 SHA256 e368e816d4f41c75eaad5854176b37ab57ac23c82f85cdd4799b695be8cec410 SHA512 af9fd3701ffc35e2fcc358c2f85011a065c6e7832b90418fac15ac0f956a61dfe75e07ae46b87696fb246bfcdad5bbf08580117c901042175e5d33d088f080e3 WHIRLPOOL d6c935959c077cc8654a8fc57420e91334bc093604b8d7b5478fd536a80b6c374b25e9fdf3bd4bd825d7e236b1ab19840d05128c14cb1702811598499f91177e
 DIST ocsync-0.70.6.tar.bz2 2107945 SHA256 b64bcbd59b6adb4666b2ed5c04dad28803b35364ed9c1e633d409a5be2e2a002 SHA512 a8f1c2d2fc55e1eb6cb566d833632325c8b74b7a526a7684f58aadf6ab145ba6a8547c02c070cbf905899fb7f4fd7286e545c9468e99c1e93252aa6390346e07 WHIRLPOOL 5b651090a185db7437b1d254ac94dd568679e9153a48120124b97d98cc6636f4a7396df53620fa2dffd920ef446119bccadaeb650566815632c53014229e8fa1
-EBUILD csync-0.70.4-r1.ebuild 1628 SHA256 4f86012d6f963afb5bcdeb551c5e281c0d7ed542fc0350d44ca943fae0a8b56b SHA512 e293ddb084a929a92377d8e39ad3eae65e8790ba3e8e8ab7341cf1b443b56894ea73aa61a014c01d05c4b6247a2b5a31b743657150c27e1b1885569c1adf8158 WHIRLPOOL 1a7b0c954767ec381abd7d3fdaf2a2224ed2f070d3a54f1795df060a4c1bcf0cab32690824ac1c7d049dc2ed07e9a95567bbd879ffac5e07dc4fc1e4a5390e02
+DIST ocsync-0.70.7.tar.bz2 2108498 SHA256 571c7a822a8e30966c3a7e61a5218b49e8d52e70e8a8ec80d16db786d60bb324 SHA512 3642212c5782d545b450ae507c51c523c9b7df62ead8915b512aa52bdbf37456aa81af33f3ded27e8139691bfd31899988364e108270b28e6e61ab595ca3986e WHIRLPOOL 351392fdeacb9f0d43f244194737917c7141316128a051e722d426188c43c56deccddd05fdaced6eebee6f428af5ab21ff80500e13a6722efd653262c64d7526
 EBUILD csync-0.70.6.ebuild 1342 SHA256 7644b25a2a7d7d2f6ffddef91d80c77a629a6f90e4ee58df3267dfa1cceb5f63 SHA512 8f60d9f7bcbcb85439d6e1498e08979faaaeb674d3577b8af8221873f1b6ea523520d1b7bb8a4f029c7b8d5cf7f455f5046a32edbdd962fb6a1d8cb4fcfdac46 WHIRLPOOL fae4b125115b1d1eb2c41d82e34cda37b20232daaf5195bc7b6f321d3d4815f964e0df8bf2235a4366c9b5d8c222ddbffcc90256642ba1235ac394ec2dbbf258
-MISC ChangeLog 2766 SHA256 969a5818575aa89facbc4fedcf03e13c8f08f276d1b0d299f5fb56856c201737 SHA512 4a98657999e48a448b67529c392dec348462ce160f600471d7dbe3b7cec897f8e169d1068ebfcf6d1ce51be2a03d7c9b12fb7321eca77e315b7b3ecac7693350 WHIRLPOOL 6d8c164df6d91d48064974ab9629db2cce8cf5bf915bd14325cdb42c805f016e462ff2d558742bd50ceee4d1a441caecd63bd19f2eda8d5aff808c76f41ebe01
-MISC metadata.xml 430 SHA256 464dc5e0f521a67ea4e9d9caa6fb7b39ab5087c8477abc3ef1f9479c0ccf8cb5 SHA512 54c512f14aa6640a6e59fe5d7d55079a0457fc14301bb85afc0eb32629daf482f4aed5f9583d4709dcc3ed6cb7e22b00d3af5ae0fde7dbf82296109afd87a0a0 WHIRLPOOL f0b55789474b16a29f27382e1c69df224633264e81d69b7c7c77c7efe0ebd673e625a08b78da748b13b3d1f2d5ae49b461f387e06873872e4d820e055fdc73c3
+EBUILD csync-0.70.7.ebuild 1342 SHA256 5ec68faa98dfd5392e6dacc0bf5fb6854a5baf32a13fe475c960191e0190bc24 SHA512 ec507d734f484214cdff7fe348338a86e7ea09d53ae924bbbff2890fe1835b747fcd21a6e2d8a60bc8709a82f9a70bc2e0543d7b0a9432071f3d7b24aa211299 WHIRLPOOL 0aad3b49260c6926f8cfc9079055e8865388c2b895d9b80f23f1c2e01be59eae28859dbb654f97843aa0bd7c578760548a1dd74c317846053edfb442f156cf0c
+MISC ChangeLog 2970 SHA256 cebbd59faf06375385c59a948e1662011f46a8ab60d3744c4a2b2dbb07644a96 SHA512 faa333f9631b94e36dd29bf48a7533ff40492c166f4e96765dfbf922d0b0192322a32c4e52b19bd12341a8d434a8ed2b766f0f5a103c4769a7b91cd40c24ba64 WHIRLPOOL 8153d2f76bced424a6a4c3318048348394956f148379897419b35d7b9b284f00aa090c987ec15c70ae9f94627cf82c5a3e77a8678ba048366ebc21499f3e26ab
+MISC metadata.xml 259 SHA256 66c8d8fa809bfbcc76fe7664f8f949427d1edf0a3b51db12fb1f2d35c6c562b3 SHA512 17d58dc4ec2272bafbd0a7ee10d43a077d62a171990f07c44bdc3c1651f613384da94292d184ccb823517d3bf38ea3f3e15f234a6be1b7569dbbc2bb0a1b9165 WHIRLPOOL 40d133f88cb48072d602aa38548f2dac9e39db92fe1bbd7b9b6923315734f3c904794628ea6f7c61fbf4e2c75c2cc0946cf7f5ac14155899bd54bb47399c1575
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRbEUnAAoJEMbwO6tnXQ0syQMH/13KYVR9CzFxNZpF/VnFTp2H
-RWBFI3zK7Yd06VMRqo6RBdrQXGNDJ/7iJymDAhIhKvY04Elwkq5gpb830Gx59uQ/
-aJz6TjshKJJia1/DiDXbiKLnloVnhgglApxEel8VKZbvjDSx1C++Kcyhj8nj2prK
-IgxJJqcNtRotHigelPISzmvorkHnUwfJyemU6/Fi7gz/q2wt/XIagwZuwsxXSv8N
-ON43hUl3+aig/Sn7g4arexaILA+5AHrlTY9WZ8/k2gVYGfdB5FXHSuJpo48Q0Z9P
-YhG7rRO26Rxf6/VlbRUxILHHKka6t7rWakL0HXD2LWdQ/NnrVKuMxghECTmn1QE=
-=APhv
+iQEcBAEBCAAGBQJRfpdQAAoJEMbwO6tnXQ0sOUQH/3+x1NEc0s0xhori7WJD0GFL
+mXxg0KA0748PDu1xkKEmHxTuoo2mR7fC+Pnc5jDx3lAuatxKz7l1AsllemgyCHSx
+K1mZA9lRrFqLBRMtzCpn9smvaaeXnOlN2SCYV0ERuHxxCRsEcDLemoz28FfwFWJf
+BTIm+Utcekz+UGAcmxr9TxN87+xgyZgHpuFVaYQF8WdIdI207tTi5ZNnukpIp5Fd
+oOaGdDr20MzhU+t00LEQ+ZaXnEWvC9dNlynUa7k8Lf37rl9cSSVoREgHSGSdmuCB
+Nqw4mmPaPuIkwCLVHewGbx8o1DMewAZoJKBDzEvQRiDqiZc0mLW+di0Sx3zGJyc=
+=4Rzn
 -----END PGP SIGNATURE-----
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>