This series adds support for EAPI 8 to relevant eclasses, and updates
the latest version in each kernel branch to EAPI 8.

The only significant change is in kernel-install.eclass where we
populate IDEPEND instead of RDEPEND.

PR: https://github.com/gentoo/gentoo/pull/27191

Mike Gilbert (8):
dist-kernel-utils.eclass: support EAPI 8
kernel-install.eclass: support EAPI 8
portability.eclass: support EAPI 8
savedconfig.eclass: support EAPI 8
kernel-build.eclass: support EAPI 8
sys-kernel/vanilla-kernel: switch to EAPI 8
sys-kernel/gentoo-kernel: switch to EAPI 8
sys-kernel/gentoo-kernel-bin: switch to EAPI 8

eclass/dist-kernel-utils.eclass | 4 ++--
eclass/kernel-build.eclass | 4 ++--
eclass/kernel-install.eclass | 12 ++++++++----
eclass/portability.eclass | 4 ++--
eclass/savedconfig.eclass | 6 +++---
.../gentoo-kernel-bin-5.10.142.ebuild | 2 +-
.../gentoo-kernel-bin-5.15.67.ebuild | 2 +-
.../gentoo-kernel-bin-5.19.8.ebuild | 2 +-
.../gentoo-kernel-bin-5.4.212.ebuild | 2 +-
.../gentoo-kernel/gentoo-kernel-5.10.142.ebuild | 2 +-
.../gentoo-kernel/gentoo-kernel-5.15.67.ebuild | 2 +-
sys-kernel/gentoo-kernel/gentoo-kernel-5.19.8.ebuild | 2 +-
.../gentoo-kernel/gentoo-kernel-5.4.212.ebuild | 2 +-
.../vanilla-kernel/vanilla-kernel-5.10.142.ebuild | 2 +-
.../vanilla-kernel/vanilla-kernel-5.15.67.ebuild | 2 +-
.../vanilla-kernel/vanilla-kernel-5.19.8.ebuild | 2 +-
.../vanilla-kernel/vanilla-kernel-5.4.212.ebuild | 2 +-
17 files changed, 29 insertions(+), 25 deletions(-)

--
2.37.3

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Signed-off-by: Mike Gilbert <[email protected]>
---
eclass/portability.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index 8df8fcebc47..0ef6bd40c21 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -6,11 +6,11 @@
# [email protected]
# @AUTHOR:
# Diego Pettenò <[email protected]>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds

case ${EAPI:-0} in
- [567]) ;;
+ 5|6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac

--
2.37.3

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Signed-off-by: Mike Gilbert <[email protected]>
---
eclass/kernel-install.eclass | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index 8acf1ad1bc0..b7f9abe7bc9 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -6,7 +6,7 @@
# Distribution Kernel Project <[email protected]>
# @AUTHOR:
# Michał Górny <[email protected]>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
# @PROVIDES: dist-kernel-utils
# @BLURB: Installation mechanics for Distribution Kernels
# @DESCRIPTION:
@@ -34,7 +34,7 @@ case "${EAPI:-0}" in
0|1|2|3|4|5|6)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;;
- 7)
+ 7|8)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -51,14 +51,18 @@ RESTRICT+="
arm? ( test )
"

-# install-DEPEND actually
# note: we need installkernel with initramfs support!
-RDEPEND="
+INSTALL_DEPEND="
|| (
sys-kernel/installkernel-gentoo
sys-kernel/inst

Signed-off-by: Mike Gilbert <[email protected]>
---
eclass/dist-kernel-utils.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index d192c31db27..649363ad3e4 100644
--- a/eclass/dist-kernel-utils.eclass
+++ b/eclass/dist-kernel-utils.eclass
@@ -6,7 +6,7 @@
# Distribution Kernel Project <[email protected]>
# @AUTHOR:
# Michał Górny <[email protected]>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Utility functions related to Distribution Kernels
# @DESCRIPTION:
# This eclass provides various utility functions related to Distribution
@@ -18,7 +18,7 @@ case "${EAPI:-0}" in
0|1|2|3|4|5|6)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;;
- 7)
+ 7|8)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
--
2.37.3

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Signed-off-by: Mike Gilbert <[email protected]>
---
eclass/kernel-build.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 750a8e873d9..43d46f94108 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -6,7 +6,7 @@
# Distribution Kernel Project <[email protected]>
# @AUTHOR:
# Michał Górny <[email protected]>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
# @PROVIDES: kernel-install
# @BLURB: Build mechanics for Distribution Kernels
# @DESCRIPTION:
@@ -26,7 +26,7 @@ case "${EAPI:-0}" in
0|1|2|3|4|5|6)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;;
- 7)
+ 7|8)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
--
2.37.3

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Signed-off-by: Mike Gilbert <[email protected]>
---
eclass/savedconfig.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index 20669c08b33..52286caee6c 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# @ECLASS: savedconfig.eclass
# @MAINTAINER:
# [email protected]
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: common API for saving/restoring complex configuration files
# @DESCRIPTION:
# It is not uncommon to come across a package which has a very fine
@@ -35,7 +35,7 @@ inherit portability
IUSE="savedconfig"

