Version bump.

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

4 files changed, 182 insertions, 5 deletions

diff --git a/net-misc/csync/ChangeLog b/net-misc/csync/ChangeLog
index 6c4e6ca62d9d..4a8a379994e9 100644
--- a/net-misc/csync/ChangeLog
+++ b/net-misc/csync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/csync
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.9 2012/12/14 17:18:48 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.10 2012/12/21 13:23:42 creffett Exp $
+
+*csync-0.60.4 (21 Dec 2012)
+
+  21 Dec 2012; Chris Reffett <creffett@gentoo.org> +csync-0.60.4.ebuild,
+  +files/csync-0.60.4-automagicness.patch:
+  Version bump.
 
 *csync-0.60.3 (14 Dec 2012)
 
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index 63042b62a580..adf52168f09d 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -3,17 +3,20 @@ Hash: SHA256
 
 AUX csync-0.60.2-automagicness.patch 3549 SHA256 8a7a2d6cef0a6edd1691976f678cdd345112c711183327cb7b725a71df96f388 SHA512 55e533326ce7c44973189b6d49fac1edb75263f5d1c7d1a41461578757e685cd5b170dac920a3d2bbcb721f52a7fb23c975679cd47bed96c5d9a1f03eb4578c2 WHIRLPOOL 291b989b81a7dc99c78b66933ca65af4c469ac71a3777381ca66184820af0e27c727526e61652a5acffe399f843f865794380b7323703a49f7fa0ae3fc825972
 AUX csync-0.60.2-removebadtest.patch 549 SHA256 4a25b6a123d67bdf71175baedf382fae93c51d2a578dc50648fde79a322f9c90 SHA512 ac66409b68160d7e0af269707cb35f4a3de0eebcb8c114fa355e2dad18a28e0e11906d1b2cedce1e2c54e1f222db081c0574a36421390cdfb4b89e08c63579f1 WHIRLPOOL 0f9118824c220d154fedd49bb5503d43697646b9c9c6a48315da0ab6d155aeba48b979b45921533f1ee661fc6b08c8bcba6a62a58261ef83bf59a61710246099
+AUX csync-0.60.4-automagicness.patch 3292 SHA256 1bce874bfec6f687ad40f9e32706a10307ee5c0f02d470c6cb303cb854960e23 SHA512 e234c1ee2a72c35502cc9f8767369c90944a3a07a52349d548ad93907dbd1b943241f0efaeefc5ec9539af476b182f4aeaca992192da86b6a81749d7756f055b WHIRLPOOL f5fcda5fdbdb4f8245f83fcf283ca0ceed58d9668f31bf45d79a4d2e8b8c9cdf8f4b0f34b9b37fa4e30e1daa198e1838544141e9631b4dbd4900f85108721c9a
 AUX csync-automagicness.patch 4705 SHA256 6129f07257a42ad9e2440aeac7222279f10734cbe99cf5ef7c3ae1edbc260fc6 SHA512 5d974b5e79ac0ee4421982235b8b1e4ad2b303d5fdaf889db3bf1c4bf01e78e2dae36a7c364008141abf9fffca43ff5325720bbdfe607c2a23fbb6b35a1d1924 WHIRLPOOL 8acefc7cdf83cfa5a367fe02d47cb0aff0bc2fc165db8bbe93f6b3119ede9cd20aa7219b40853fa43cb0befdf981992b5cc703c3041eb51267a4eabf493b4d57
 DIST ocsync-0.60.1.tar.bz2 2101539 SHA256 8ef3ecd717030fab2bf1a5b94d9145de755454334bf97bd0929cec1997ad82d6 SHA512 59e0304121799509edba8b81a468515dab53ff96d680a8c32480e82817c17d364d6c9806b4ec3c5c9984df0b03d2cca290df5a3244a92d9e6c5fd6afa32e335e WHIRLPOOL 243ed110a67ec3d08d5dbeba5b8a3bdd013df5b491dfc3af2e626146c7a761071a5ad4032998d5363fdc9c02faba8ae2a8e4fbfa166884bed4699b955ead138b
 DIST ocsync-0.60.3.tar.bz2 2102126 SHA256 86d431f33207d6b082c2f0ddad8b0880461b37c938c927802408867e87928fad SHA512 1ec324ded7a7bda08f3d6a4f68335b478797cf5497b7df4bfec45c2c5c4ce8faf62331559a1e940bda93e5e40724266670ff11fccc84753b0f8fcdf8f5bf4ce7 WHIRLPOOL 36afd7a26fd62bfee0f0912d4c892079854a39fea020e1a36fa059b6be6e9a68e0e632d2dafcfe4ce99a563f03a4af18664f6e338154264e4d10a111f3bd8964
