From: Arun Raghavan <ford_prefect@gentoo.org>
Date: Wed, 24 Aug 2011 07:12:35 +0000 (+0000)
Subject: Move GST_REGISTRY export to src_prepare
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=132f544a2a7ee17adc4c7457e12106132677793d;p=gentoo.git

Move GST_REGISTRY export to src_prepare

We might end up calling gst functions anywhere (gupnp-dlna calls it in
documentation generation, for example).
---

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 865c4cdc04cd..7337a15a3800 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.99 2011/08/14 03:46:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.100 2011/08/24 07:12:35 ford_prefect Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -85,8 +85,12 @@ gnome2_src_unpack() {
 
 # @FUNCTION: gnome2_src_prepare
 # @DESCRIPTION:
-# Fix build of scrollkeeper documentation and run elibtoolize.
+# Prepare environment for build, fix build of scrollkeeper documentation,
+# run elibtoolize.
 gnome2_src_prepare() {
+	# GST_REGISTRY is to work around gst utilities trying to read/write /root
+	export GST_REGISTRY="${S}/registry.xml"
+
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
 
@@ -119,8 +123,7 @@ gnome2_src_configure() {
 	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
 	addwrite "$(unset HOME; echo ~)/.gnome2"
 
-	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
-	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}
+	econf "$@" ${G2CONF}
 }
 
 # @FUNCTION: gnome2_src_compile