On Sun, 2021-07-18 at 22:46 +0200, Andreas Sturmlechner wrote:
> Standardise include guard, fix minor typo.
>
> Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org>
> ---
> eclass/virtualx.eclass | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
> index ca52e8d2815..f362327cf77 100644
> --- a/eclass/virtualx.eclass
> +++ b/eclass/virtualx.eclass
> @@ -6,17 +6,16 @@
> # x...@gentoo.org
> # @AUTHOR:
> # Original author: Martin Schlemmer <aza...@gentoo.org>
> -# @SUPPORTED_EAPIS: 6 7
> -# @BLURB: This eclass can be used for packages that needs a working X
> environment to build.
> +# @SUPPORTED_EAPIS: 6 7 8
> +# @BLURB: This eclass can be used for packages that need a working X
> environment to build.
>
> case ${EAPI:-0} in
> - [0-5]) die "virtualx.eclass: EAPI ${EAPI} is too old." ;;
> - 6|7) ;;
> - *) die "virtualx.eclass: EAPI ${EAPI} is not supported yet." ;;
> + 6|7|8) ;;
> + *) die "virtualx.eclass: EAPI ${EAPI:-0} is not supported." ;;
> esac
>
> -if [[ ! ${_VIRTUAL_X} ]]; then
> -_VIRTUAL_X=1
> +if [[ ! ${_VIRTUAL_X_ECLASS} ]]; then
> +_VIRTUAL_X_ECLASS=1
>
> # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
> # @PRE_INHERIT
Things to consider changing:
1. The dual-function of VIRTUALX_DEPEND is ugly (and I don't think it
meets global variable invariancy requirements; not that the assignment
variant is used anywhere).
2. Maybe VIRTUALX_DEPEND can be exported conditionally to
VIRTUALX_REQUIRED!=always, to avoid some mistakes.
3. The eclass is leaving stray BDEPEND in global scope in EAPI 6.
--
Best regards,
Michał Górny
