| 1 |
pacho 12/12/02 11:07:09 |
| 2 |
|
| 3 |
Modified: ChangeLog gnome2.eclass |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.539 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.539&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.539&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.538&r2=1.539 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.538 |
| 18 |
retrieving revision 1.539 |
| 19 |
diff -u -r1.538 -r1.539 |
| 20 |
--- ChangeLog 1 Dec 2012 16:26:03 -0000 1.538 |
| 21 |
+++ ChangeLog 2 Dec 2012 11:07:09 -0000 1.539 |
| 22 |
@@ -1,6 +1,11 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.538 2012/12/01 16:26:03 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.539 2012/12/02 11:07:09 pacho Exp $ |
| 27 |
+ |
| 28 |
+ 02 Dec 2012; Pacho Ramos <pacho@g.o> gnome2.eclass: |
| 29 |
+ Always pass --disable-gtk-doc for eapi >= 5 as we don't want docs to get |
| 30 |
+ rebuilt as discussed with gnome team. Thanks a lot to Gilles for working on |
| 31 |
+ this. |
| 32 |
|
| 33 |
01 Dec 2012; Michał Górny <mgorny@g.o> autotools-multilib.eclass, |
| 34 |
autotools-utils.eclass, cmake-utils.eclass: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.115 eclass/gnome2.eclass |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.115&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.115&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.114&r2=1.115 |
| 43 |
|
| 44 |
Index: gnome2.eclass |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v |
| 47 |
retrieving revision 1.114 |
| 48 |
retrieving revision 1.115 |
| 49 |
diff -u -r1.114 -r1.115 |
| 50 |
--- gnome2.eclass 27 Nov 2012 00:48:01 -0000 1.114 |
| 51 |
+++ gnome2.eclass 2 Dec 2012 11:07:09 -0000 1.115 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.114 2012/11/27 00:48:01 tetromino Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.115 2012/12/02 11:07:09 pacho Exp $ |
| 57 |
|
| 58 |
# @ECLASS: gnome2.eclass |
| 59 |
# @MAINTAINER: |
| 60 |
@@ -122,9 +122,19 @@ |
| 61 |
fi |
| 62 |
fi |
| 63 |
|
| 64 |
- # Prevent a QA warning |
| 65 |
- if has doc ${IUSE} ; then |
| 66 |
- grep -q "enable-gtk-doc" configure && G2CONF="${G2CONF} $(use_enable doc gtk-doc)" |
| 67 |
+ # Starting with EAPI=5, we consider packages installing gtk-doc to be |
| 68 |
+ # handled by adding DEPEND="dev-util/gtk-doc-am" which provides tools to |
| 69 |
+ # relink URLs in documentation to already installed documentation. |
| 70 |
+ # This decision also greatly helps with constantly broken doc generation. |
| 71 |
+ # Remember to drop 'doc' USE flag from your package if it was only used to |
| 72 |
+ # rebuild docs. |
| 73 |
+ # Preserve old behavior for older EAPI. |
| 74 |
+ if grep -q "enable-gtk-doc" configure ; then |
| 75 |
+ if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then |
| 76 |
+ G2CONF="${G2CONF} $(use_enable doc gtk-doc)" |
| 77 |
+ else |
| 78 |
+ G2CONF="${G2CONF} --disable-gtk-doc" |
| 79 |
+ fi |
| 80 |
fi |
| 81 |
|
| 82 |
# Pass --disable-maintainer-mode when needed |
Archives