+DIST ocsync-0.60.4.tar.bz2 2103581 SHA256 a1c4365687f3ee2a29e3f322c222edc6499d0498b754c41675391dc4e983a154 SHA512 180140b81b3b4f3b80c53c3bedbcc9daa6437bac2cdbc76038b2e34e050841a6f8ee7d959797780b0e15ca56461ec9af7ecb46c72d357f7777398a16c85c9d54 WHIRLPOOL d49fe4d1cb5e1f0f467bbd9a6284dcd4cd0fdc82b26a70b9e6216c6f37009805be3c82d2af7b6302dffd6e6e9102cefd6328c2a356f2c164e1eaaa13f3d9c14c
 EBUILD csync-0.60.1.ebuild 1546 SHA256 05250dadf43f6b0a9165201604a294931d6c90d693f82a807df062c3f2063051 SHA512 9a560a9c50bd3f17ea17be7fc0cae3eedf37a48ca049bb0632237774a968a3d1562981060e9b0f2272ba97e23ff7d90adbd26e2443127cd207174cf4586e0da0 WHIRLPOOL 34570be2626817a4eac1da176b5d58fb60072fc96fcf7405af4eb1166c154a9ecfac5d8c4f27b0a4f3cc77724ee884900f971d22eb7feae7c6e52035441ce1a8
 EBUILD csync-0.60.3.ebuild 1470 SHA256 be7005d5142d475f0aa73e19819dda2d9a9301cc34dfc1e44d737c115fe7564e SHA512 864e9e0596c9de9339d9fafd4bb524a1d241fa38060bc8d219ca16541ec4fab65dc5b901244db211b79708e39ea00eab7ac8f535938c78ad2b2e5517e40b57a4 WHIRLPOOL 4029974ecdbfc2ab2b23f55fc42bc0bb84bef739ffc28c901247983f1e71dd6514aa3daca6ba27d13545d24a4b61363c2dbaec59b9ac7a3e49c7254e0ce8042c
-MISC ChangeLog 1513 SHA256 477ea769b0273c42e4b3079a038da1be73b6b85538859531c961eff2e9920947 SHA512 6eff73ca6ea93a1bd29d7de38602dac2368733e2b8541cbd13a880eaacebedee90929da8e7cc1510d41ffd66f596ed11773335814a6ff6f7827a2fa1cbb29ec8 WHIRLPOOL 14d827639594035531062154445d0384d0a4b27c37865e2523f76f5a344f8514c4c03d756a0a38cb380bab90b4e71e85347085847c2bfaec2f2564b09e2cbe91
+EBUILD csync-0.60.4.ebuild 1505 SHA256 6a9142decb5d08fd95cefe779efebc97a2add86e393fff0e827b127b24f07ba7 SHA512 b5272418d8abf80f9b6e046fe9f93718e03569afa31fcadd066b26ba85d69b884340844259e9390151613be30a4c5d5dd4944cc2d27d75c4fd1827b2815a44ca WHIRLPOOL 6c2a13b889023ced0acd26ac1e8e1bee398a84a48196b5a9b563b70b349eab1bc60893d95d0135940c52cdeed6209eb3d39ca7f472d6c0dd86c231b3aec0ffd0
+MISC ChangeLog 1676 SHA256 f50cf9cb59ac10fae361158c2e913e26ba98829ae58014de3b9b42743a069b2a SHA512 1078951bc9461f3ae9c4e29ea1c6e83d875e039f3c7fef898124872692d5dc5020899f770570df5bf132820baf7a9e9e3319aa9dfd7f9ba4b852b4672a14cabb WHIRLPOOL 73b48294a87739e3f35549f7beb93609d492459cc5bcbc9252b00243fc186963aad6077b155c7ec220c2aae018ef03906659917e3f6f80a07253e3c1d885fed1
 MISC metadata.xml 430 SHA256 464dc5e0f521a67ea4e9d9caa6fb7b39ab5087c8477abc3ef1f9479c0ccf8cb5 SHA512 54c512f14aa6640a6e59fe5d7d55079a0457fc14301bb85afc0eb32629daf482f4aed5f9583d4709dcc3ed6cb7e22b00d3af5ae0fde7dbf82296109afd87a0a0 WHIRLPOOL f0b55789474b16a29f27382e1c69df224633264e81d69b7c7c77c7efe0ebd673e625a08b78da748b13b3d1f2d5ae49b461f387e06873872e4d820e055fdc73c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDLX3IACgkQ23laikJhg1TxEQCbBIhIQ3/PdnyYsgl/+RCj10T0
-nP0Ani9uwA+2Oq3bNDfMAaUDDtsR6vbS
-=M0Ax
+iEYEAREIAAYFAlDUYsoACgkQ23laikJhg1T6PQCglrErmMDARNmNq9wlPwniwJYu
+w9sAn0jJZUmxlVIObHcKJJjRqNDsWTHd
+=Dp9X
 -----END PGP SIGNATURE-----
diff --git a/net-misc/csync/csync-0.60.4.ebuild b/net-misc/csync/csync-0.60.4.ebuild
new file mode 100644
index 000000000000..9f16f8c160bc
--- /dev/null
+++ b/net-misc/csync/csync-0.60.4.ebuild
@@ -0,0 +1,67 @@
+# 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.4.ebuild,v 1.1 2012/12/21 13:23:42 creffett 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 iconv log samba +sftp test +webdav"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/iniparser-3.1
+	dev-libs/openssl:0
+	iconv? ( virtual/libiconv )
+	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.4-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.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}")
+