[gentoo-commits] dev/dev-zero:master commit in: net-misc/csync/

[gentoo-commits] dev/dev-zero:master commit in: net-misc/csync/

[Tiziano Müller]

commit:     2e118ba814441cb8480fcbcbdca5c8d11d47fd6e
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Tue Jul 31 11:39:29 2012 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Jul 31 11:39:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=2e118ba8

Add USE flag to toggler log_to_callback (required by mirall), fix /etc installation.

---
 net-misc/csync/Manifest            |    2 +-
 net-misc/csync/csync-0.50.7.ebuild |   17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index 005172c..3206bc2 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -1,3 +1,3 @@
 AUX 0.50.7-configureable-modules.patch 1490 RMD160 12c2c246e2cefe003190cf734e6d61c5613d2b69 SHA1 e3e4b64204f100e8ff8abf597e3cc4cee95cc2a9 SHA256 8fe77bdaf47f6db263ee8b7024e506735743d8165cb80bbc662a9342accd7945
 DIST csync-0.50.7.tar.bz2 1331719 RMD160 cfcc492cdd6c9a6ab193f6fae4535ba705a6c713 SHA1 3d5428077471bfc8e18de3746867b6ba9f9e8196 SHA256 01d0de237f97cc087ff813be2637c6d2a125ae76f1535f4f9e86d7ef0da0ae56
-EBUILD csync-0.50.7.ebuild 1340 RMD160 361b5cf278157264b8428660b4fd218363084218 SHA1 95b7fef6613070810773e8f363a2df0c6346b405 SHA256 8fc4a08662927fa7feb867502074648776f7584d833299d76fed21fe509e9754
+EBUILD csync-0.50.7.ebuild 1490 RMD160 9813d3e9211b71e7338546569dfcf6dc04c7c92e SHA1 4184799617dba07be9b22a399f61f1df68ed7baf SHA256 0685f7e818588e10519155ffda92c91cc5a7d2a2a90220df91dfb7d0d862c260

diff --git a/net-misc/csync/csync-0.50.7.ebuild b/net-misc/csync/csync-0.50.7.ebuild
index 118f329..775a706 100644
--- a/net-misc/csync/csync-0.50.7.ebuild
+++ b/net-misc/csync/csync-0.50.7.ebuild
@@ -4,22 +4,23 @@
 
 EAPI=4
 
-MY_P="csync-${PV}"
-
 inherit cmake-utils
 
 DESCRIPTION="Bidirectional file synchronizer (ownCloud fork)"
 HOMEPAGE="http://www.csync.org/ http://owncloud.org/sync-clients/"
-SRC_URI="http://download.owncloud.com/download/${MY_P}.tar.bz2"
+SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="owncloud"
 KEYWORDS="~amd64"
-IUSE="doc log samba sftp test +owncloud"
+IUSE="doc +log2callback log4c samba sftp test +owncloud"
+
+# no point in adding log4c dependency if log2callback is active
+REQUIRED_USE="log2callback? ( !log4c )"
 
 RDEPEND="dev-db/sqlite:3
 	dev-libs/iniparser
-	log? ( dev-libs/log4c )
+	log4c? ( dev-libs/log4c )
 	samba? ( net-fs/samba )
 	sftp? ( net-libs/libssh[sftp] )
 	owncloud? ( net-libs/neon )"
@@ -27,15 +28,14 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( dev-libs/check )"
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( "AUTHORS" "ChangeLog" "README" "doc/csync.txt" )
 HTML_DOCS=( "doc/userguide" )
 PATCHES=( "${FILESDIR}/${PV}-configureable-modules.patch" )
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with log LOG4C)
+		$(cmake-utils_use log2callback LOG_TO_CALLBACK)
+		$(cmake-utils_use_with log4c LOG4C)
 		$(cmake-utils_use_want owncloud OWNCLOUD)
 		$(cmake-utils_use_want samba SMB)
 		$(cmake-utils_use_want sftp SFTP)
@@ -51,6 +51,7 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
+	mv "${D}"/{usr,}/etc
 	rm -rf "${D}/usr/share/doc/${PN}"
 	use doc && dohtml -p api "${CMAKE_BUILD_DIR}/doc/html/"
 }