1 |
tetromino 11/11/14 06:10:32 |
2 |
|
3 |
Modified: ChangeLog gnome2-utils.eclass gnome2.eclass |
4 |
Log: |
5 |
Add gnome2_environment_reset() to reset env variables that often cause build or test failures (most recently bug #380639). The XDG_* resetting code had been tested in the gnome overlay for months with good results. |
6 |
|
7 |
Revision Changes Path |
8 |
1.12 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.12&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.12&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.11&r2=1.12 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.11 |
18 |
retrieving revision 1.12 |
19 |
diff -u -r1.11 -r1.12 |
20 |
--- ChangeLog 12 Nov 2011 20:46:39 -0000 1.11 |
21 |
+++ ChangeLog 14 Nov 2011 06:10:32 -0000 1.12 |
22 |
@@ -1,6 +1,12 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.11 2011/11/12 20:46:39 pesa Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.12 2011/11/14 06:10:32 tetromino Exp $ |
27 |
+ |
28 |
+ 14 Nov 2011; Alexandre Rostovtsev <tetromino@g.o> gnome2-utils.eclass, |
29 |
+ gnome2.eclass: |
30 |
+ Add gnome2_environment_reset() to reset env variables that often cause build |
31 |
+ or test failures (most recently bug #380639). The XDG_* resetting code had |
32 |
+ been tested in the gnome overlay for months with good results. |
33 |
|
34 |
12 Nov 2011; Davide Pesavento <pesa@g.o> qt4-r2.eclass: |
35 |
Restore ${S} fallback, but with a deprecation notice saying that it will be |
36 |
|
37 |
|
38 |
|
39 |
1.24 eclass/gnome2-utils.eclass |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.24&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.24&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.23&r2=1.24 |
44 |
|
45 |
Index: gnome2-utils.eclass |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v |
48 |
retrieving revision 1.23 |
49 |
retrieving revision 1.24 |
50 |
diff -u -r1.23 -r1.24 |
51 |
--- gnome2-utils.eclass 22 Aug 2011 04:46:31 -0000 1.23 |
52 |
+++ gnome2-utils.eclass 14 Nov 2011 06:10:32 -0000 1.24 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.23 2011/08/22 04:46:31 vapier Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.24 2011/11/14 06:10:32 tetromino Exp $ |
58 |
|
59 |
# @ECLASS: gnome2-utils.eclass |
60 |
# @MAINTAINER: |
61 |
@@ -72,6 +72,30 @@ |
62 |
DEPEND=">=sys-apps/sed-4" |
63 |
|
64 |
|
65 |
+# @FUNCTION: gnome2_environment_reset |
66 |
+# @DESCRIPTION: |
67 |
+# Reset various variables inherited from root's evironment to a reasonable |
68 |
+# default for ebuilds to help avoid access violations and test failures. |
69 |
+gnome2_environment_reset() { |
70 |
+ # Respected by >=glib-2.30.1-r1 |
71 |
+ export G_HOME="${T}" |
72 |
+ |
73 |
+ # GST_REGISTRY is to work around gst utilities trying to read/write /root |
74 |
+ export GST_REGISTRY="${T}/registry.xml" |
75 |
+ |
76 |
+ # XXX: code for resetting XDG_* directories should probably be moved into |
77 |
+ # a separate function in a non-gnome eclass |
78 |
+ export XDG_DATA_HOME="${T}/.local/share" |
79 |
+ export XDG_CONFIG_HOME="${T}/.config" |
80 |
+ export XDG_CACHE_HOME="${T}/.cache" |
81 |
+ export XDG_RUNTIME_DIR="${T}/run" |
82 |
+ mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \ |
83 |
+ "${XDG_RUNTIME_DIR}" |
84 |
+ # This directory needs to be owned by the user, and chmod 0700 |
85 |
+ # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html |
86 |
+ chmod 0700 "${XDG_RUNTIME_DIR}" |
87 |
+} |
88 |
+ |
89 |
# @FUNCTION: gnome2_gconf_savelist |
90 |
# @DESCRIPTION: |
91 |
# Find the GConf schemas that are about to be installed and save their location |
92 |
|
93 |
|
94 |
|
95 |
1.103 eclass/gnome2.eclass |
96 |
|
97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.103&view=markup |
98 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.103&content-type=text/plain |
99 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.102&r2=1.103 |
100 |
|
101 |
Index: gnome2.eclass |
102 |
=================================================================== |
103 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v |
104 |
retrieving revision 1.102 |
105 |
retrieving revision 1.103 |
106 |
diff -u -r1.102 -r1.103 |
107 |
--- gnome2.eclass 25 Sep 2011 15:15:21 -0000 1.102 |
108 |
+++ gnome2.eclass 14 Nov 2011 06:10:32 -0000 1.103 |
109 |
@@ -1,6 +1,6 @@ |
110 |
# Copyright 1999-2011 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.102 2011/09/25 15:15:21 pacho Exp $ |
113 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.103 2011/11/14 06:10:32 tetromino Exp $ |
114 |
|
115 |
# @ECLASS: gnome2.eclass |
116 |
# @MAINTAINER: |
117 |
@@ -88,8 +88,8 @@ |
118 |
# Prepare environment for build, fix build of scrollkeeper documentation, |
119 |
# run elibtoolize. |
120 |
gnome2_src_prepare() { |
121 |
- # GST_REGISTRY is to work around gst utilities trying to read/write /root |
122 |
- export GST_REGISTRY="${T}/registry.xml" |
123 |
+ # Prevent assorted access violations and test failures |
124 |
+ gnome2_environment_reset |
125 |
|
126 |
# Prevent scrollkeeper access violations |
127 |
gnome2_omf_fix |