From 2692dfa901b96fca8a47b78967f6cf5a3d483dab Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 6 Oct 2023 20:39:44 +0100
Subject: sys-kernel/linux-headers: backport fixes for 6.5

* cc17adeef726a0df7fe5df7585a07128cd0c6070 ('Compiler Attributes: counted_by: Adjust name and identifier expansion')
* 721045f22e1a79cb04bfd4463cdf445108287666 ('uapi: stddef.h: Fix header guard location')
* 144ed54ed6ec4c099ff7c2b0064ed3ff89b73737 ('uapi: stddef.h: Fix __DECLARE_FLEX_ARRAY for C++')

Bug: https://bugs.gentoo.org/913169
Signed-off-by: Sam James <sam@gentoo.org>
---
 sys-kernel/linux-headers/Manifest                  |  1 +
 .../linux-headers/linux-headers-6.5-r1.ebuild      | 50 ++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 sys-kernel/linux-headers/linux-headers-6.5-r1.ebuild

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index e69e880eea41..3bd5b87f1446 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -10,6 +10,7 @@ DIST gentoo-headers-6.1-0.tar.xz 1172 BLAKE2B 6929760733cd4a89228554b57b1027ccf8
 DIST gentoo-headers-6.3-1.tar.xz 1172 BLAKE2B 1203030d430d98fec697da541707927fe8f2027420d88f4287dde4ccdf660366e6dac0b422c0e9f9b4381d5e27a9c8a861093c3d31cb8861d4e9dbd472c37ca5 SHA512 8809047184b60e7366d4016ec5b7bf13797ab29e9d415004b15678f6a3574d1350a6f8f934256ee3dccb6eb4b7d122f29e8dcadb55f5c9cc27583075eb21321b
 DIST gentoo-headers-6.4-1.tar.xz 1164 BLAKE2B a96e98e6b095566070ba6d40f51aeb14e61beb7884b7db962246e93bc54303f0ba0f3cf4900a440f0aeda220e756f0d59df77213e50512a649ed9812860fe681 SHA512 4ca45a6cc59ed21edb950bd1c67e47b9153943a71ec5a5319f9f9160456a184fbb97bfc7071038e5e011abe6f3fd375a46a4d6e60106d1fb8f95bff83ca9cdf6
 DIST gentoo-headers-6.5-1.tar.xz 1168 BLAKE2B 56c40f909565c8314b4821df457b9cc097c0325e60e3fe1476697eecc024fa66003dfa88fd7bc112a054e41e17e62d853c42ecd2b5bf2994030701d9f378ccb1 SHA512 4266f0b3cee7805bb877b5578a8c1d2edb0723ac0f6f08d8daba5b8f8d28d874a555fdf6dc5f89a876c0ece102a8cafa4cd5eb2da111b6365258457db649109f
+DIST gentoo-headers-6.5-2.tar.xz 3300 BLAKE2B 5f62bc4fdf2e149eac9f5540bc8e07b27698a3d699fe51a704083086fd52ebb61c0d8f7b4d3f67c4a25c4bfabda57e20703bc3c6c34a724c57c97457decad5c6 SHA512 31833ce19d0e808e61341a2297902eabffe0112a62e4ae0295b432240069f83998ebd3a6f87a8bd17cd20fc8f4715b20ced3bcebffe57d68d049e36f757340b2
 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
 DIST gentoo-headers-base-4.14.tar.xz 8017944 BLAKE2B e967a3f26fa002f62af72c165cf960e855f5d84dd105b3f136e5ae24f4cdfc9e5f8b217a83955b325ca4bd6bda0a9d4c4de02d8d79fd4aa72191bc63db96183a SHA512 2a4e83a9ee36ffa85b59ebac1e12f4f1c572825b767928a42c4748d924d04f0536bab4d9375ca68c11ad867c226f386c40c7c4d0158d1ab00c838eb5b2f9f21a
 DIST gentoo-headers-base-4.19.tar.xz 7956220 BLAKE2B 5b6868188b6cb505556b8f307972be6b27c0201e8287f6a2c4d0ac8bf16cfe048cb05afacf879731ba81de5e2a8c5afc4adad007e00b12efb8b2a158a666f4dd SHA512 ef0f159cb31651bf8e00c31d8ac807e64413c7bf88807e1ab4779524db10eec4726b65af0fad034a0cb2e000cd61a6008bcc174828061ffaf633c170dd09645c
diff --git a/sys-kernel/linux-headers/linux-headers-6.5-r1.ebuild b/sys-kernel/linux-headers/linux-headers-6.5-r1.ebuild
new file mode 100644
index 000000000000..2e7579c6996b
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-6.5-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 csky hexagon hppa ia64 loong m68k microblaze mips nios2 openrisc ppc ppc64 riscv s390 sh sparc x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="2"
+PATCH_DEV="sam"
+SRC_URI="
+	${KERNEL_URI}
+	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+"
+S="${WORKDIR}/linux-${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+"
+
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
+src_unpack() {
+	# Avoid kernel-2_src_unpack
+	default
+}
+
+src_prepare() {
+	# TODO: May need forward porting to newer versions
+	use elibc_musl && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
+	)
+
+	# Avoid kernel-2_src_prepare
+	default
+}
+
+src_install() {
+	kernel-2_src_install
+
+	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+	# Delete empty directories
+	find "${ED}" -empty -type d -delete || die
+}
-- 
cgit v1.2.3-65-gdbad