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

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     c63c943813469df5904140ad94e820b3a0444d1e
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 20:20:24 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 20:20:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c63c9438

gnome2.eclass: unset more vars, set XDG_* vars

---
 eclass/gnome2.eclass |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index f206fc1..878cd50 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -55,9 +55,25 @@ gnome2_src_unpack() {
 }
 
 gnome2_src_prepare() {
-	# Don't use the session bus address inherited via the environment
-	# causes test and introspection-building failures
+	# Reset various variables inherited via the environment.
+	# Causes test failures, introspection-build failures, and access violations
 	unset DBUS_SESSION_BUS_ADDRESS
+	unset DISPLAY
+	unset GNOME_KEYRING_CONTROL
+	unset GNOME_KEYRING_PID
+	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}"
 
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix