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 49611138CD0 for ; Sun, 10 May 2015 21:27:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B601E0822; Sun, 10 May 2015 21:27:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6928E081C for ; Sun, 10 May 2015 21:27:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7BEF340EE3 for ; Sun, 10 May 2015 21:27:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 835789E4 for ; Sun, 10 May 2015 21:27:46 +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: <1431293185.4228c2db83d2710605adade9f5d531f66481c7d0.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: 4228c2db83d2710605adade9f5d531f66481c7d0 X-VCS-Branch: master Date: Sun, 10 May 2015 21:27:46 +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: d4cb318c-39e0-4ad6-98ef-466ff188e648 X-Archives-Hash: 0d98a4da812246212bfb27260c4a043a commit: 4228c2db83d2710605adade9f5d531f66481c7d0 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 10 21:26:25 2015 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun May 10 21:26:25 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4228c2db eclass/gnome2.eclass: move QA warnings to src_configure Having them in global scope does not work as expected and src_configure is a better place to be sure to catch all usage of these anyway. eclass/gnome2.eclass | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 9225355..9d1730d 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -26,11 +26,6 @@ esac # Extra configure opts passed to econf G2CONF=${G2CONF:-""} -# Deprecated for a long time now, see Gnome team policies -if [[ -n ${G2CONF} ]] ; then - eqawarn "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure" -fi - # @ECLASS-VARIABLE: GNOME2_LA_PUNT # @DESCRIPTION: # Should we delete ALL the .la files? @@ -67,11 +62,6 @@ if [[ ${GCONF_DEBUG} != "no" ]]; then IUSE="debug" fi -# Need to catch all offenders before switching behavior -if [[ -z ${GCONF_DEBUG} ]] ; then - eqawarn "GCONF_DEBUG not set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#GCONF_DEBUG" -fi - # @FUNCTION: gnome2_src_unpack # @DESCRIPTION: # Stub function for old EAPI. @@ -103,6 +93,16 @@ gnome2_src_prepare() { # @DESCRIPTION: # Gnome specific configure handling gnome2_src_configure() { + # Need to catch all offenders before switching behavior + if [[ -z ${GCONF_DEBUG} ]] ; then + eqawarn "GCONF_DEBUG not set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#GCONF_DEBUG" + fi + + # Deprecated for a long time now, see Gnome team policies + if [[ -n ${G2CONF} ]] ; then + eqawarn "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure" + fi + local g2conf=() # Update the GNOME configuration options