summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-11-05 00:06:52 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-11-05 00:06:52 +0000
commitd3e1eccbc981cccc4b28f5feaf94d0ac36354658 (patch)
treed88642475c836f6992ab91fcc907cabadca81674 /sys-apps/dbus
parentFix missing a in useflagname. Billie reported. (diff)
downloadgentoo-2-d3e1eccbc981cccc4b28f5feaf94d0ac36354658.tar.gz
gentoo-2-d3e1eccbc981cccc4b28f5feaf94d0ac36354658.tar.bz2
gentoo-2-d3e1eccbc981cccc4b28f5feaf94d0ac36354658.zip
Build doc in and only once, bug #291735.
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r--sys-apps/dbus/ChangeLog5
-rw-r--r--sys-apps/dbus/dbus-1.3.0-r1.ebuild18
2 files changed, 13 insertions, 10 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 041786f7d412..3e27c0ff94a0 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/dbus
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.240 2009/11/01 22:47:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.241 2009/11/05 00:06:52 eva Exp $
+
+ 05 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org> dbus-1.3.0-r1.ebuild:
+ Build doc in and only once, bug #291735.
*dbus-1.3.0-r1 (01 Nov 2009)
diff --git a/sys-apps/dbus/dbus-1.3.0-r1.ebuild b/sys-apps/dbus/dbus-1.3.0-r1.ebuild
index 601cc85505db..08ef8a3b737f 100644
--- a/sys-apps/dbus/dbus-1.3.0-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0-r1.ebuild,v 1.1 2009/11/01 22:47:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0-r1.ebuild,v 1.2 2009/11/05 00:06:52 eva Exp $
EAPI="2"
@@ -53,8 +53,6 @@ src_configure() {
my_conf="$(use_with X x)
$(use_enable debug verbose-mode)
$(use_enable debug asserts)
- $(use_enable doc doxygen-docs)
- $(use_enable doc xml-docs)
$(use_enable kernel_linux inotify)
$(use_enable kernel_FreeBSD kqueue)
$(use_enable selinux)
@@ -69,7 +67,9 @@ src_configure() {
mkdir "${BD}"
cd "${BD}"
einfo "Running configure in ${BD}"
- ECONF_SOURCE="${S}" econf ${my_conf}
+ ECONF_SOURCE="${S}" econf ${my_conf} \
+ $(use_enable doc doxygen-docs) \
+ $(use_enable doc xml-docs)
if use test; then
mkdir "${TBD}"
@@ -92,16 +92,16 @@ src_compile() {
einfo "Running make in ${BD}"
emake || die "make failed"
+ if use doc; then
+ einfo "Building API documentation..."
+ doxygen || die "doxygen failed"
+ fi
+
if use test; then
cd "${TBD}"
einfo "Running make in ${TBD}"
emake || die "make failed"
fi
-
- if use doc; then
- einfo "Building API documentation..."
- doxygen || die "doxygen failed"
- fi
}
src_test() {