From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5597A1381FB for ; Thu, 27 Dec 2012 22:20:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 367C321C1D5; Thu, 27 Dec 2012 22:19:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9511C21C1D5 for ; Thu, 27 Dec 2012 22:19:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A9CDA33D909 for ; Thu, 27 Dec 2012 22:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EA3DAE543D for ; Thu, 27 Dec 2012 22:19:49 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1356645820.49813f5a667e33eca42b50fde51b5bcc72920b5d.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 49813f5a667e33eca42b50fde51b5bcc72920b5d X-VCS-Branch: master Date: Thu, 27 Dec 2012 22:19:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5985c2c7-2945-4413-979c-d2633b56d71e X-Archives-Hash: d278dea74a033b504046c1d1492705a3 commit: 49813f5a667e33eca42b50fde51b5bcc72920b5d Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu Dec 27 22:03:40 2012 +0000 Commit: Gilles Dartiguelongue gentoo 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: