1 |
On Fri, Jul 13, 2012 at 2:34 PM, Alexis Ballier <aballier@g.o> wrote: |
2 |
> On Fri, 13 Jul 2012 20:02:19 +0800 |
3 |
> Ben de Groot <yngwin@g.o> wrote: |
4 |
> |
5 |
>> --- /usr/portage/eclass/qt4-r2.eclass 2012-04-20 |
6 |
>> 07:01:13.000000000 +0800 +++ qt4-r2.eclass.new 2012-07-13 |
7 |
>> 19:45:59.259773917 +0800 @@ -19,6 +19,22 @@ |
8 |
>> |
9 |
>> export XDG_CONFIG_HOME="${T}" |
10 |
>> |
11 |
>> +# @ECLASS-VARIABLE: DOCS |
12 |
>> +# @DEFAULT_UNSET |
13 |
>> +# @DESCRIPTION: |
14 |
>> +# Array containing documents passed to dodoc command. |
15 |
>> +# Paths can be absolute or relative to ${S}. |
16 |
>> +# |
17 |
>> +# Example: DOCS=( ChangeLog README "${WORKDIR}/doc_folder/" ) |
18 |
>> + |
19 |
>> +# @ECLASS-VARIABLE: HTML_DOCS |
20 |
>> +# @DEFAULT_UNSET |
21 |
>> +# @DESCRIPTION: |
22 |
>> +# Array containing documents passed to dohtml command. |
23 |
>> +# Paths can be absolute or relative to ${S}. |
24 |
>> +# |
25 |
>> +# Example: HTML_DOCS=( "doc/document.html" "${WORKDIR}/html_folder/" |
26 |
>> ) + |
27 |
>> # @ECLASS-VARIABLE: LANGS |
28 |
>> # @DEFAULT_UNSET |
29 |
>> # @DESCRIPTION: |
30 |
>> @@ -44,6 +60,21 @@ |
31 |
>> done |
32 |
>> unset x |
33 |
>> |
34 |
>> +# @ECLASS-VARIABLE: PATCHES |
35 |
>> +# @DEFAULT_UNSET |
36 |
>> +# @DESCRIPTION: |
37 |
>> +# Array variable containing all the patches to be applied. This |
38 |
>> variable +# is expected to be defined in the global scope of ebuilds. |
39 |
>> Make sure to +# specify the full path. This variable is used in |
40 |
>> src_prepare phase. +# |
41 |
>> +# Example: |
42 |
>> +# @CODE |
43 |
>> +# PATCHES=( |
44 |
>> +# "${FILESDIR}/mypatch.patch" |
45 |
>> +# "${FILESDIR}/mypatch2.patch" |
46 |
>> +# ) |
47 |
>> +# @CODE |
48 |
>> + |
49 |
> |
50 |
> this sounds like re-ordering and improving comments, no functional |
51 |
> change, right ? |
52 |
> |
53 |
|
54 |
Correct, no functional changes in this hunk. |
55 |
|
56 |
> [...] |
57 |
>> + # backward compatibility for non-array variables |
58 |
>> + if [[ -n ${DOCS} ]] && [[ "$(declare -p DOCS 2>/dev/null |
59 |
>> 2>&1)" != "declare -a"* ]]; then |
60 |
>> + dodoc ${DOCS} || die "dodoc failed" |
61 |
>> + fi |
62 |
>> + if [[ -n ${HTML_DOCS} ]] && [[ "$(declare -p HTML_DOCS |
63 |
>> 2>/dev/null 2>&1)" != "declare -a"* ]]; then |
64 |
>> + dohtml -r ${HTML_DOCS} || die "dohtml failed" |
65 |
>> + fi |
66 |
>> } |
67 |
> |
68 |
> maybe issue an eqawarn in that case telling people to convert to |
69 |
> arrays; some time later make this an ewarn telling non-array support |
70 |
> will be removed and again later make this a die :) |
71 |
> (if you take that route i would expect you to start converting packages |
72 |
> to use arrays) |
73 |
> |
74 |
|
75 |
We have no intention of deprecating non-array variables in qt4-r2 eclass. |
76 |
|
77 |
> |
78 |
> +1 for the whole thing btw |
79 |
> |
80 |
> A. |
81 |
> |
82 |
|
83 |
Thanks, |
84 |
Pesa |