From f11cf0920b5e3e53924eeab5418e9f2f79007d37 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Fri, 23 Mar 2012 16:02:41 +0000 Subject: Add gnome2_environment_reset to fix test failures (partially resolves bug #409313 reported by Patrick Lauer). (Portage version: 2.2.0_alpha90/cvs/Linux x86_64) --- dev-libs/glib/ChangeLog | 7 ++++++- dev-libs/glib/glib-2.30.2-r1.ebuild | 7 ++++--- dev-libs/glib/glib-2.30.2.ebuild | 7 ++++--- dev-libs/glib/glib-2.30.3.ebuild | 7 ++++--- 4 files changed, 18 insertions(+), 10 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 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 -glib-2.30.1-r2.ebuild: 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 -- cgit v1.2.3-65-gdbad