1 |
>>>>> On Fri, 4 Jul 2014, Michał Górny wrote: |
2 |
|
3 |
>> Since names like _USER or _PAM look a little dangerous, I suggest |
4 |
>> _<eclassname>_ECLASS for the variable's name. |
5 |
>> |
6 |
>> I have no strong preference for the variable's value. Is testing |
7 |
>> for a non-empty value sufficient? Then we should assign something |
8 |
>> simple (like "1"). If not, any string that is sufficiently random |
9 |
>> (like the one used in eutils) should be good. |
10 |
|
11 |
> I'd rather go for simple value and simple test. Exact tests with |
12 |
> weird names are more prone to mistakes, and this is not something |
13 |
> you usually test. |
14 |
|
15 |
I don't see any different opinions. The patch included below renames |
16 |
all variables whose name starts with two underscores. |
17 |
|
18 |
Please review. |
19 |
|
20 |
Ulrich |
21 |
|
22 |
|
23 |
--- autotools.eclass 1 Mar 2014 11:51:08 -0000 1.161 |
24 |
+++ autotools.eclass 5 Jul 2014 17:23:09 -0000 |
25 |
@@ -13,8 +13,8 @@ |
26 |
# Note: We require GNU m4, as does autoconf. So feel free to use any features |
27 |
# from the GNU version of m4 without worrying about other variants (i.e. BSD). |
28 |
|
29 |
-if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then |
30 |
-___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank" |
31 |
+if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then |
32 |
+_AUTOTOOLS_ECLASS=1 |
33 |
|
34 |
inherit libtool multiprocessing |
35 |
|
36 |
--- base.eclass 27 Sep 2012 16:35:41 -0000 1.58 |
37 |
+++ base.eclass 5 Jul 2014 17:23:09 -0000 |
38 |
@@ -1,4 +1,4 @@ |
39 |
-# Copyright 1999-2012 Gentoo Foundation |
40 |
+# Copyright 1999-2014 Gentoo Foundation |
41 |
# Distributed under the terms of the GNU General Public License v2 |
42 |
# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.58 2012/09/27 16:35:41 axs Exp $ |
43 |
|
44 |
@@ -11,8 +11,8 @@ |
45 |
# @DESCRIPTION: |
46 |
# The base eclass defines some default functions and variables. |
47 |
|
48 |
-if [[ ${___ECLASS_ONCE_BASE} != "recur -_+^+_- spank" ]] ; then |
49 |
-___ECLASS_ONCE_BASE="recur -_+^+_- spank" |
50 |
+if [[ -z ${_BASE_ECLASS} ]]; then |
51 |
+_BASE_ECLASS=1 |
52 |
|
53 |
inherit eutils |
54 |
|
55 |
--- cdrom.eclass 18 Jan 2012 12:42:06 -0000 1.5 |
56 |
+++ cdrom.eclass 5 Jul 2014 17:23:09 -0000 |
57 |
@@ -1,4 +1,4 @@ |
58 |
-# Copyright 1999-2012 Gentoo Foundation |
59 |
+# Copyright 1999-2014 Gentoo Foundation |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
# $Header: /var/cvsroot/gentoo-x86/eclass/cdrom.eclass,v 1.5 2012/01/18 12:42:06 vapier Exp $ |
62 |
|
63 |
@@ -15,8 +15,8 @@ |
64 |
# and when the function returns, you can assume that the cd has been |
65 |
# found at CDROM_ROOT. |
66 |
|
67 |
-if [[ -z ${___ECLASS_ONCE_CDROM} ]]; then |
68 |
-___ECLASS_ONCE_CDROM=1 |
69 |
+if [[ -z ${_CDROM_ECLASS} ]]; then |
70 |
+_CDROM_ECLASS=1 |
71 |
|
72 |
inherit portability |
73 |
|
74 |
--- cmake-utils.eclass 6 May 2014 15:29:02 -0000 1.107 |
75 |
+++ cmake-utils.eclass 5 Jul 2014 17:23:10 -0000 |
76 |
@@ -17,8 +17,8 @@ |
77 |
# builds (default), in-source builds and an implementation of the well-known use_enable |
78 |
# and use_with functions for CMake. |
79 |
|
80 |
-if [[ ${___ECLASS_ONCE_CMAKE_UTILS} != "recur -_+^+_- spank" ]] ; then |
81 |
-___ECLASS_ONCE_CMAKE_UTILS="recur -_+^+_- spank" |
82 |
+if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then |
83 |
+_CMAKE_UTILS_ECLASS=1 |
84 |
|
85 |
# @ECLASS-VARIABLE: WANT_CMAKE |
86 |
# @DESCRIPTION: |
87 |
--- cvs.eclass 28 Sep 2013 16:22:29 -0000 1.83 |
88 |
+++ cvs.eclass 5 Jul 2014 17:23:10 -0000 |
89 |
@@ -1,4 +1,4 @@ |
90 |
-# Copyright 1999-2013 Gentoo Foundation |
91 |
+# Copyright 1999-2014 Gentoo Foundation |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.83 2013/09/28 16:22:29 ottxor Exp $ |
94 |
|
95 |
@@ -13,8 +13,8 @@ |
96 |
# cvs_src_unpack. If you find that you need to call the cvs_* functions |
97 |
# directly, I'd be interested to hear about it. |
98 |
|
99 |
-if [[ ${___ECLASS_ONCE_CVS} != "recur -_+^+_- spank" ]] ; then |
100 |
-___ECLASS_ONCE_CVS="recur -_+^+_- spank" |
101 |
+if [[ -z ${_CVS_ECLASS} ]]; then |
102 |
+_CVS_ECLASS=1 |
103 |
|
104 |
inherit eutils |
105 |
|
106 |
--- enlightenment.eclass 12 Oct 2013 15:30:23 -0000 1.105 |
107 |
+++ enlightenment.eclass 5 Jul 2014 17:23:10 -0000 |
108 |
@@ -1,4 +1,4 @@ |
109 |
-# Copyright 1999-2013 Gentoo Foundation |
110 |
+# Copyright 1999-2014 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.105 2013/10/12 15:30:23 aballier Exp $ |
113 |
|
114 |
@@ -7,8 +7,8 @@ |
115 |
# enlightenment@g.o |
116 |
# @BLURB: simplify enlightenment package management |
117 |
|
118 |
-if [[ ${___ECLASS_ONCE_ENLIGHTENMENT} != "recur -_+^+_- spank" ]] ; then |
119 |
-___ECLASS_ONCE_ENLIGHTENMENT="recur -_+^+_- spank" |
120 |
+if [[ -z ${_ENLIGHTENMENT_ECLASS} ]]; then |
121 |
+_ENLIGHTENMENT_ECLASS=1 |
122 |
|
123 |
inherit eutils libtool |
124 |
|
125 |
--- eutils.eclass 4 Jul 2014 08:01:51 -0000 1.435 |
126 |
+++ eutils.eclass 5 Jul 2014 17:23:11 -0000 |
127 |
@@ -1,4 +1,4 @@ |
128 |
-# Copyright 1999-2013 Gentoo Foundation |
129 |
+# Copyright 1999-2014 Gentoo Foundation |
130 |
# Distributed under the terms of the GNU General Public License v2 |
131 |
# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.435 2014/07/04 08:01:51 ulm Exp $ |
132 |
|
133 |
@@ -15,8 +15,8 @@ |
134 |
# Due to the nature of this eclass, some functions may have maintainers |
135 |
# different from the overall eclass! |
136 |
|
137 |
-if [[ ${___ECLASS_ONCE_EUTILS} != "recur -_+^+_- spank" ]] ; then |
138 |
-___ECLASS_ONCE_EUTILS="recur -_+^+_- spank" |
139 |
+if [[ -z ${_EUTILS_ECLASS} ]]; then |
140 |
+_EUTILS_ECLASS=1 |
141 |
|
142 |
inherit multilib toolchain-funcs |
143 |
|
144 |
@@ -114,7 +114,7 @@ |
145 |
# @CODE |
146 |
estack_push() { |
147 |
[[ $# -eq 0 ]] && die "estack_push: incorrect # of arguments" |
148 |
- local stack_name="__ESTACK_$1__" ; shift |
149 |
+ local stack_name="_ESTACK_$1_" ; shift |
150 |
eval ${stack_name}+=\( \"\$@\" \) |
151 |
} |
152 |
|
153 |
@@ -127,23 +127,23 @@ |
154 |
estack_pop() { |
155 |
[[ $# -eq 0 || $# -gt 2 ]] && die "estack_pop: incorrect # of arguments" |
156 |
|
157 |
- # We use the fugly __estack_xxx var names to avoid collision with |
158 |
+ # We use the fugly _estack_xxx var names to avoid collision with |
159 |
# passing back the return value. If we used "local i" and the |
160 |
# caller ran `estack_pop ... i`, we'd end up setting the local |
161 |
- # copy of "i" rather than the caller's copy. The __estack_xxx |
162 |
+ # copy of "i" rather than the caller's copy. The _estack_xxx |
163 |
# garbage is preferable to using $1/$2 everywhere as that is a |
164 |
# bit harder to read. |
165 |
- local __estack_name="__ESTACK_$1__" ; shift |
166 |
- local __estack_retvar=$1 ; shift |
167 |
- eval local __estack_i=\${#${__estack_name}\[@\]} |
168 |
+ local _estack_name="_ESTACK_$1_" ; shift |
169 |
+ local _estack_retvar=$1 ; shift |
170 |
+ eval local _estack_i=\${#${_estack_name}\[@\]} |
171 |
# Don't warn -- let the caller interpret this as a failure |
172 |
# or as normal behavior (akin to `shift`) |
173 |
- [[ $(( --__estack_i )) -eq -1 ]] && return 1 |
174 |
+ [[ $(( --_estack_i )) -eq -1 ]] && return 1 |
175 |
|
176 |
- if [[ -n ${__estack_retvar} ]] ; then |
177 |
- eval ${__estack_retvar}=\"\${${__estack_name}\[${__estack_i}\]}\" |
178 |
+ if [[ -n ${_estack_retvar} ]] ; then |
179 |
+ eval ${_estack_retvar}=\"\${${_estack_name}\[${_estack_i}\]}\" |
180 |
fi |
181 |
- eval unset ${__estack_name}\[${__estack_i}\] |
182 |
+ eval unset ${_estack_name}\[${_estack_i}\] |
183 |
} |
184 |
|
185 |
# @FUNCTION: evar_push |
186 |
@@ -174,7 +174,7 @@ |
187 |
for var ; do |
188 |
[[ ${!var+set} == "set" ]] \ |
189 |
&& val=${!var} \ |
190 |
- || val="${___ECLASS_ONCE_EUTILS}" |
191 |
+ || val="unset_3842dbba1e279bf4dff664ea0f3483f4675af6c5" |
192 |
estack_push evar "${var}" "${val}" |
193 |
done |
194 |
} |
195 |
@@ -211,7 +211,7 @@ |
196 |
while (( cnt-- )) ; do |
197 |
estack_pop evar val || die "${FUNCNAME}: unbalanced push" |
198 |
estack_pop evar var || die "${FUNCNAME}: unbalanced push" |
199 |
- [[ ${val} == "${___ECLASS_ONCE_EUTILS}" ]] \ |
200 |
+ [[ ${val} == "unset_3842dbba1e279bf4dff664ea0f3483f4675af6c5" ]] \ |
201 |
&& unset ${var} \ |
202 |
|| printf -v "${var}" '%s' "${val}" |
203 |
done |
204 |
--- fcaps.eclass 27 Jun 2013 01:18:57 -0000 1.8 |
205 |
+++ fcaps.eclass 5 Jul 2014 17:23:12 -0000 |
206 |
@@ -1,4 +1,4 @@ |
207 |
-# Copyright 1999-2013 Gentoo Foundation |
208 |
+# Copyright 1999-2014 Gentoo Foundation |
209 |
# Distributed under the terms of the GNU General Public License v2 |
210 |
# $Header: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v 1.8 2013/06/27 01:18:57 vapier Exp $ |
211 |
|
212 |
@@ -28,8 +28,8 @@ |
213 |
# ) |
214 |
# @CODE |
215 |
|
216 |
-if [[ ${___ECLASS_ONCE_FCAPS} != "recur -_+^+_- spank" ]] ; then |
217 |
-___ECLASS_ONCE_FCAPS="recur -_+^+_- spank" |
218 |
+if [[ -z ${_FCAPS_ECLASS} ]]; then |
219 |
+_FCAPS_ECLASS=1 |
220 |
|
221 |
IUSE="+filecaps" |
222 |
|
223 |
@@ -182,8 +182,8 @@ |
224 |
continue 2 |
225 |
fi |
226 |
done |
227 |
- if [[ ${notfound} -eq 2 ]] && [[ -z ${__FCAPS_WARNED} ]] ; then |
228 |
- __FCAPS_WARNED="true" |
229 |
+ if [[ ${notfound} -eq 2 ]] && [[ -z ${_FCAPS_WARNED} ]] ; then |
230 |
+ _FCAPS_WARNED="true" |
231 |
ewarn "Could not find cap utils; make sure libcap or libcap-ng is available." |
232 |
fi |
233 |
fi |
234 |
--- fixheadtails.eclass 22 Aug 2011 04:46:31 -0000 1.12 |
235 |
+++ fixheadtails.eclass 5 Jul 2014 17:23:12 -0000 |
236 |
@@ -1,4 +1,4 @@ |
237 |
-# Copyright 1999-2011 Gentoo Foundation |
238 |
+# Copyright 1999-2014 Gentoo Foundation |
239 |
# Distributed under the terms of the GNU General Public License v2 |
240 |
# $Header: /var/cvsroot/gentoo-x86/eclass/fixheadtails.eclass,v 1.12 2011/08/22 04:46:31 vapier Exp $ |
241 |
|
242 |
@@ -11,7 +11,7 @@ |
243 |
|
244 |
DEPEND=">=sys-apps/sed-4" |
245 |
|
246 |
-__do_sed_fix() { |
247 |
+_do_sed_fix() { |
248 |
einfo " - fixed $1" |
249 |
sed -i \ |
250 |
-e 's/head \+-\([0-9]\)/head -n \1/g' \ |
251 |
@@ -28,7 +28,7 @@ |
252 |
local i |
253 |
einfo "Replacing obsolete head/tail with POSIX compliant ones" |
254 |
for i in "$@" ; do |
255 |
- __do_sed_fix "$i" |
256 |
+ _do_sed_fix "$i" |
257 |
done |
258 |
} |
259 |
|
260 |
--- flag-o-matic.eclass 4 Jul 2014 08:01:51 -0000 1.200 |
261 |
+++ flag-o-matic.eclass 5 Jul 2014 17:23:12 -0000 |
262 |
@@ -10,8 +10,8 @@ |
263 |
# This eclass contains a suite of functions to help developers sanely |
264 |
# and safely manage toolchain flags in their builds. |
265 |
|
266 |
-if [[ ${___ECLASS_ONCE_FLAG_O_MATIC} != "recur -_+^+_- spank" ]] ; then |
267 |
-___ECLASS_ONCE_FLAG_O_MATIC="recur -_+^+_- spank" |
268 |
+if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then |
269 |
+_FLAG_O_MATIC_ECLASS=1 |
270 |
|
271 |
inherit eutils toolchain-funcs multilib |
272 |
|
273 |
--- games.eclass 12 Mar 2014 18:54:12 -0000 1.157 |
274 |
+++ games.eclass 5 Jul 2014 17:23:12 -0000 |
275 |
@@ -8,8 +8,8 @@ |
276 |
# you better have a *good* reason why you're *not* using games.eclass |
277 |
# in a games-* ebuild |
278 |
|
279 |
-if [[ ${___ECLASS_ONCE_GAMES} != "recur -_+^+_- spank" ]] ; then |
280 |
-___ECLASS_ONCE_GAMES="recur -_+^+_- spank" |
281 |
+if [[ -z ${_GAMES_ECLASS} ]]; then |
282 |
+_GAMES_ECLASS=1 |
283 |
|
284 |
inherit base multilib toolchain-funcs eutils user |
285 |
|
286 |
--- kde4-base.eclass 4 Jul 2014 08:01:51 -0000 1.137 |
287 |
+++ kde4-base.eclass 5 Jul 2014 17:23:13 -0000 |
288 |
@@ -13,8 +13,8 @@ |
289 |
# NOTE: KDE 4 ebuilds currently support EAPIs 4 and 5. This will be |
290 |
# reviewed over time as new EAPI versions are approved. |
291 |
|
292 |
-if [[ ${___ECLASS_ONCE_KDE4_BASE} != "recur -_+^+_- spank" ]] ; then |
293 |
-___ECLASS_ONCE_KDE4_BASE="recur -_+^+_- spank" |
294 |
+if [[ -z ${_KDE4_BASE_ECLASS} ]]; then |
295 |
+_KDE4_BASE_ECLASS=1 |
296 |
|
297 |
# @ECLASS-VARIABLE: KDE_SELINUX_MODULE |
298 |
# @DESCRIPTION: |
299 |
--- kde4-functions.eclass 4 Jul 2014 08:01:51 -0000 1.69 |
300 |
+++ kde4-functions.eclass 5 Jul 2014 17:23:13 -0000 |
301 |
@@ -12,8 +12,8 @@ |
302 |
# This eclass contains all functions shared by the different eclasses, |
303 |
# for KDE 4 ebuilds. |
304 |
|
305 |
-if [[ ${___ECLASS_ONCE_KDE4_FUNCTIONS} != "recur -_+^+_- spank" ]] ; then |
306 |
-___ECLASS_ONCE_KDE4_FUNCTIONS="recur -_+^+_- spank" |
307 |
+if [[ -z ${_KDE4_FUNCTIONS_ECLASS} ]]; then |
308 |
+_KDE4_FUNCTIONS_ECLASS=1 |
309 |
|
310 |
# @ECLASS-VARIABLE: EAPI |
311 |
# @DESCRIPTION: |
312 |
--- kde4-meta-pkg.eclass 7 Apr 2013 17:33:18 -0000 1.12 |
313 |
+++ kde4-meta-pkg.eclass 5 Jul 2014 17:23:13 -0000 |
314 |
@@ -1,4 +1,4 @@ |
315 |
-# Copyright 1999-2013 Gentoo Foundation |
316 |
+# Copyright 1999-2014 Gentoo Foundation |
317 |
# Distributed under the terms of the GNU General Public License v2 |
318 |
# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.12 2013/04/07 17:33:18 kensington Exp $ |
319 |
|
320 |
@@ -9,8 +9,8 @@ |
321 |
# @DESCRIPTION: |
322 |
# This eclass should only be used for defining meta packages for KDE4. |
323 |
|
324 |
-if [[ ${___ECLASS_ONCE_KDE4_META_PKG} != "recur -_+^+_- spank" ]] ; then |
325 |
-___ECLASS_ONCE_KDE4_META_PKG="recur -_+^+_- spank" |
326 |
+if [[ -z ${_KDE4_META_PKG_ECLASS} ]]; then |
327 |
+_KDE4_META_PKG_ECLASS=1 |
328 |
|
329 |
inherit kde4-functions |
330 |
|
331 |
--- kde4-meta.eclass 17 Apr 2014 18:16:54 -0000 1.76 |
332 |
+++ kde4-meta.eclass 5 Jul 2014 17:23:13 -0000 |
333 |
@@ -12,8 +12,8 @@ |
334 |
# You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional. |
335 |
# Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY. |
336 |
|
337 |
-if [[ ${___ECLASS_ONCE_KDE4_META} != "recur -_+^+_- spank" ]] ; then |
338 |
-___ECLASS_ONCE_KDE4_META="recur -_+^+_- spank" |
339 |
+if [[ -z ${_KDE4_META_ECLASS} ]]; then |
340 |
+_KDE4_META_ECLASS=1 |
341 |
|
342 |
[[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" |
343 |
|
344 |
@@ -167,7 +167,7 @@ |
345 |
|| die "${escm}: can't export cmake files to '${S}'." |
346 |
fi |
347 |
# Copy all subdirectories |
348 |
- for subdir in $(__list_needed_subdirectories); do |
349 |
+ for subdir in $(_list_needed_subdirectories); do |
350 |
targetdir="" |
351 |
if [[ $subdir = doc/* && ! -e "$wc_path/$subdir" ]]; then |
352 |
continue |
353 |
@@ -196,7 +196,7 @@ |
354 |
tarfile="${DISTDIR}/${tarball}" |
355 |
|
356 |
# Detect real toplevel dir from tarball name - it will be used upon extraction |
357 |
- # and in __list_needed_subdirectories |
358 |
+ # and in _list_needed_subdirectories |
359 |
topdir="${tarball%.tar.*}/" |
360 |
|
361 |
ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" |
362 |
@@ -207,7 +207,7 @@ |
363 |
do |
364 |
extractlist+=" ${topdir}${f}" |
365 |
done |
366 |
- extractlist+=" $(__list_needed_subdirectories)" |
367 |
+ extractlist+=" $(_list_needed_subdirectories)" |
368 |
|
369 |
pushd "${WORKDIR}" > /dev/null |
370 |
|
371 |
@@ -228,7 +228,7 @@ |
372 |
eend $? |
373 |
|
374 |
if [[ -n ${KDE4_STRICTER} ]]; then |
375 |
- for f in $(__list_needed_subdirectories fatal); do |
376 |
+ for f in $(_list_needed_subdirectories fatal); do |
377 |
if [[ ! -e ${S}/${f#*/} ]]; then |
378 |
eerror "'${f#*/}' is missing" |
379 |
abort=true |
380 |
@@ -311,7 +311,7 @@ |
381 |
debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}" |
382 |
} |
383 |
|
384 |
-__list_needed_subdirectories() { |
385 |
+_list_needed_subdirectories() { |
386 |
local i j kmextra kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist |
387 |
|
388 |
# We expand KMEXTRA by adding CMakeLists.txt files |
389 |
--- libtool.eclass 12 Jun 2014 07:14:25 -0000 1.111 |
390 |
+++ libtool.eclass 5 Jul 2014 17:23:14 -0000 |
391 |
@@ -14,8 +14,8 @@ |
392 |
# generated libtool files. We do not run the libtoolize program because that |
393 |
# requires a regeneration of the main autotool files in order to work properly. |
394 |
|
395 |
-if [[ ${___ECLASS_ONCE_LIBTOOL} != "recur -_+^+_- spank" ]] ; then |
396 |
-___ECLASS_ONCE_LIBTOOL="recur -_+^+_- spank" |
397 |
+if [[ -z ${_LIBTOOL_ECLASS} ]]; then |
398 |
+_LIBTOOL_ECLASS=1 |
399 |
|
400 |
# If an overlay has eclass overrides, but doesn't actually override the |
401 |
# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's |
402 |
@@ -43,8 +43,8 @@ |
403 |
local disp="${src} patch" |
404 |
local log="${T}/elibtool.log" |
405 |
|
406 |
- if [[ -z ${__ELT_NOTED_TMP} ]] ; then |
407 |
- __ELT_NOTED_TMP=true |
408 |
+ if [[ -z ${_ELT_NOTED_TMP} ]] ; then |
409 |
+ _ELT_NOTED_TMP=true |
410 |
printf 'temp patch: %s\n' "${patch}" > "${log}" |
411 |
fi |
412 |
printf '\nTrying %s\n' "${disp}" >> "${log}" |
413 |
--- multilib.eclass 17 Jan 2014 07:44:45 -0000 1.105 |
414 |
+++ multilib.eclass 5 Jul 2014 17:23:14 -0000 |
415 |
@@ -1,4 +1,4 @@ |
416 |
-# Copyright 1999-2013 Gentoo Foundation |
417 |
+# Copyright 1999-2014 Gentoo Foundation |
418 |
# Distributed under the terms of the GNU General Public License v2 |
419 |
# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.105 2014/01/17 07:44:45 vapier Exp $ |
420 |
|
421 |
@@ -10,8 +10,8 @@ |
422 |
# @DESCRIPTION: |
423 |
# This eclass is for all functions pertaining to handling multilib configurations. |
424 |
|
425 |
-if [[ ${___ECLASS_ONCE_MULTILIB} != "recur -_+^+_- spank" ]] ; then |
426 |
-___ECLASS_ONCE_MULTILIB="recur -_+^+_- spank" |
427 |
+if [[ -z ${_MULTILIB_ECLASS} ]]; then |
428 |
+_MULTILIB_ECLASS=1 |
429 |
|
430 |
inherit toolchain-funcs |
431 |
|
432 |
@@ -414,13 +414,13 @@ |
433 |
export ABI=$1 |
434 |
|
435 |
# First restore any saved state we have laying around. |
436 |
- if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then |
437 |
+ if [[ ${_DEFAULT_ABI_SAVED} == "true" ]] ; then |
438 |
for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do |
439 |
- vv="__abi_saved_${v}" |
440 |
+ vv="_abi_saved_${v}" |
441 |
[[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v} |
442 |
unset ${vv} |
443 |
done |
444 |
- unset __DEFAULT_ABI_SAVED |
445 |
+ unset _DEFAULT_ABI_SAVED |
446 |
fi |
447 |
|
448 |
# We want to avoid the behind-the-back magic of gcc-config as it |
449 |
@@ -428,10 +428,10 @@ |
450 |
if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then |
451 |
# Back that multilib-ass up so we can restore it later |
452 |
for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do |
453 |
- vv="__abi_saved_${v}" |
454 |
+ vv="_abi_saved_${v}" |
455 |
[[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv} |
456 |
done |
457 |
- export __DEFAULT_ABI_SAVED="true" |
458 |
+ export _DEFAULT_ABI_SAVED="true" |
459 |
|
460 |
# Set the CHOST native first so that we pick up the native |
461 |
# toolchain and not a cross-compiler by accident #202811. |
462 |
--- multiprocessing.eclass 21 Dec 2013 09:40:37 -0000 1.8 |
463 |
+++ multiprocessing.eclass 5 Jul 2014 17:23:14 -0000 |
464 |
@@ -1,4 +1,4 @@ |
465 |
-# Copyright 1999-2013 Gentoo Foundation |
466 |
+# Copyright 1999-2014 Gentoo Foundation |
467 |
# Distributed under the terms of the GNU General Public License v2 |
468 |
# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.8 2013/12/21 09:40:37 vapier Exp $ |
469 |
|
470 |
@@ -33,8 +33,8 @@ |
471 |
# multijob_finish |
472 |
# @CODE |
473 |
|
474 |
-if [[ ${___ECLASS_ONCE_MULTIPROCESSING} != "recur -_+^+_- spank" ]] ; then |
475 |
-___ECLASS_ONCE_MULTIPROCESSING="recur -_+^+_- spank" |
476 |
+if [[ -z ${_MULTIPROCESSING_ECLASS} ]]; then |
477 |
+_MULTIPROCESSING_ECLASS=1 |
478 |
|
479 |
# @FUNCTION: bashpid |
480 |
# @DESCRIPTION: |
481 |
--- pam.eclass 5 Aug 2012 15:34:20 -0000 1.23 |
482 |
+++ pam.eclass 5 Jul 2014 17:23:14 -0000 |
483 |
@@ -1,4 +1,4 @@ |
484 |
-# Copyright 1999-2012 Gentoo Foundation |
485 |
+# Copyright 1999-2014 Gentoo Foundation |
486 |
# Distributed under the terms of the GNU General Public License, v2 or later |
487 |
# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.23 2012/08/05 15:34:20 jlec Exp $ |
488 |
# |
489 |
@@ -13,8 +13,8 @@ |
490 |
# This eclass contains functions to install pamd configuration files and |
491 |
# pam modules. |
492 |
|
493 |
-if [[ ${___ECLASS_ONCE_PAM} != "recur -_+^+_- spank" ]] ; then |
494 |
-___ECLASS_ONCE_PAM="recur -_+^+_- spank" |
495 |
+if [[ -z ${_PAM_ECLASS} ]]; then |
496 |
+_PAM_ECLASS=1 |
497 |
|
498 |
inherit flag-o-matic multilib |
499 |
|
500 |
--- pax-utils.eclass 18 May 2013 13:43:20 -0000 1.21 |
501 |
+++ pax-utils.eclass 5 Jul 2014 17:23:15 -0000 |
502 |
@@ -1,4 +1,4 @@ |
503 |
-# Copyright 1999-2013 Gentoo Foundation |
504 |
+# Copyright 1999-2014 Gentoo Foundation |
505 |
# Distributed under the terms of the GNU General Public License v2 |
506 |
# $Header: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v 1.21 2013/05/18 13:43:20 zorry Exp $ |
507 |
|
508 |
@@ -22,8 +22,8 @@ |
509 |
# to contain either "PT", "XT" or "none". The default is to attempt both |
510 |
# PT_PAX and XATTR_PAX. |
511 |
|
512 |
-if [[ ${___ECLASS_ONCE_PAX_UTILS} != "recur -_+^+_- spank" ]] ; then |
513 |
-___ECLASS_ONCE_PAX_UTILS="recur -_+^+_- spank" |
514 |
+if [[ -z ${_PAX_UTILS_ECLASS} ]]; then |
515 |
+_PAX_UTILS_ECLASS=1 |
516 |
|
517 |
# @ECLASS-VARIABLE: PAX_MARKINGS |
518 |
# @DESCRIPTION: |
519 |
--- portability.eclass 28 May 2014 09:48:01 -0000 1.25 |
520 |
+++ portability.eclass 5 Jul 2014 17:23:15 -0000 |
521 |
@@ -9,8 +9,8 @@ |
522 |
# Diego Pettenò <flameeyes@g.o> |
523 |
# @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds |
524 |
|
525 |
-if [[ ${___ECLASS_ONCE_PORTABILITY} != "recur -_+^+_- spank" ]] ; then |
526 |
-___ECLASS_ONCE_PORTABILITY="recur -_+^+_- spank" |
527 |
+if [[ -z ${_PORTABILITY_ECLASS} ]]; then |
528 |
+_PORTABILITY_ECLASS=1 |
529 |
|
530 |
# @FUNCTION: treecopy |
531 |
# @USAGE: <orig1> [orig2 orig3 ....] <dest> |
532 |
--- qmake-utils.eclass 2 Dec 2013 09:42:38 -0000 1.1 |
533 |
+++ qmake-utils.eclass 5 Jul 2014 17:23:15 -0000 |
534 |
@@ -1,4 +1,4 @@ |
535 |
-# Copyright 1999-2013 Gentoo Foundation |
536 |
+# Copyright 1999-2014 Gentoo Foundation |
537 |
# Distributed under the terms of the GNU General Public License v2 |
538 |
# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.1 2013/12/02 09:42:38 pinkbyte Exp $ |
539 |
|
540 |
@@ -11,8 +11,8 @@ |
541 |
# @DESCRIPTION: |
542 |
# Utility eclass providing wrapper functions for Qt4 and Qt5 qmake. |
543 |
|
544 |
-if [[ ${___ECLASS_ONCE_QMAKE_UTILS} != "recur -_+^+_- spank" ]]; then |
545 |
-___ECLASS_ONCE_QMAKE_UTILS="recur -_+^+_- spank" |
546 |
+if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then |
547 |
+_QMAKE_UTILS_ECLASS=1 |
548 |
|
549 |
inherit eutils multilib toolchain-funcs |
550 |
|
551 |
--- readme.gentoo.eclass 2 Jul 2014 13:32:48 -0000 1.11 |
552 |
+++ readme.gentoo.eclass 5 Jul 2014 17:23:15 -0000 |
553 |
@@ -15,8 +15,8 @@ |
554 |
# shown at first package installation and a file for later reviewing will be |
555 |
# installed under /usr/share/doc/${PF} |
556 |
|
557 |
-if [[ ${___ECLASS_ONCE_README_GENTOO} != "recur -_+^+_- spank" ]] ; then |
558 |
-___ECLASS_ONCE_README_GENTOO="recur -_+^+_- spank" |
559 |
+if [[ -z ${_README_GENTOO_ECLASS} ]]; then |
560 |
+_README_GENTOO_ECLASS=1 |
561 |
|
562 |
inherit eutils |
563 |
|
564 |
--- toolchain-funcs.eclass 17 Jan 2014 03:46:31 -0000 1.126 |
565 |
+++ toolchain-funcs.eclass 5 Jul 2014 17:23:16 -0000 |
566 |
@@ -13,8 +13,8 @@ |
567 |
# in such a way that you can rely on the function always returning |
568 |
# something sane. |
569 |
|
570 |
-if [[ ${___ECLASS_ONCE_TOOLCHAIN_FUNCS} != "recur -_+^+_- spank" ]] ; then |
571 |
-___ECLASS_ONCE_TOOLCHAIN_FUNCS="recur -_+^+_- spank" |
572 |
+if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then |
573 |
+_TOOLCHAIN_FUNCS_ECLASS=1 |
574 |
|
575 |
inherit multilib |
576 |
|
577 |
--- unpacker.eclass 1 May 2014 19:27:14 -0000 1.17 |
578 |
+++ unpacker.eclass 5 Jul 2014 17:23:16 -0000 |
579 |
@@ -15,8 +15,8 @@ |
580 |
# - merge rpm unpacking |
581 |
# - support partial unpacks? |
582 |
|
583 |
-if [[ ${___ECLASS_ONCE_UNPACKER} != "recur -_+^+_- spank" ]] ; then |
584 |
-___ECLASS_ONCE_UNPACKER="recur -_+^+_- spank" |
585 |
+if [[ -z ${_UNPACKER_ECLASS} ]]; then |
586 |
+_UNPACKER_ECLASS=1 |
587 |
|
588 |
# @ECLASS-VARIABLE: UNPACKER_BZ2 |
589 |
# @DEFAULT_UNSET |
590 |
--- user.eclass 4 Jul 2014 08:01:51 -0000 1.23 |
591 |
+++ user.eclass 5 Jul 2014 17:23:16 -0000 |
592 |
@@ -1,4 +1,4 @@ |
593 |
-# Copyright 1999-2012 Gentoo Foundation |
594 |
+# Copyright 1999-2014 Gentoo Foundation |
595 |
# Distributed under the terms of the GNU General Public License v2 |
596 |
# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.23 2014/07/04 08:01:51 ulm Exp $ |
597 |
|
598 |
@@ -13,8 +13,8 @@ |
599 |
# The user eclass contains a suite of functions that allow ebuilds |
600 |
# to quickly make sure users in the installed system are sane. |
601 |
|
602 |
-if [[ ${___ECLASS_ONCE_USER} != "recur -_+^+_- spank" ]] ; then |
603 |
-___ECLASS_ONCE_USER="recur -_+^+_- spank" |
604 |
+if [[ -z ${_USER_ECLASS} ]]; then |
605 |
+_USER_ECLASS=1 |
606 |
|
607 |
# @FUNCTION: _assert_pkg_ebuild_phase |
608 |
# @INTERNAL |
609 |
--- versionator.eclass 23 Nov 2013 04:35:16 -0000 1.24 |
610 |
+++ versionator.eclass 5 Jul 2014 17:23:16 -0000 |
611 |
@@ -1,4 +1,4 @@ |
612 |
-# Copyright 1999-2011 Gentoo Foundation |
613 |
+# Copyright 1999-2014 Gentoo Foundation |
614 |
# Distributed under the terms of the GNU General Public License v2 |
615 |
# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.24 2013/11/23 04:35:16 jcallen Exp $ |
616 |
|
617 |
@@ -26,8 +26,8 @@ |
618 |
# version_is_at_least want have |
619 |
# which may be buggy, so use with caution. |
620 |
|
621 |
-if [[ ${___ECLASS_ONCE_VERSIONATOR} != "recur -_+^+_- spank" ]] ; then |
622 |
-___ECLASS_ONCE_VERSIONATOR="recur -_+^+_- spank" |
623 |
+if [[ -z ${_VERSIONATOR_ECLASS} ]]; then |
624 |
+_VERSIONATOR_ECLASS=1 |
625 |
|
626 |
inherit eutils |