diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-12-02 11:07:09 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-12-02 11:07:09 +0000 |
| commit | 8a8d50d0cf266b7b53ff29facb6e05ff3a915834 (patch) | |
| tree | 28f6cad9c8b0c153434a7b264e68794940575a2b /eclass | |
| parent | Update license now that upstream has selected one. Fixes bug 445458. (diff) | |
| download | gentoo-2-8a8d50d0cf266b7b53ff29facb6e05ff3a915834.tar.gz gentoo-2-8a8d50d0cf266b7b53ff29facb6e05ff3a915834.tar.bz2 gentoo-2-8a8d50d0cf266b7b53ff29facb6e05ff3a915834.zip | |
Always pass --disable-gtk-doc for eapi >= 5 as we don't want docs to get rebuilt as discussed with gnome team. Thanks a lot to Gilles for working on this.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/gnome2.eclass | 18 |
2 files changed, 20 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index afa37bf6c109..5bee6441e714 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.538 2012/12/01 16:26:03 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.539 2012/12/02 11:07:09 pacho Exp $ + + 02 Dec 2012; Pacho Ramos <pacho@gentoo.org> gnome2.eclass: + Always pass --disable-gtk-doc for eapi >= 5 as we don't want docs to get + rebuilt as discussed with gnome team. Thanks a lot to Gilles for working on + this. 01 Dec 2012; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass, autotools-utils.eclass, cmake-utils.eclass: diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 3119f3c8f88b..3f7b2da9f75c 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.114 2012/11/27 00:48:01 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.115 2012/12/02 11:07:09 pacho Exp $ # @ECLASS: gnome2.eclass # @MAINTAINER: @@ -122,9 +122,19 @@ gnome2_src_configure() { fi fi - # Prevent a QA warning - if has doc ${IUSE} ; then - grep -q "enable-gtk-doc" configure && G2CONF="${G2CONF} $(use_enable doc gtk-doc)" + # Starting with EAPI=5, we consider packages installing gtk-doc to be + # handled by adding DEPEND="dev-util/gtk-doc-am" which provides tools to + # relink URLs in documentation to already installed documentation. + # This decision also greatly helps with constantly broken doc generation. + # Remember to drop 'doc' USE flag from your package if it was only used to + # rebuild docs. + # Preserve old behavior for older EAPI. + if grep -q "enable-gtk-doc" configure ; then + if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then + G2CONF="${G2CONF} $(use_enable doc gtk-doc)" + else + G2CONF="${G2CONF} --disable-gtk-doc" + fi fi # Pass --disable-maintainer-mode when needed |