From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SB6nh-0003lC-U8 for garchives@archives.gentoo.org; Fri, 23 Mar 2012 15:53:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D69E1E0741; Fri, 23 Mar 2012 15:53:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 930F2E0741 for ; Fri, 23 Mar 2012 15:53:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AFE971B4003 for ; Fri, 23 Mar 2012 15:53:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7A694E5403 for ; Fri, 23 Mar 2012 15:53:04 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1332517311.92121a0684ccfa8cc1878c4e619a85ac84625a39.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/glib/glib-2.31.22.ebuild dev-libs/glib/glib-9999.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 92121a0684ccfa8cc1878c4e619a85ac84625a39 X-VCS-Branch: master Date: Fri, 23 Mar 2012 15:53:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 82f59dae-b941-4337-93bf-1bb739c0bdd0 X-Archives-Hash: ad9cf29b0a5ae713be37c9ada4201889 commit: 92121a0684ccfa8cc1878c4e619a85ac84625a39 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Fri Mar 23 15:41:51 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Fri Mar 23 15:41:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D92121a06 dev-libs/glib: add gnome2_environment_reset (#409313) Add gnome2_environment_reset to fix test failures (partially resolves bug #409313 reported by Patrick Lauer). --- dev-libs/glib/glib-2.31.22.ebuild | 9 +++++---- dev-libs/glib/glib-9999.ebuild | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-libs/glib/glib-2.31.22.ebuild b/dev-libs/glib/glib-2.31.= 22.ebuild index 503fbf6..b10ed7c 100644 --- a/dev-libs/glib/glib-2.31.22.ebuild +++ b/dev-libs/glib/glib-2.31.22.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.= 2 2011/11/14 19:06:22 tetromino Exp $ +# $Header: $ =20 EAPI=3D"4" PYTHON_DEPEND=3D"utils? 2" # Avoid runtime dependency on python when USE=3Dtest =20 -inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-uti= ls python virtualx +inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils mul= tilib pax-utils python virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -193,11 +193,12 @@ src_install() { } =20 src_test() { + gnome2_environment_reset + unset DBUS_SESSION_BUS_ADDRESS export XDG_CONFIG_DIRS=3D/etc/xdg export XDG_DATA_DIRS=3D/usr/local/share:/usr/share export G_DBUS_COOKIE_SHA1_KEYRING_DIR=3D"${T}/temp" - export XDG_DATA_HOME=3D"${T}" unset GSETTINGS_BACKEND # bug 352451 =20 # Related test is a bit nitpicking diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebu= ild index bac4308..27e2632 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.= 2 2011/11/14 19:06:22 tetromino Exp $ +# $Header: $ =20 EAPI=3D"4" PYTHON_DEPEND=3D"utils? 2" # Avoid runtime dependency on python when USE=3Dtest =20 -inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-uti= ls python virtualx +inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils mul= tilib pax-utils python virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -196,11 +196,12 @@ src_install() { } =20 src_test() { + gnome2_environment_reset + unset DBUS_SESSION_BUS_ADDRESS export XDG_CONFIG_DIRS=3D/etc/xdg export XDG_DATA_DIRS=3D/usr/local/share:/usr/share export G_DBUS_COOKIE_SHA1_KEYRING_DIR=3D"${T}/temp" - export XDG_DATA_HOME=3D"${T}" unset GSETTINGS_BACKEND # bug 352451 =20 # Related test is a bit nitpicking