summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/dbus/ChangeLog5
-rw-r--r--sys-apps/dbus/Manifest10
-rw-r--r--sys-apps/dbus/dbus-1.3.0-r1.ebuild18
3 files changed, 18 insertions, 15 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/Manifest b/sys-apps/dbus/Manifest
index cb09bf1fa2d7..3289482e6402 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -12,14 +12,14 @@ DIST dbus-1.2.3.tar.gz 1564475 RMD160 d1a207b2a4c744f27c9c01388e80cebdb61f43f0 S
DIST dbus-1.3.0.tar.gz 1517408 RMD160 ed823727c11a437e9a0d548b9c3d92a8fd4d386b SHA1 ebd23c65ebf5448efc6367da1414de212db38055 SHA256 fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
EBUILD dbus-1.2.12.ebuild 3858 RMD160 e690a95d18c1b003f0555cd2ef59ae98aad7b16d SHA1 3aa70b1e08b7ac672fcf407755b4ab45e988f9d7 SHA256 507833339197a3b9fef81ef513be658f616a3d38e5a9b924cc24e332daa0121e
EBUILD dbus-1.2.3-r1.ebuild 3752 RMD160 dc66d0b29adcde506e40b3240f4e19144f3ed159 SHA1 fc9c2db2f73605fbcc2807ee0bd886e86f8bb93d SHA256 09c62bdce60af40e79f88f6bc7110867f6f6d051b08aa5ed585a10570beeb2fc
-EBUILD dbus-1.3.0-r1.ebuild 4792 RMD160 f54fc4ecaf282e8c0960f4b740aebc27694bf7c0 SHA1 24ac2a8b6d5c32b1cd9033533fa1931da9e3347f SHA256 29b878e6fec68fe268920661cffe8936b7b4fa9b47687fb4633e28ee909d2247
+EBUILD dbus-1.3.0-r1.ebuild 4796 RMD160 1e8e19c54e74eacf09a0601b95039550f9e84bb7 SHA1 388b3941915c230fda8e80f67cd3f326d531cc43 SHA256 b8d450b657927f46916a187e3bd826efdb9900c5387e6e24f0e49a5d2f820829
EBUILD dbus-1.3.0.ebuild 4068 RMD160 89a06c41e86334f57a2256a0667e7f24083c2561 SHA1 b0a9eb87b19d9998f1732880e8e2626ad0d57f5b SHA256 38a01cdf9aa19e527e9cfc0917f60b38d2a3b6615e16c25b5d15755cc4b99e94
-MISC ChangeLog 36457 RMD160 2c621f4a584b68af707f4ee3732edae234ff3bfc SHA1 e333e0c49196c3b3d9cec1d59f9a7170b15e1450 SHA256 fd7e5255e574d58a76a1a5e64371763470d6442a87862c5c035a289440dee241
+MISC ChangeLog 36577 RMD160 9150d59201f9a91dc65e7c2d4d59b4cc220598ca SHA1 d0b308284be08b1bdca136ede4a19da55bc4395f SHA256 d379f6a06bf6555b449992c346ead3371176582bf2c37fa21265e702768c75ec
MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkruD/gACgkQ1fmVwcYIWAZTIgCguDdoUmCe+3HUTbUsdavuNTJF
-y8UAoOoVsgf9wdPd3o4lUUjIIsIX3P2e
-=7wDG
+iEYEARECAAYFAkryFyYACgkQ1fmVwcYIWAanGgCgkYpDNp4VEI48kdvOSCZWrL/R
+Z9MAn3LaGI6aQezS5fXwYodkeH9/1Lr7
+=gZ9H
-----END PGP SIGNATURE-----
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() {