From 6bab5a83c5c4681b93a8ec659290adb188ccd5ff Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Mon, 21 Mar 2022 15:22:06 +0000
Subject: eclass/linux-build: bump to EAPI 7

Package-Manager: Portage-3.0.30, Repoman-3.0.3
---
 eclass/linux-build.eclass | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'eclass')

diff --git a/eclass/linux-build.eclass b/eclass/linux-build.eclass
index 16afc6e6..174d9dde 100644
--- a/eclass/linux-build.eclass
+++ b/eclass/linux-build.eclass
@@ -9,7 +9,7 @@
 # Build kernel properly
 
 case "${EAPI:-0}" in
-	6)
+	6|7)
 		;;
 	*)	die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
 		;;
@@ -17,9 +17,9 @@ esac
 
 ETYPE="sources"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
-inherit savedconfig llvm python-any-r1 kernel-2 eapi7-ver
+inherit savedconfig llvm python-any-r1 kernel-2
 detect_version
 
 EXPORT_FUNCTIONS pkg_pretend pkg_setup src_prepare src_compile src_install pkg_postinst
@@ -43,11 +43,12 @@ S="${SRCDIR}"
 IUSE="build llvm source"
 REQUIRED_USE="symlink? ( source )"
 
-DEPEND="${DEPEND}
+BDEPEND="${BDEPEND}
 	sys-devel/bc
 	sys-apps/diffutils
+	virtual/libelf"
+DEPEND="${DEPEND}
 	sys-apps/kmod
-	virtual/libelf
 	llvm? (
 		sys-devel/clang:=
 		sys-devel/llvm:=
@@ -345,42 +346,42 @@ _linux-build_src_prepare_build() {
 	_linux-build_configval NET     || ewarn "CONFIG_NET is needed for >=sys-fs/udev-210"
 
 	if _linux-build_configval KERNEL_GZIP ; then
-		if ! has_version --host-root "app-arch/gzip" ; then
+		if ! has_version -b "app-arch/gzip" ; then
 			die "app-arch/gzip is required for CONFIG_KERNEL_GZIP"
 		fi
 	elif _linux-build_configval KERNEL_BZIP2 ; then
-		if ! has_version --host-root "app-arch/bzip2" ; then
+		if ! has_version -b "app-arch/bzip2" ; then
 			die "app-arch/bzip2 is required for CONFIG_KERNEL_BZIP2"
 		fi
 	elif _linux-build_configval KERNEL_LZMA ; then
-		if ! has_version --host-root "app-arch/lzma" ; then
+		if ! has_version -b "app-arch/lzma" ; then
 			die "app-arch/lzma is required for CONFIG_KERNEL_LZMA"
 		fi
 	elif _linux-build_configval KERNEL_XZ; then
-		if ! has_version --host-root "app-arch/xz-utils" ; then
+		if ! has_version -b "app-arch/xz-utils" ; then
 			die "app-arch/xz-utils is required for CONFIG_KERNEL_XZ"
 		fi
 	elif _linux-build_configval KERNEL_LZO ; then
-		if ! has_version --host-root "app-arch/lzop" ; then
+		if ! has_version -b "app-arch/lzop" ; then
 			die "app-arch/lzop is required for CONFIG_KERNEL_LZO"
 		fi
 	elif _linux-build_configval KERNEL_LZ4 ; then
-		if ! has_version --host-root "app-arch/lz4" ; then
+		if ! has_version -b "app-arch/lz4" ; then
 			die "app-arch/lz4 is required for CONFIG_KERNEL_LZ4"
 		fi
 	elif _linux-build_configval KERNEL_ZSTD ; then
-		if ! has_version --host-root "app-arch/zstd" ; then
+		if ! has_version -b "app-arch/zstd" ; then
 			die "app-arch/zstd is required for CONFIG_KERNEL_ZSTD"
 		fi
 	fi
 
 	if _linux-build_configval MODULE_COMPRESS ; then
 		if _linux-build_configval MODULE_COMPRESS_GZIP ; then
-			if ! has_version --host-root "app-arch/gzip" ; then
+			if ! has_version -b "app-arch/gzip" ; then
 				die "app-arch/gzip is required for CONFIG_MODULE_COMPRESS_GZIP"
 			fi
 		elif _linux-build_configval MODULE_COMPRESS_XZ ; then
-			if ! has_version --host-root "app-arch/xz-utils" ; then
+			if ! has_version -b "app-arch/xz-utils" ; then
 				die "app-arch/xz-utils is required for CONFIG_MODULE_COMPRESS_XZ"
 			fi
 		else
@@ -392,7 +393,7 @@ _linux-build_src_prepare_build() {
 		local _OPENSSL_REQ_ALGORITHM
 		local _OPENSSL_REQ_PKEYOPT
 
-		if ! has_version --host-root "dev-libs/openssl" ; then
+		if ! has_version -b "dev-libs/openssl" ; then
 			die "dev-libs/openssl is required for CONFIG_MODULE_SIG"
 		fi
 
-- 
cgit v1.2.3