From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-528037-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 40A3C1381F3
for <garchives@archives.gentoo.org>; Mon, 26 Nov 2012 21:35:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 81846E068E;
Mon, 26 Nov 2012 21:35:11 +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 0DE69E068E
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Nov 2012 21:35:10 +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 1B8AA33D99D
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Nov 2012 21:35:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 7C5B0E5436
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Nov 2012 21:35:08 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
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" <eva@gentoo.org>
Message-ID: <1353965687.8d2b8ebb693c605aa3ea3ab7973bf26c677d1d8b.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: 8d2b8ebb693c605aa3ea3ab7973bf26c677d1d8b
X-VCS-Branch: master
Date: Mon, 26 Nov 2012 21:35:08 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: e2bed6bd-1916-45eb-bf96-de865ab0cc7a
X-Archives-Hash: 4e130a0a08bb474d33082aac6e8a4241
commit: 8d2b8ebb693c605aa3ea3ab7973bf26c677d1d8b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 26 21:34:47 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 26 21:34:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8d2b8ebb
eclass/gnome2.eclass: always disable gtk-doc for EAPI=5
---
eclass/gnome2.eclass | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index d38dbc4..8fac19c 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -150,9 +150,18 @@ 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)"
+ # 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.
+ # 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