[gentoo-commits] proj/gnome:master commit in: eclass/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     49813f5a667e33eca42b50fde51b5bcc72920b5d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 22:03:40 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 22:03:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=49813f5a

eclass/gnome2.eclass: sync with gx86

---
 eclass/gnome2.eclass |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 1c7e6f8..70eb491 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -150,11 +150,12 @@ gnome2_src_configure() {
 		fi
 	fi
 
-	# 2012-11-25
 	# 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" ${ECONF_SOURCE:-.}/configure ; then
 		if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
@@ -230,9 +231,24 @@ gnome2_src_install() {
 
 	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-	# Manual document installation
-	if [[ -n "${DOCS}" ]]; then
-		dodoc ${DOCS} || die "dodoc failed"
+	# Handle documentation as 'default' for eapi5 and newer, bug #373131
+	if has ${EAPI:-0} 0 1 2 3 4; then
+		# Manual document installation
+		if [[ -n "${DOCS}" ]]; then
+			dodoc ${DOCS} || die "dodoc failed"
+		fi
+	else
+		if ! declare -p DOCS >/dev/null 2>&1 ; then
+			local d
+			for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+					FAQ CREDITS CHANGELOG ; do
+				[[ -s "${d}" ]] && dodoc "${d}"
+			done
+		elif declare -p DOCS | grep -q '^declare -a' ; then
+			dodoc "${DOCS[@]}"
+		else
+			dodoc ${DOCS}
+		fi
 	fi
 
 	# Do not keep /var/lib/scrollkeeper because: