gentoo resync : 25.03.2022

1 files changed, 16 insertions, 12 deletions

diff --git a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
index ce31c0eacbdf..08907ac2fb24 100644
--- a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
-inherit kernel-2 toolchain-funcs
+inherit kernel-2
 detect_version
 
 PATCH_PV=${PV} # to ease testing new versions against not existing patches
@@ -14,25 +14,28 @@ SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 "
-S="${WORKDIR}"/linux-${PV}
+S="${WORKDIR}/linux-${PV}"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
-BDEPEND="app-arch/xz-utils
+BDEPEND="
+	app-arch/xz-utils
 	dev-lang/perl"
 
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
 src_unpack() {
-	unpack ${A}
+	# avoid kernel-2_src_unpack
+	default
 }
 
 src_prepare() {
-	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PATCH_PV}/*.patch
-
-	if use elibc_musl ; then
-		# TODO: May need forward porting to newer versions
-		eapply "${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
-	fi
+	# TODO: May need forward porting to newer versions
+	use elibc_musl && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+	)
 
+	# avoid kernel-2_src_prepare
 	default
 }
 
@@ -43,6 +46,7 @@ src_test() {
 src_install() {
 	kernel-2_src_install
 
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
+	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+	# delete empty directories
+	find "${ED}" -empty -type d -delete || die
 }