Advanced
Mailing List Archive

Mailing List Archive

  1. Home >
  2. Gentoo>
  3. Dev
[PATCH] virtualx.eclass: Support EAPI-8
asturm at gentoo
Jul 18, 2021, 1:46 PM
Post #1 of 3 (23 views)
Permalink
Standardise include guard, fix minor typo.

Signed-off-by: Andreas Sturmlechner <asturm@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 @@
# x11@gentoo.org
# @AUTHOR:
# Original author: Martin Schlemmer <azarah@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
--
2.32.0

Attached Files:

Re: [PATCH] virtualx.eclass: Support EAPI-8 [ In reply to ]
ulm at gentoo
Jul 18, 2021, 2:24 PM
Post #2 of 3 (23 views)
Permalink
>>>>> On Sun, 18 Jul 2021, Andreas Sturmlechner wrote:

> case ${EAPI:-0} in

This could be just ${EAPI} now (same for check-reqs.eclass).

> - [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." ;;

Use ${ECLASS} instead of explicit name?

> esac

Attached Files:

Re: [PATCH] virtualx.eclass: Support EAPI-8 [ In reply to ]
mgorny at gentoo
Jul 18, 2021, 10:57 PM
Post #3 of 3 (23 views)
Permalink
On Sun, 2021-07-18 at 22:46 +0200, Andreas Sturmlechner wrote:
> Standardise include guard, fix minor typo.
>
> Signed-off-by: Andreas Sturmlechner <asturm@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 @@
> # x11@gentoo.org
> # @AUTHOR:
> # Original author: Martin Schlemmer <azarah@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

©2024 GT.net. A Gossamer Threads company.
5th Floor, 455 Granville St., Vancouver, BC V6C 1T1, Canada | Legal