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

[Nirbheek Chauhan]

commit:     8a28f2cbf3ca8e52a456d49989f9d1449dd459a5
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 22:33:14 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 22:33:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8a28f2cb

eclass/{gnome2,gnome2-live}: unset DBUS_SESSION_BUS_ADDRESS

---
 eclass/gnome2-live.eclass |    5 +++++
 eclass/gnome2.eclass      |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index f119624..03654ae 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -121,6 +121,11 @@ gnome2-live_src_prepare() {
 	ln -sf $(type -P true) py-compile
 
 	### Keep this in-sync with gnome2.eclass!
+
+	# Don't use the session bus address inherited via the environment
+	# causes test and introspection-building failures
+	unset DBUS_SESSION_BUS_ADDRESS
+
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
 

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index a335698..192fc16 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -55,6 +55,10 @@ gnome2_src_unpack() {
 }
 
 gnome2_src_prepare() {
+	# Don't use the session bus address inherited via the environment
+	# causes test and introspection-building failures
+	unset DBUS_SESSION_BUS_ADDRESS
+
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
 
@@ -63,6 +67,7 @@ gnome2_src_prepare() {
 }
 
 gnome2_src_configure() {
+	einfo dbus:$DBUS_SESSION_BUS_ADDRESS
 	# Update the GNOME configuration options
 	if [[ ${GCONF_DEBUG} != 'no' ]] ; then
 		if use debug ; then