[gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass

["Arun Raghavan (ford_prefect)" <ford_prefect@gentoo.org>]

ford_prefect    11/08/24 07:12:35

  Modified:             gnome2.eclass
  Log:
  Move GST_REGISTRY export to src_prepare
  
  We might end up calling gst functions anywhere (gupnp-dlna calls it in
  documentation generation, for example).

Revision  Changes    Path
1.100                eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.99&r2=1.100

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gnome2.eclass	14 Aug 2011 03:46:33 -0000	1.99
+++ gnome2.eclass	24 Aug 2011 07:12:35 -0000	1.100
@@ -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 @@
 
 # @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 @@
 	# 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