[gentoo-dev] Lua eclasses: support EAPI 8

[gentoo-dev] Lua eclasses: support EAPI 8

[Marek Szuba]

Nothing special here. RESTRICT manipulation in lua-utils still uses +=
on purpose, for consistency with how other variables are handled there
as well as in order to avoid wasting CPU cycles on an EAPI version
check for something that ultimately achieves the same.

[gentoo-dev] [PATCH 1/3] lua-utils.eclass: support EAPI 8

[Marek Szuba]

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 eclass/lua-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index ddf44f354e1..59959eaf9c0 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -8,7 +8,7 @@
 # @AUTHOR:
 # Marek Szuba <marecki@gentoo.org>
 # Based on python-utils-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Utility functions for packages with Lua parts
 # @DESCRIPTION:
 # A utility eclass providing functions to query Lua implementations,
@@ -21,7 +21,7 @@ case ${EAPI:-0} in
 	0|1|2|3|4|5|6)
 		die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
 		;;
-	7)
+	7|8)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-- 
2.31.1

[gentoo-dev] [PATCH 2/3] lua.eclass: support EAPI 8

[Marek Szuba]

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 eclass/lua.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 46d9e848c87..e3a25c5d184 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: lua.eclass
@@ -8,7 +8,7 @@
 # @AUTHOR:
 # Marek Szuba <marecki@gentoo.org>
 # Based on python-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: A common eclass for Lua packages
 # @DESCRIPTION:
 # A common eclass providing helper functions to build and install
@@ -27,7 +27,7 @@
 #
 # @EXAMPLE:
 # @CODE
-# EAPI=7
+# EAPI=8
 #
 # LUA_COMPAT=( lua5-{1..3} )
 #
@@ -54,7 +54,7 @@ case ${EAPI:-0} in
 	0|1|2|3|4|5|6)
 		die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
 		;;
-	7)
+	7|8)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-- 
2.31.1

[gentoo-dev] [PATCH 3/3] lua-single.eclass: support EAPI 8

[Marek Szuba]

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 eclass/lua-single.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/lua-single.eclass b/eclass/lua-single.eclass
index 11c2790dac2..7abe1eb6674 100644
--- a/eclass/lua-single.eclass
+++ b/eclass/lua-single.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: lua-single.eclass
@@ -8,7 +8,7 @@
 # @AUTHOR:
 # Marek Szuba <marecki@gentoo.org>
 # Based on python-single-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: An eclass for Lua packages not installed for multiple implementations.
 # @DESCRIPTION:
 # An extension of lua.eclass suite for packages which don't support being
@@ -34,7 +34,7 @@
 #
 # @EXAMPLE:
 # @CODE
-# EAPI=7
+# EAPI=8
 #
 # LUA_COMPAT=( lua5-{1..3} )
 #
@@ -66,7 +66,7 @@ case ${EAPI:-0} in
 	0|1|2|3|4|5|6)
 		die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
 		;;
-	7)
+	7|8)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-- 
2.31.1

Re: [gentoo-dev] Lua eclasses: support EAPI 8

[William Hubbs]

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

On Wed, Jun 16, 2021 at 10:34:18AM +0100, Marek Szuba wrote:
> Nothing special here. RESTRICT manipulation in lua-utils still uses +=
> on purpose, for consistency with how other variables are handled there
> as well as in order to avoid wasting CPU cycles on an EAPI version
> check for something that ultimately achieves the same.

I was on vacation for a number of days so didn't have a chance to check
on this.

Is portage stable already supporting eapi 8? if so when did that happen?
If not we can't support it in eclasses yet.

Thanks,

William


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: [gentoo-dev] Lua eclasses: support EAPI 8

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

>>>>> On Tue, 29 Jun 2021, William Hubbs wrote:

> Is portage stable already supporting eapi 8? if so when did that
> happen?

portage-3.0.20 was the first version supporting EAPI 8, and 3.0.20-r6
is currently being stabilised. [1]

> If not we can't support it in eclasses yet.

I don't think that we ever had such a restriction. How would we test
support for a new EAPI in Portage, if we wouldn't allow ebuilds and
eclasses using it?

Ulrich

[1] https://bugs.gentoo.org/796503

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: [gentoo-dev] Lua eclasses: support EAPI 8

[Mike Gilbert]

On Tue, Jun 29, 2021 at 2:55 PM William Hubbs <williamh@gentoo.org> wrote:
>
> On Wed, Jun 16, 2021 at 10:34:18AM +0100, Marek Szuba wrote:
> > Nothing special here. RESTRICT manipulation in lua-utils still uses +=
> > on purpose, for consistency with how other variables are handled there
> > as well as in order to avoid wasting CPU cycles on an EAPI version
> > check for something that ultimately achieves the same.
>
> I was on vacation for a number of days so didn't have a chance to check
> on this.
>
> Is portage stable already supporting eapi 8? if so when did that happen?
> If not we can't support it in eclasses yet.

That's not true at all. You can't stabilize ebuilds with EAPI=8, but
there is no reason to hold off on merging eclass changes.