1 |
commit: 2e118ba814441cb8480fcbcbdca5c8d11d47fd6e |
2 |
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch> |
3 |
AuthorDate: Tue Jul 31 11:39:29 2012 +0000 |
4 |
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 31 11:39:29 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=2e118ba8 |
7 |
|
8 |
Add USE flag to toggler log_to_callback (required by mirall), fix /etc installation. |
9 |
|
10 |
--- |
11 |
net-misc/csync/Manifest | 2 +- |
12 |
net-misc/csync/csync-0.50.7.ebuild | 17 +++++++++-------- |
13 |
2 files changed, 10 insertions(+), 9 deletions(-) |
14 |
|
15 |
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest |
16 |
index 005172c..3206bc2 100644 |
17 |
--- a/net-misc/csync/Manifest |
18 |
+++ b/net-misc/csync/Manifest |
19 |
@@ -1,3 +1,3 @@ |
20 |
AUX 0.50.7-configureable-modules.patch 1490 RMD160 12c2c246e2cefe003190cf734e6d61c5613d2b69 SHA1 e3e4b64204f100e8ff8abf597e3cc4cee95cc2a9 SHA256 8fe77bdaf47f6db263ee8b7024e506735743d8165cb80bbc662a9342accd7945 |
21 |
DIST csync-0.50.7.tar.bz2 1331719 RMD160 cfcc492cdd6c9a6ab193f6fae4535ba705a6c713 SHA1 3d5428077471bfc8e18de3746867b6ba9f9e8196 SHA256 01d0de237f97cc087ff813be2637c6d2a125ae76f1535f4f9e86d7ef0da0ae56 |
22 |
-EBUILD csync-0.50.7.ebuild 1340 RMD160 361b5cf278157264b8428660b4fd218363084218 SHA1 95b7fef6613070810773e8f363a2df0c6346b405 SHA256 8fc4a08662927fa7feb867502074648776f7584d833299d76fed21fe509e9754 |
23 |
+EBUILD csync-0.50.7.ebuild 1490 RMD160 9813d3e9211b71e7338546569dfcf6dc04c7c92e SHA1 4184799617dba07be9b22a399f61f1df68ed7baf SHA256 0685f7e818588e10519155ffda92c91cc5a7d2a2a90220df91dfb7d0d862c260 |
24 |
|
25 |
diff --git a/net-misc/csync/csync-0.50.7.ebuild b/net-misc/csync/csync-0.50.7.ebuild |
26 |
index 118f329..775a706 100644 |
27 |
--- a/net-misc/csync/csync-0.50.7.ebuild |
28 |
+++ b/net-misc/csync/csync-0.50.7.ebuild |
29 |
@@ -4,22 +4,23 @@ |
30 |
|
31 |
EAPI=4 |
32 |
|
33 |
-MY_P="csync-${PV}" |
34 |
- |
35 |
inherit cmake-utils |
36 |
|
37 |
DESCRIPTION="Bidirectional file synchronizer (ownCloud fork)" |
38 |
HOMEPAGE="http://www.csync.org/ http://owncloud.org/sync-clients/" |
39 |
-SRC_URI="http://download.owncloud.com/download/${MY_P}.tar.bz2" |
40 |
+SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2" |
41 |
|
42 |
LICENSE="GPL-2" |
43 |
SLOT="owncloud" |
44 |
KEYWORDS="~amd64" |
45 |
-IUSE="doc log samba sftp test +owncloud" |
46 |
+IUSE="doc +log2callback log4c samba sftp test +owncloud" |
47 |
+ |
48 |
+# no point in adding log4c dependency if log2callback is active |
49 |
+REQUIRED_USE="log2callback? ( !log4c )" |
50 |
|
51 |
RDEPEND="dev-db/sqlite:3 |
52 |
dev-libs/iniparser |
53 |
- log? ( dev-libs/log4c ) |
54 |
+ log4c? ( dev-libs/log4c ) |
55 |
samba? ( net-fs/samba ) |
56 |
sftp? ( net-libs/libssh[sftp] ) |
57 |
owncloud? ( net-libs/neon )" |
58 |
@@ -27,15 +28,14 @@ DEPEND="${RDEPEND} |
59 |
doc? ( app-doc/doxygen ) |
60 |
test? ( dev-libs/check )" |
61 |
|
62 |
-S="${WORKDIR}/${MY_P}" |
63 |
- |
64 |
DOCS=( "AUTHORS" "ChangeLog" "README" "doc/csync.txt" ) |
65 |
HTML_DOCS=( "doc/userguide" ) |
66 |
PATCHES=( "${FILESDIR}/${PV}-configureable-modules.patch" ) |
67 |
|
68 |
src_configure() { |
69 |
mycmakeargs=( |
70 |
- $(cmake-utils_use_with log LOG4C) |
71 |
+ $(cmake-utils_use log2callback LOG_TO_CALLBACK) |
72 |
+ $(cmake-utils_use_with log4c LOG4C) |
73 |
$(cmake-utils_use_want owncloud OWNCLOUD) |
74 |
$(cmake-utils_use_want samba SMB) |
75 |
$(cmake-utils_use_want sftp SFTP) |
76 |
@@ -51,6 +51,7 @@ src_compile() { |
77 |
|
78 |
src_install() { |
79 |
cmake-utils_src_install |
80 |
+ mv "${D}"/{usr,}/etc |
81 |
rm -rf "${D}/usr/share/doc/${PN}" |
82 |
use doc && dohtml -p api "${CMAKE_BUILD_DIR}/doc/html/" |
83 |
} |