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 1RPqXh-0004wL-Cv for garchives@archives.gentoo.org; Mon, 14 Nov 2011 07:01:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6D5B21C022; Mon, 14 Nov 2011 07:01:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8FB6921C022 for ; Mon, 14 Nov 2011 07:01:11 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A359A1B4009 for ; Mon, 14 Nov 2011 07:01:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id ACE8E80042 for ; Mon, 14 Nov 2011 07:01:09 +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: <3eac3e2cac4ad4db1d7cddfd3396a9a32d6aaaff.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 3eac3e2cac4ad4db1d7cddfd3396a9a32d6aaaff Date: Mon, 14 Nov 2011 07:01:09 +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: fa2bccaf-7843-4ef8-b977-5dd1f37c5eb0 X-Archives-Hash: 0e3447caf3b64cd2539061f4fff9cb4f commit: 3eac3e2cac4ad4db1d7cddfd3396a9a32d6aaaff Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon Nov 14 06:15:23 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Nov 14 06:15:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D3eac3e2c eclass/gnome2.eclass: sync with gx86 Use the new gnome2_environment_reset from gnome2-utils for XDG_* etc. resetting. Note that *unsetting* variables that had been exported in root's environment currently does not seem to work (they reappear in the next ebuild stage, at least with portage-2.2.0_alpha74). --- eclass/gnome2.eclass | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index cc3f8ac..e0c2bf9 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -90,6 +90,8 @@ gnome2_src_unpack() { gnome2_src_prepare() { # Reset various variables inherited via the environment. # Causes test failures, introspection-build failures, and access violat= ions + # FIXME: seems to have no effect for exported variables, at least with + # portage-2.2.0_alpha74 unset DBUS_SESSION_BUS_ADDRESS unset DISPLAY unset GNOME_KEYRING_CONTROL @@ -97,19 +99,8 @@ gnome2_src_prepare() { unset XAUTHORITY unset XDG_SESSION_COOKIE =20 - # Reset the XDG_* directories to avoid access violations - export XDG_DATA_HOME=3D"${T}/.local/share" - export XDG_CONFIG_HOME=3D"${T}/.config" - export XDG_CACHE_HOME=3D"${T}/.cache" - export XDG_RUNTIME_DIR=3D"${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.htm= l - chmod 0700 "${XDG_RUNTIME_DIR}" - - # GST_REGISTRY is to work around gst utilities trying to read/write /ro= ot - export GST_REGISTRY=3D"${T}/registry.xml" + # Prevent assorted access violations and test failures + gnome2_environment_reset =20 # Prevent scrollkeeper access violations gnome2_omf_fix