[gentoo-commits] proj/gnome:master commit in: eclass/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     3eac3e2cac4ad4db1d7cddfd3396a9a32d6aaaff
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 06:15:23 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Nov 14 06:15:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3eac3e2c

eclass/gnome2.eclass: sync with gx86

Use the new gnome2_environment_reset from gnome2-utils for XDG_* etc.
resetting.

Note that *unsetting* variables that had been exported in root's
environment currently does not seem to work (they reappear in the next
ebuild stage, at least with portage-2.2.0_alpha74).

---
 eclass/gnome2.eclass |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index cc3f8ac..e0c2bf9 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -90,6 +90,8 @@ gnome2_src_unpack() {
 gnome2_src_prepare() {
 	# Reset various variables inherited via the environment.
 	# Causes test failures, introspection-build failures, and access violations
+	# FIXME: seems to have no effect for exported variables, at least with
+	# portage-2.2.0_alpha74
 	unset DBUS_SESSION_BUS_ADDRESS
 	unset DISPLAY
 	unset GNOME_KEYRING_CONTROL
@@ -97,19 +99,8 @@ gnome2_src_prepare() {
 	unset XAUTHORITY
 	unset XDG_SESSION_COOKIE
 
-	# Reset the XDG_* directories to avoid access violations
-	export XDG_DATA_HOME="${T}/.local/share"
-	export XDG_CONFIG_HOME="${T}/.config"
-	export XDG_CACHE_HOME="${T}/.cache"
-	export XDG_RUNTIME_DIR="${T}/run"
-	mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
-			 "${XDG_RUNTIME_DIR}"
-	# This directory needs to be owned by the user, and chmod 0700
-	# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-	chmod 0700 "${XDG_RUNTIME_DIR}"
-
-	# GST_REGISTRY is to work around gst utilities trying to read/write /root
-	export GST_REGISTRY="${T}/registry.xml"
+	# Prevent assorted access violations and test failures
+	gnome2_environment_reset
 
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix