summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-01-15 00:38:27 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-01-15 00:38:27 +0000
commit1f007eb249fcc22e55dcc7fa1e77de03179793e0 (patch)
tree09a840e2e7eba0e3b740f6f553d75faf33de55d9 /app-pda
parentRemove almost unused kde-base/arts:3.5 USE="arts" from global flags. (diff)
downloadgentoo-2-1f007eb249fcc22e55dcc7fa1e77de03179793e0.tar.gz
gentoo-2-1f007eb249fcc22e55dcc7fa1e77de03179793e0.tar.bz2
gentoo-2-1f007eb249fcc22e55dcc7fa1e77de03179793e0.zip
Version bump. Fix doc building, install in same doc directory, bug #293668.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'app-pda')
-rw-r--r--app-pda/libsyncml/ChangeLog9
-rw-r--r--app-pda/libsyncml/libsyncml-0.5.4.ebuild11
2 files changed, 15 insertions, 5 deletions
diff --git a/app-pda/libsyncml/ChangeLog b/app-pda/libsyncml/ChangeLog
index 8f442167ac37..2aadb6082775 100644
--- a/app-pda/libsyncml/ChangeLog
+++ b/app-pda/libsyncml/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-pda/libsyncml
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.18 2009/11/15 21:14:28 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.19 2010/01/15 00:38:27 eva Exp $
+
+ 15 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+ libsyncml-0.5.4.ebuild:
+ Version bump. Fix doc building, install in same doc directory, bug
+ #293668.
*libsyncml-0.5.4 (15 Nov 2009)
diff --git a/app-pda/libsyncml/libsyncml-0.5.4.ebuild b/app-pda/libsyncml/libsyncml-0.5.4.ebuild
index b120d917ed9f..acdec14dfbe0 100644
--- a/app-pda/libsyncml/libsyncml-0.5.4.ebuild
+++ b/app-pda/libsyncml/libsyncml-0.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild,v 1.1 2009/11/15 21:14:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild,v 1.2 2010/01/15 00:38:27 eva Exp $
EAPI="2"
@@ -43,12 +43,17 @@ pkg_setup() {
src_configure() {
local mycmakeargs="
-DHAVE_LIBSOUP22=OFF
- $(cmake-utils_use_build doc DOCUMENTATION)
+ -DDOC_INSTALL_DIR=/usr/share/doc/${PF}
$(cmake-utils_use_enable debug TRACE)
$(cmake-utils_use_enable http HTTP)
$(cmake-utils_use_enable obex OBEX)
$(cmake-utils_use_enable obex BLUETOOTH)
$(cmake-utils_use_enable test UNIT_TEST)"
+ if use http && use obex; then
+ # Doc builds with those previous USE flags only
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build doc DOCUMENTATION)"
+ fi
+
cmake-utils_src_configure
}