Add gnome2_environment_reset to fix test failures (partially resolves bug #409313 reported by Patrick Lauer).

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 25 insertions, 17 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 055f09221e93..b2620880876f 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.505 2012/03/14 01:58:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.506 2012/03/23 16:02:41 tetromino Exp $
+
+  23 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.30.2.ebuild,
+  glib-2.30.2-r1.ebuild, glib-2.30.3.ebuild:
+  Add gnome2_environment_reset to fix test failures (partially resolves bug
+  #409313 reported by Patrick Lauer).
 
   14 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -glib-2.30.1-r2.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 3583d96805c3..6f05fb5a22c3 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -28,15 +28,15 @@ DIST glib-2.30.3.tar.xz 5642448 RMD160 0887b08e2fff75c325ed1fb1123baaf42dc9779b
 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
 EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36
 EBUILD glib-2.28.8.ebuild 7404 RMD160 df5a5f4ee06e7620b6b75a43ea6764e20626b022 SHA1 7a1418dbd1df2b8a6a511e781532a19ebdef6b63 SHA256 e21a8482d3ece513afb5620df8838f25e4b5adbd2c7e6d006e864e755d69d702
-EBUILD glib-2.30.2-r1.ebuild 8746 RMD160 ef8d8c2781701998d4bb00733ab21369bade80d0 SHA1 8c95e40ef21d4618c4c74e204524a8efbb1aa5c9 SHA256 c77a8cb249fc41b695a5e14b89893f0324910c22771aba548d358946e36258b6
-EBUILD glib-2.30.2.ebuild 8635 RMD160 2bd9a0808bbc4a901e7efd8fa05e9cf514e3a474 SHA1 04b0f680362508d879639bdb9cbe7908da5007f8 SHA256 5f76152cba623b9547c208da4200072415a85f256eda18412f5cf9557eb2e7eb
-EBUILD glib-2.30.3.ebuild 8858 RMD160 8fc2b22aba364f922d7e799ce9239b7af986cdf3 SHA1 e6a486e9c02386c6ce70e773c29f4e8500f7d0fe SHA256 80745f7ef1e83137fb3327cb93ad736b9c5779862597fba6692c5386909e56f3
-MISC ChangeLog 67676 RMD160 af17e18e5ff8103976cf3cc00b629b0a0a39667f SHA1 7626e47bd8bb642025ce91d263dfb9d051217310 SHA256 ed313977832ec5b8cc496dc8dd7a55923409e7396dfbbbb8d161782fcc18ecda
+EBUILD glib-2.30.2-r1.ebuild 8758 RMD160 19d70f67f30dd491f1c058173d68356d1f3e2afe SHA1 bd9f2c6a0bc585dbc0b3448e59a0b9e85c17b6bd SHA256 10e82fa9fb08bb39ebca7181fa1eba3eed6af6f54658cfb404b36d47f70ebeeb
+EBUILD glib-2.30.2.ebuild 8649 RMD160 117072b653ca502412176d91078695b1b3409faa SHA1 1920a30528722b0480c89900408473f45670c7b6 SHA256 aacd2810fce3ee1d6a1df7d7daee063f5c2c1403f2d89875fb420fafa1d9fddd
+EBUILD glib-2.30.3.ebuild 8869 RMD160 2b35d2527e372a908f7d788047970337ab15cfb2 SHA1 a3395f75a3e9dca60409716a7d831d9c76469483 SHA256 c23837485649cf04d001c5c7af49e1767a76bb64b8e4e173b42d6be3039d7115
+MISC ChangeLog 67915 RMD160 199abbaa43207e0a64b87cf8a2f5b82b7aef48ca SHA1 37b3d4a728353fdf9676e0851071222c4145d5ae SHA256 4e1860b629233675f3334a58586f27cbdba0a949499dea4701bae02b2fcf7908
 MISC metadata.xml 497 RMD160 447ae0d07ac529dbe1830e383d2ef4eae7359ea7 SHA1 4cb36fafa32d53a0dbeec978b0d75f4e7acb3fa0 SHA256 a1840f7e6af57edc9fe5b54deae9e2083858d27792fda3f4e1e8e04624b17d0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9f+08ACgkQdjK8w9WeBnAorwEAowkHlTonmg6snET31airfYwM
-ORRNQ2FojyLsKjjYT9EA/RWTHX/2NDCfGzVEaSjTDJAZ1n6IrtDFCJvh/gBDHIXj
-=N0jt
+iF4EAREIAAYFAk9snqcACgkQdjK8w9WeBnBFhQD8DZcCS7aZrtY6Dm4+HDZRg8jq
+RzqgQSx7g35BSIbCuxoA+wfwONs6iKdjYlC+OqzYt1cej2O/3k+g/P3ebogY1z0Q
+=WiOm
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.30.2-r1.ebuild b/dev-libs/glib/glib-2.30.2-r1.ebuild
index 61b43bac7103..549963ec138a 100644
--- a/dev-libs/glib/glib-2.30.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.30.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v 1.3 2012/02/17 17:19:47 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2-r1.ebuild,v 1.4 2012/03/23 16:02:41 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python toolchain-funcs virtualx
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -197,11 +197,12 @@ src_install() {
 }
 
 src_test() {
+	gnome2_environment_reset
+
 	unset DBUS_SESSION_BUS_ADDRESS
 	export XDG_CONFIG_DIRS=/etc/xdg
 	export XDG_DATA_DIRS=/usr/local/share:/usr/share
 	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export XDG_DATA_HOME="${T}"
 	unset GSETTINGS_BACKEND # bug 352451
 
 	# Related test is a bit nitpicking
diff --git a/dev-libs/glib/glib-2.30.2.ebuild b/dev-libs/glib/glib-2.30.2.ebuild
index 445afb6129cc..23f170173924 100644
--- a/dev-libs/glib/glib-2.30.2.ebuild
+++ b/dev-libs/glib/glib-2.30.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.10 2012/03/05 21:57:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.11 2012/03/23 16:02:41 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python toolchain-funcs virtualx
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -194,11 +194,12 @@ src_install() {
 }
 
 src_test() {
+	gnome2_environment_reset
+
 	unset DBUS_SESSION_BUS_ADDRESS
 	export XDG_CONFIG_DIRS=/etc/xdg
 	export XDG_DATA_DIRS=/usr/local/share:/usr/share
 	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export XDG_DATA_HOME="${T}"
 	unset GSETTINGS_BACKEND # bug 352451
 
 	# Related test is a bit nitpicking
diff --git a/dev-libs/glib/glib-2.30.3.ebuild b/dev-libs/glib/glib-2.30.3.ebuild
index c0655eef0d4e..b96c1e7b1cd5 100644
--- a/dev-libs/glib/glib-2.30.3.ebuild
+++ b/dev-libs/glib/glib-2.30.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.3.ebuild,v 1.1 2012/03/14 01:40:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.3.ebuild,v 1.2 2012/03/23 16:02:41 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python toolchain-funcs virtualx
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -200,11 +200,12 @@ src_install() {
 }
 
 src_test() {
+	gnome2_environment_reset
+
 	unset DBUS_SESSION_BUS_ADDRESS
 	export XDG_CONFIG_DIRS=/etc/xdg
 	export XDG_DATA_DIRS=/usr/local/share:/usr/share
 	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export XDG_DATA_HOME="${T}"
 	unset GSETTINGS_BACKEND # bug 352451
 
 	# Related test is a bit nitpicking