Re: [gentoo-dev] RFC: using array variables in qt4-r2.eclass

[Alexis Ballier]

On Fri, 13 Jul 2012 20:02:19 +0800
Ben de Groot <yngwin@g.o> wrote:

> --- /usr/portage/eclass/qt4-r2.eclass	2012-04-20
> 07:01:13.000000000 +0800 +++ qt4-r2.eclass.new	2012-07-13
> 19:45:59.259773917 +0800 @@ -19,6 +19,22 @@
>
>  export XDG_CONFIG_HOME="${T}"
>
> +# @ECLASS-VARIABLE: DOCS
> +# @DEFAULT_UNSET
> +# @DESCRIPTION:
> +# Array containing documents passed to dodoc command.
> +# Paths can be absolute or relative to ${S}.
> +#
> +# Example: DOCS=( ChangeLog README "${WORKDIR}/doc_folder/" )
> +
> +# @ECLASS-VARIABLE: HTML_DOCS
> +# @DEFAULT_UNSET
> +# @DESCRIPTION:
> +# Array containing documents passed to dohtml command.
> +# Paths can be absolute or relative to ${S}.
> +#
> +# Example: HTML_DOCS=( "doc/document.html" "${WORKDIR}/html_folder/"
> ) +
>  # @ECLASS-VARIABLE: LANGS
>  # @DEFAULT_UNSET
>  # @DESCRIPTION:
> @@ -44,6 +60,21 @@
>  done
>  unset x
>
> +# @ECLASS-VARIABLE: PATCHES
> +# @DEFAULT_UNSET
> +# @DESCRIPTION:
> +# Array variable containing all the patches to be applied. This
> variable +# is expected to be defined in the global scope of ebuilds.
> Make sure to +# specify the full path. This variable is used in
> src_prepare phase. +#
> +# Example:
> +# @CODE
> +#   PATCHES=(
> +#       "${FILESDIR}/mypatch.patch"
> +#       "${FILESDIR}/mypatch2.patch"
> +#   )
> +# @CODE
> +

this sounds like re-ordering and improving comments, no functional
change, right ?

[...]
> +	# backward compatibility for non-array variables
> +	if [[ -n ${DOCS} ]] && [[ "$(declare -p DOCS 2>/dev/null
> 2>&1)" != "declare -a"* ]]; then
> +		dodoc ${DOCS} || die "dodoc failed"
> +	fi
> +	if [[ -n ${HTML_DOCS} ]] && [[ "$(declare -p HTML_DOCS
> 2>/dev/null 2>&1)" != "declare -a"* ]]; then
> +		dohtml -r ${HTML_DOCS} || die "dohtml failed"
> +	fi
>  }

maybe issue an eqawarn in that case telling people to convert to
arrays; some time later make this an ewarn telling non-array support
will be removed and again later make this a die :)
(if you take that route i would expect you to start converting packages
to use arrays)


+1 for the whole thing btw

A.