From b9baffd9af9383cc886b1583814fe15163017d80 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Sep 2022 04:41:31 +0100 Subject: gentoo auto-resync : 10:09:2022 - 04:41:30 --- eclass/Manifest.gz | Bin 36976 -> 36982 bytes eclass/dist-kernel-utils.eclass | 14 ++++---------- eclass/kernel-build.eclass | 14 ++++---------- eclass/kernel-install.eclass | 22 ++++++++++------------ eclass/portability.eclass | 6 +++--- eclass/savedconfig.eclass | 6 +++--- 6 files changed, 24 insertions(+), 38 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index b0bbfd1326a2..7a9b3dcd7a11 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index d192c31db273..8c1b56f41506 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -6,7 +6,7 @@ # Distribution Kernel Project # @AUTHOR: # Michał Górny -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Utility functions related to Distribution Kernels # @DESCRIPTION: # This eclass provides various utility functions related to Distribution @@ -14,15 +14,9 @@ if [[ ! ${_DIST_KERNEL_UTILS} ]]; then -case "${EAPI:-0}" in - 0|1|2|3|4|5|6) - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" - ;; - 7) - ;; - *) - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" - ;; +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac # @FUNCTION: dist-kernel_build_initramfs diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 750a8e873d98..98a385bf72c0 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -6,7 +6,7 @@ # Distribution Kernel Project # @AUTHOR: # Michał Górny -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: kernel-install # @BLURB: Build mechanics for Distribution Kernels # @DESCRIPTION: @@ -22,15 +22,9 @@ if [[ ! ${_KERNEL_BUILD_ECLASS} ]]; then -case "${EAPI:-0}" in - 0|1|2|3|4|5|6) - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" - ;; - 7) - ;; - *) - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" - ;; +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac PYTHON_COMPAT=( python3_{8..11} ) diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index 8acf1ad1bc05..dc77cb514b1a 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -6,7 +6,7 @@ # Distribution Kernel Project # @AUTHOR: # Michał Górny -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: dist-kernel-utils # @BLURB: Installation mechanics for Distribution Kernels # @DESCRIPTION: @@ -30,15 +30,9 @@ if [[ ! ${_KERNEL_INSTALL_ECLASS} ]]; then -case "${EAPI:-0}" in - 0|1|2|3|4|5|6) - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" - ;; - 7) - ;; - *) - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" - ;; +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac inherit dist-kernel-utils mount-boot toolchain-funcs @@ -51,14 +45,18 @@ RESTRICT+=" arm? ( test ) " -# install-DEPEND actually # note: we need installkernel with initramfs support! -RDEPEND=" +_INSTALL_DEPEND=" || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )" +if [[ ${EAPI} == 7 ]]; then + RDEPEND="${_INSTALL_DEPEND}" +else + IDEPEND="${_INSTALL_DEPEND}" +fi # needed by objtool that is installed along with the kernel and used # to build external modules # NB: linux-mod.eclass also adds this dep but it's cleaner to have diff --git a/eclass/portability.eclass b/eclass/portability.eclass index 8df8fcebc47b..f4137bc2c2ed 100644 --- a/eclass/portability.eclass +++ b/eclass/portability.eclass @@ -6,11 +6,11 @@ # base-system@gentoo.org # @AUTHOR: # Diego Pettenò -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds -case ${EAPI:-0} in - [567]) ;; +case ${EAPI} in + 6|7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass index 20669c08b338..4681fd25328b 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: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 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]) ;; + 6|7|8) ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac -- cgit v1.2.3