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 5C0B4138010 for ; Sat, 27 Oct 2012 08:42:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7029E062C; Sat, 27 Oct 2012 08:42:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 62F85E062C for ; Sat, 27 Oct 2012 08:42:29 +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 AE6C833D8F9 for ; Sat, 27 Oct 2012 08:42:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 46C9DE5436 for ; Sat, 27 Oct 2012 08:42:27 +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: <1351327290.9c5c10262764bb4835700db61564b0cc7ae6cff4.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: 9c5c10262764bb4835700db61564b0cc7ae6cff4 X-VCS-Branch: master Date: Sat, 27 Oct 2012 08:42:27 +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: ddb74f78-6d84-42f6-8af2-0378c52dd2dc X-Archives-Hash: 5ca8de69aed437c14a8e1cd5b7572d43 commit: 9c5c10262764bb4835700db61564b0cc7ae6cff4 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Oct 27 08:41:21 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Oct 27 08:41:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9c5c1026 eclass/gnome2.eclass: sync eclass with gentoo-x86 --- eclass/gnome2.eclass | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index f3c3d72..95c11bf 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -16,7 +16,7 @@ case "${EAPI:-0}" in 0|1) EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; - 2|3|4) + 2|3|4|5) EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; *) die "EAPI=${EAPI} is not supported" ;; @@ -122,6 +122,9 @@ gnome2_src_prepare() { # Prevent scrollkeeper access violations gnome2_omf_fix + # Disable all deprecation warnings + gnome2_disable_deprecation_warning + # Run libtoolize if has ${EAPI:-0} 0 1 2 3; then elibtoolize ${ELTCONF} @@ -145,7 +148,7 @@ gnome2_src_configure() { # Prevent a QA warning if has doc ${IUSE} ; then - G2CONF="${G2CONF} $(use_enable doc gtk-doc)" + grep -q "enable-gtk-doc" configure && G2CONF="${G2CONF} $(use_enable doc gtk-doc)" fi # Pass --disable-maintainer-mode when needed