summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2015-05-10 23:26:25 +0200
committerGilles Dartiguelongue <eva@gentoo.org>2015-05-10 23:26:25 +0200
commit4228c2db83d2710605adade9f5d531f66481c7d0 (patch)
tree87c8d339446871f1df4a69024094e934223eddcb /eclass
parentgnome-base/gnome-extra-apps: lower dependencies for incomplete bumps (diff)
downloadgnome-4228c2db83d2710605adade9f5d531f66481c7d0.tar.gz
gnome-4228c2db83d2710605adade9f5d531f66481c7d0.tar.bz2
gnome-4228c2db83d2710605adade9f5d531f66481c7d0.zip
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.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/gnome2.eclass20
1 files changed, 10 insertions, 10 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 92253556..9d1730d1 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