| 1 |
commit: ff13ecaf140e41e04141428cacb6885e3d2d96ca |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 21 10:37:56 2015 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 24 21:56:17 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff13ecaf |
| 7 |
|
| 8 |
gnome2-utils.eclass: use xdg_environment_reset |
| 9 |
|
| 10 |
eclass/gnome2-utils.eclass | 18 ++++-------------- |
| 11 |
1 file changed, 4 insertions(+), 14 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass |
| 14 |
index 59ab586..7b7ffc6 100644 |
| 15 |
--- a/eclass/gnome2-utils.eclass |
| 16 |
+++ b/eclass/gnome2-utils.eclass |
| 17 |
@@ -1,4 +1,4 @@ |
| 18 |
-# Copyright 1999-2014 Gentoo Foundation |
| 19 |
+# Copyright 1999-2015 Gentoo Foundation |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# $Id$ |
| 22 |
|
| 23 |
@@ -15,7 +15,7 @@ |
| 24 |
# * GConf schemas management |
| 25 |
# * scrollkeeper (old Gnome help system) management |
| 26 |
|
| 27 |
-inherit eutils multilib |
| 28 |
+inherit eutils multilib xdg-utils |
| 29 |
|
| 30 |
case "${EAPI:-0}" in |
| 31 |
0|1|2|3|4|5) ;; |
| 32 |
@@ -90,23 +90,13 @@ DEPEND=">=sys-apps/sed-4" |
| 33 |
# Reset various variables inherited from root's evironment to a reasonable |
| 34 |
# default for ebuilds to help avoid access violations and test failures. |
| 35 |
gnome2_environment_reset() { |
| 36 |
+ xdg_environment_reset |
| 37 |
+ |
| 38 |
# Respected by >=glib-2.30.1-r1 |
| 39 |
export G_HOME="${T}" |
| 40 |
|
| 41 |
# GST_REGISTRY is to work around gst utilities trying to read/write /root |
| 42 |
export GST_REGISTRY="${T}/registry.xml" |
| 43 |
- |
| 44 |
- # XXX: code for resetting XDG_* directories should probably be moved into |
| 45 |
- # a separate function in a non-gnome eclass |
| 46 |
- export XDG_DATA_HOME="${T}/.local/share" |
| 47 |
- export XDG_CONFIG_HOME="${T}/.config" |
| 48 |
- export XDG_CACHE_HOME="${T}/.cache" |
| 49 |
- export XDG_RUNTIME_DIR="${T}/run" |
| 50 |
- mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \ |
| 51 |
- "${XDG_RUNTIME_DIR}" |
| 52 |
- # This directory needs to be owned by the user, and chmod 0700 |
| 53 |
- # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html |
| 54 |
- chmod 0700 "${XDG_RUNTIME_DIR}" |
| 55 |
} |
| 56 |
|
| 57 |
# @FUNCTION: gnome2_gconf_savelist |
Archives