| 1 |
commit: 49813f5a667e33eca42b50fde51b5bcc72920b5d |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 27 22:03:40 2012 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 27 22:03:40 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=49813f5a |
| 7 |
|
| 8 |
eclass/gnome2.eclass: sync with gx86 |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/gnome2.eclass | 24 ++++++++++++++++++++---- |
| 12 |
1 files changed, 20 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass |
| 15 |
index 1c7e6f8..70eb491 100644 |
| 16 |
--- a/eclass/gnome2.eclass |
| 17 |
+++ b/eclass/gnome2.eclass |
| 18 |
@@ -150,11 +150,12 @@ gnome2_src_configure() { |
| 19 |
fi |
| 20 |
fi |
| 21 |
|
| 22 |
- # 2012-11-25 |
| 23 |
# Starting with EAPI=5, we consider packages installing gtk-doc to be |
| 24 |
# handled by adding DEPEND="dev-util/gtk-doc-am" which provides tools to |
| 25 |
# relink URLs in documentation to already installed documentation. |
| 26 |
# This decision also greatly helps with constantly broken doc generation. |
| 27 |
+ # Remember to drop 'doc' USE flag from your package if it was only used to |
| 28 |
+ # rebuild docs. |
| 29 |
# Preserve old behavior for older EAPI. |
| 30 |
if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then |
| 31 |
if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then |
| 32 |
@@ -230,9 +231,24 @@ gnome2_src_install() { |
| 33 |
|
| 34 |
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL |
| 35 |
|
| 36 |
- # Manual document installation |
| 37 |
- if [[ -n "${DOCS}" ]]; then |
| 38 |
- dodoc ${DOCS} || die "dodoc failed" |
| 39 |
+ # Handle documentation as 'default' for eapi5 and newer, bug #373131 |
| 40 |
+ if has ${EAPI:-0} 0 1 2 3 4; then |
| 41 |
+ # Manual document installation |
| 42 |
+ if [[ -n "${DOCS}" ]]; then |
| 43 |
+ dodoc ${DOCS} || die "dodoc failed" |
| 44 |
+ fi |
| 45 |
+ else |
| 46 |
+ if ! declare -p DOCS >/dev/null 2>&1 ; then |
| 47 |
+ local d |
| 48 |
+ for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \ |
| 49 |
+ FAQ CREDITS CHANGELOG ; do |
| 50 |
+ [[ -s "${d}" ]] && dodoc "${d}" |
| 51 |
+ done |
| 52 |
+ elif declare -p DOCS | grep -q '^declare -a' ; then |
| 53 |
+ dodoc "${DOCS[@]}" |
| 54 |
+ else |
| 55 |
+ dodoc ${DOCS} |
| 56 |
+ fi |
| 57 |
fi |
| 58 |
|
| 59 |
# Do not keep /var/lib/scrollkeeper because: |
Archives