1 |
commit: 3eac3e2cac4ad4db1d7cddfd3396a9a32d6aaaff |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 14 06:15:23 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Nov 14 06:15:23 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3eac3e2c |
7 |
|
8 |
eclass/gnome2.eclass: sync with gx86 |
9 |
|
10 |
Use the new gnome2_environment_reset from gnome2-utils for XDG_* etc. |
11 |
resetting. |
12 |
|
13 |
Note that *unsetting* variables that had been exported in root's |
14 |
environment currently does not seem to work (they reappear in the next |
15 |
ebuild stage, at least with portage-2.2.0_alpha74). |
16 |
|
17 |
--- |
18 |
eclass/gnome2.eclass | 17 ++++------------- |
19 |
1 files changed, 4 insertions(+), 13 deletions(-) |
20 |
|
21 |
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass |
22 |
index cc3f8ac..e0c2bf9 100644 |
23 |
--- a/eclass/gnome2.eclass |
24 |
+++ b/eclass/gnome2.eclass |
25 |
@@ -90,6 +90,8 @@ gnome2_src_unpack() { |
26 |
gnome2_src_prepare() { |
27 |
# Reset various variables inherited via the environment. |
28 |
# Causes test failures, introspection-build failures, and access violations |
29 |
+ # FIXME: seems to have no effect for exported variables, at least with |
30 |
+ # portage-2.2.0_alpha74 |
31 |
unset DBUS_SESSION_BUS_ADDRESS |
32 |
unset DISPLAY |
33 |
unset GNOME_KEYRING_CONTROL |
34 |
@@ -97,19 +99,8 @@ gnome2_src_prepare() { |
35 |
unset XAUTHORITY |
36 |
unset XDG_SESSION_COOKIE |
37 |
|
38 |
- # Reset the XDG_* directories to avoid access violations |
39 |
- export XDG_DATA_HOME="${T}/.local/share" |
40 |
- export XDG_CONFIG_HOME="${T}/.config" |
41 |
- export XDG_CACHE_HOME="${T}/.cache" |
42 |
- export XDG_RUNTIME_DIR="${T}/run" |
43 |
- mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \ |
44 |
- "${XDG_RUNTIME_DIR}" |
45 |
- # This directory needs to be owned by the user, and chmod 0700 |
46 |
- # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html |
47 |
- chmod 0700 "${XDG_RUNTIME_DIR}" |
48 |
- |
49 |
- # GST_REGISTRY is to work around gst utilities trying to read/write /root |
50 |
- export GST_REGISTRY="${T}/registry.xml" |
51 |
+ # Prevent assorted access violations and test failures |
52 |
+ gnome2_environment_reset |
53 |
|
54 |
# Prevent scrollkeeper access violations |
55 |
gnome2_omf_fix |