diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2015-11-21 11:37:56 +0100 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2015-11-24 22:56:17 +0100 |
| commit | ff13ecaf140e41e04141428cacb6885e3d2d96ca (patch) | |
| tree | 788fa868a998c57ebaf1837542f545e6e8be6180 | |
| parent | xdg.eclass: initial commit (diff) | |
| download | gentoo-ff13ecaf.tar.gz gentoo-ff13ecaf.tar.bz2 gentoo-ff13ecaf.zip | |
gnome2-utils.eclass: use xdg_environment_reset
| -rw-r--r-- | eclass/gnome2-utils.eclass | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index 59ab5861c356..7b7ffc614f26 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,7 +15,7 @@ # * GConf schemas management # * scrollkeeper (old Gnome help system) management -inherit eutils multilib +inherit eutils multilib xdg-utils case "${EAPI:-0}" in 0|1|2|3|4|5) ;; @@ -90,23 +90,13 @@ DEPEND=">=sys-apps/sed-4" # Reset various variables inherited from root's evironment to a reasonable # default for ebuilds to help avoid access violations and test failures. gnome2_environment_reset() { + xdg_environment_reset + # Respected by >=glib-2.30.1-r1 export G_HOME="${T}" # GST_REGISTRY is to work around gst utilities trying to read/write /root export GST_REGISTRY="${T}/registry.xml" - - # XXX: code for resetting XDG_* directories should probably be moved into - # a separate function in a non-gnome eclass - export XDG_DATA_HOME="${T}/.local/share" - export XDG_CONFIG_HOME="${T}/.config" - export XDG_CACHE_HOME="${T}/.cache" - export XDG_RUNTIME_DIR="${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.html - chmod 0700 "${XDG_RUNTIME_DIR}" } # @FUNCTION: gnome2_gconf_savelist |