case ${EAPI} in
- [5-7]) ;;
+ 5|6|7|8) ;;
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac

--
2.37.3

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Signed-off-by: Mike Gilbert <[email protected]>
---
sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.142.ebuild | 2 +-
sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.67.ebuild | 2 +-
sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.8.ebuild | 2 +-
sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.212.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.142.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.142.ebuild
index da84e07f808..6fa6637df87 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.142.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.142.ebuild
@@ -1,7 +1,7 @@
# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

inherit kernel-install toolchain-funcs

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.67.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.67.ebuild
index 0787e9b25ee..f81e1d17

Signed-off-by: Mike Gilbert <[email protected]>
---
sys-kernel/vanilla-kernel/vanilla-kernel-5.10.142.ebuild | 2 +-
sys-kernel/vanilla-kernel/vanilla-kernel-5.15.67.ebuild | 2 +-
sys-kernel/vanilla-kernel/vanilla-kernel-5.19.8.ebuild | 2 +-
sys-kernel/vanilla-kernel/vanilla-kernel-5.4.212.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.142.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.142.ebuild
index 718e3ea8262..beb11365e70 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.142.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.142.ebuild
@@ -1,7 +1,7 @@
# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

inherit kernel-build toolchain-funcs verify-sig

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.67.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.67.ebuild
index 13b58c5c983..e9d460c7094 100644
--- a/sys-kernel/vanilla-kernel/vanilla

Signed-off-by: Mike Gilbert <[email protected]>
---
sys-kernel/gentoo-kernel/gentoo-kernel-5.10.142.ebuild | 2 +-
sys-kernel/gentoo-kernel/gentoo-kernel-5.15.67.ebuild | 2 +-
sys-kernel/gentoo-kernel/gentoo-kernel-5.19.8.ebuild | 2 +-
sys-kernel/gentoo-kernel/gentoo-kernel-5.4.212.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.142.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.142.ebuild
index 8cc3f580387..4824ab95a1f 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.142.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.142.ebuild
@@ -1,7 +1,7 @@
# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

inherit kernel-build toolchain-funcs

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.67.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.67.ebuild
index 64c99e19532..4ea02f952ba 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.67.ebuild
+++ b/sys

On Thu, 08 Sep 2022, Mike Gilbert wrote:

@@ -18,7 +18,7 @@ case "${EAPI:-0}" in
0|1|2|3|4|5|6)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;;
- 7)
+ 7|8)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

While at it, maybe convert the conditional to the standard form in all
these eclasses? Like this:

case ${EAPI} in
7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac

I'd also drop EAPI 5 where it is applicable.

-----BEGIN PGP SIGNATURE-----

iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmMaKKQPHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4uIzUH+wXezX1hMG+y8DuuQPOPuDXrGkzslYgjkjAF BdZcX3LP8PNF8ZCvWB4IBXE/gwMBB/3mA/LUB1VwTyiZ06Nhvp1cKcez5nsjgi9f zvwE3pvwOBFzLfiEh5h9kZWBEF0az5P89Vq0RdrZE0w4BrII8WAxrxq8IOY5AG67 j4aHqeUnRD1nVCROvLgUkfnl0V9M6e5UGq24qdR9VBJkhIY9XUtOgEdfBMJA+2pf MtmvoizMxjKsai8+SaNMNDpTqHC0N/2/1551lw3tdh2hvn0mLLd4A12RUNMo0oaM JN8Ooras517m3/TAKjZglRziUGtCaThHMGAHMlr3YsFqiYDkRQw=
=Tmp8
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

On Thu, Sep 8, 2022 at 1:38 PM Ulrich Mueller <[email protected]> wrote:

On Thu, 08 Sep 2022, Mike Gilbert wrote:

@@ -18,7 +18,7 @@ case "${EAPI:-0}" in
0|1|2|3|4|5|6)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;;
- 7)
+ 7|8)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

While at it, maybe convert the conditional to the standard form in all
these eclasses? Like this:

case ${EAPI} in
7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac

I'd also drop EAPI 5 where it is applicable.

Done. Check the PR for updates.

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)