gentoo resync : 04.01.2022

5 files changed, 130 insertions, 2 deletions

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 966555e67575..0b132a1a0222 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,5 @@
 AUX linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch 2053 BLAKE2B 63026eafd7e624385e18341f1f96e2fa8c7bff865b4bfb5f0c643c9ed4398727f8b36ee7f6fe471d1154d9d5300bdcbe18eb5a3b493c1ba71c25f71d01f73c25 SHA512 39de4ca1704c8eed0a1a856a88ca25f12b2c58f6c1b903d6e9601a287db31c718fe088b211fb6151abfe922b624418fb220d357c27b758f2b58fe2987ccdef79
+AUX linux-headers-5.15-remove-inclusion-sysinfo.h.patch 778 BLAKE2B baf48088843ab6dd42bd4e69cacb39bbf9633e5ff58868606cb553794c42e6ad4b360166b567b4b39bea4c9cc68c299e32156c687db3aeac284bfb4ce3da1b55 SHA512 d5d6c6e6edb3d50b4f3005838625a8a0064ea6f30c0ed98913ef584e973cd7e47b9f0670f932a434d66df16e850b0efb4fb01052d962ca82464af13810054156
 DIST gentoo-headers-3.18-1.tar.xz 3628 BLAKE2B 9e677389139e8e3e42508171593797b78f24368ceaba4f76c242b5827bf657444a65a0d3b334034cc54f7f14b00b9da7446356e1a5ffd9aacb05d5a336d4437f SHA512 89fb9b336fa3455752f6fe8626500d30245c04806890d4448a2895bbef2a5eae409940618fd4e0be57aa12784a198a695c32479f12d76450e16f2af1536e7a1f
 DIST gentoo-headers-4.14-1.tar.xz 4080 BLAKE2B 5d8bb4453d3b0b739922a86e0e45120fe5ad57c3310ff6a94830a3a7561fb3b5eef7805ff171bdf0d5582fc91848fad948162e63ec4922280c8ed68ba58d50e1 SHA512 e0f806db641c99f3f71e27fde29705685745c9c03b901c943cab5af84e2e9c3af96f5d2d10d8f5328ec7e4dba28b378f534317bf1bee597d429557b981f0a865
 DIST gentoo-headers-4.19-1.tar.xz 4040 BLAKE2B 4ccaf4fb6bde84f0b1f29534cf2f6effca48cb81d63b33086a1ec667069bcb57a3c3d5697c50bff8521343954d01d9c27139d62a9cf2c9f5f12bc0461441f4af SHA512 511accdfd104d9cc84b568132f1eb822f97d35120a438768c313c2cc2651197414dae7af05db81e26b32fb4febbf1e0812030fcb98395f6f65271f6605dc7bb6
@@ -31,12 +32,14 @@ EBUILD linux-headers-4.19.ebuild 1367 BLAKE2B 2298beea65dcbf8210e42449c661e2c793
 EBUILD linux-headers-4.4.ebuild 1207 BLAKE2B a2f83d4b4acf2d5bc7af8b85edf5315079a3ddd88d76f5a0c445f68a605399372ba9112214e4700bc0080dc418adbcf1581ac65ee0c6ec992448c105432e232d SHA512 c92d881c59fa1dbc56cbc7ea676aed2bd58e07c40e99050e3272058c2f3d111b211af4a6ef54672ba33a9f403baf914b616eb92642c8149aebda48482293db4c
 EBUILD linux-headers-4.9.ebuild 1215 BLAKE2B 641beba0aeedcf495af4af596554315ba91fd22571f041c48e5f7ffb24555e185578e1c7b0767ce4721318804b3588bc2a3c33c4f90de6d9033dc081193d384a SHA512 46eb18922d636f49a45ac8eb8b5952cfb19a26b175d71f831a96894a2527e5d761bc019a0e7fb60d8e17cf22ad0f4b1cbe1f34655974182fbecfb10231a358e7
 EBUILD linux-headers-5.10-r1.ebuild 1332 BLAKE2B 6b1cd046dac16c95fb21798cd6b586cf32c987cbd30315e256610d680685f3f2a55ed936b43100fbb6a717bfa5b470b5653ee6b87a8da21dcf2e46cb65535b8c SHA512 cc918f0da90e63bfee34316a885707045c6bf5e669bba78826865b5fa95a2ab0b1d003aabad9cd8447b98a3def6896453522219121f7263c0c617f1f5ac4c61d
+EBUILD linux-headers-5.10-r2.ebuild 1321 BLAKE2B 081e1492a684f864e940928d6a6169aee0b045132750b1a130b3557415355884f67e0f9183d756e768e619e1feb70a16877a7bd9a1594ac72519018eb2b915de SHA512 62cad7097496c083ea050b0f4d58058ef8aa982a63fe615af7a0acbe89317e389d496361f3dd5e0d929e56ebf78f8c4448145605a895b6a747cb87cf48e727ba
 EBUILD linux-headers-5.10.ebuild 1172 BLAKE2B 55e8fc5e06f629903d36f8786931f4b16248085624af46d9354f2276bf70f01e2b176f383acb955c5ef4a19d6b1805bf0810ba3d1cd0231c9ff9e4e313ae4fb8 SHA512 641e226b70909a9b620aa0739ccad0758dd3817c0bf15fc1133aaefaeeba3089f3396360d996b85a3ef25946f32a2e0abd417a567ad8be91c1ea0139368e322d
 EBUILD linux-headers-5.11.ebuild 1180 BLAKE2B 6fd5766c2545afc72cffef9004e428cf4c07c1f73a73c6f1d8241ae83e323890c639dc341e31eed93dbbe1841a52978153d48acaec562ce7abacad6f6e66a0f3 SHA512 6a50a05cdb78aefb84f2c627af7ebf5a1b2728bfe77cb71130cfa8340bfa471d71299afbeea0c07571250cb8dc14a66ee1c3834c112286927e87b71963c61fb6
 EBUILD linux-headers-5.12.ebuild 1168 BLAKE2B c18aaeb5837a9121292dead2a83de77c8e23926f3f18a84e5c17be036aebb68829576f830cd30d5b55e5a09aa1dfa36353e0e61af95d245d5098ea1bac961c25 SHA512 012d1b1510f57e3d5013fbc9d0fe1cc2b306e174aedd13c052f83562ec43c3f8d1bd9382f86ad8300e59de5840cda1698d719e7eb8b186b7704845c98b153dc8
 EBUILD linux-headers-5.13.ebuild 1102 BLAKE2B 9ccca73acfd898d26b1f3b891e1a12b7a9db736981b3d3e905ec406e0f5f72bd9ff4dfa462071c24e8c52f7aa0928042a1faf1bf5e6c59142a25ae4e24e62b72 SHA512 6aa07bf2b5d86594443734d94cc9efeab5cc3055cc925e361c91dfa531642d02689da3fc8578d981bdfaf18adb9526de6b6955e8862ee72d1a6d8b2bc45c4b63
 EBUILD linux-headers-5.14.ebuild 1151 BLAKE2B 3a2704581851089887f06ce7ac0dc02b2b5e88e7a2b81cc06e6147b269e982ba07630945c4393c27c22d075e44a340ce3c6b8e32f47cc2bffed728c7b15beec1 SHA512 46fc741184be80129e06591ef7d8afd92a34e5cc7be61e9d549d0a232345f025be835446dff01255f127ae97efedd460fbaee745bd2db4260dfc57c2a324d630
-EBUILD linux-headers-5.15-r1.ebuild 1331 BLAKE2B dd2198cd9113de83be6723fd31b0cd974bc199d91346d36f316195023f51c776412d0576d53801b042417b1da0d37be3c67ba5456fb1bb323b1092c66b5d3e0b SHA512 58da953f6addb980239860de507d923336b5244081972a3cdc492c8bed7fc9bec1057e78f14990465c9c5fff29f5f2b3f97aee384d180bd2fede82d8d35102a8
+EBUILD linux-headers-5.15-r1.ebuild 1330 BLAKE2B 43e4bd06e7105b8861c2ef54fa881f9c771803ca061eeceb5616ff8b87e638595759fe1c8f243f2aca9f5843b6b7203fa1f1ddf653211cbbad45139b6c06bbec SHA512 7f6ff43c762dd6ca19ebf7ddab6de1b583baf2f8f86f9da959e0588fbebc1b421bef9bfaebc77a62c1c2e53410e8745176a6bed902cfcd5eb021034941c14146
+EBUILD linux-headers-5.15-r3.ebuild 1397 BLAKE2B 1db3d00efdc8481182ddf33ffe5a11c44459d21331a5e10ed035eb277cd6cbf7086211e39c3275e30baac7f2d5ffafd2e3340f0df43dfa4e58cebc8b3750e157 SHA512 641d74493ad0346360b4a6d77c6d1c218be6f425bea99a168d5aa523636406f15315970e3dac0dec54516a5507a082fa3fd80f7f66531fb0bf91f13832262334
 EBUILD linux-headers-5.4-r1.ebuild 1182 BLAKE2B 91171636ae50ea4ee53c11c0d9038426227187f7a377190c6d1b9bc08e27ddfa9fb356d19e1408d4750ce6a56e1bb586eabd77e99525c392cfe95a1dda74c01a SHA512 65bb3e3e2c222f81e46c9c9e674e6718f1f38657d52a209499e1271e6ecb173bf7f70dfc7a1e96089cda665f84284f5c53907e12b075ae4d32b676a4c57371c3
 EBUILD linux-headers-5.9.ebuild 1180 BLAKE2B 6fd5766c2545afc72cffef9004e428cf4c07c1f73a73c6f1d8241ae83e323890c639dc341e31eed93dbbe1841a52978153d48acaec562ce7abacad6f6e66a0f3 SHA512 6a50a05cdb78aefb84f2c627af7ebf5a1b2728bfe77cb71130cfa8340bfa471d71299afbeea0c07571250cb8dc14a66ee1c3834c112286927e87b71963c61fb6
 MISC metadata.xml 345 BLAKE2B a7d97a94b8b2b72cbd9c7cc730bd66c6e174a2c0bb8bfcff7c279a87000a4435afbb048ca2d9424b391a0b0f992d0afd5efb20c0504062de3dfd49968fec0e74 SHA512 e7a62638f5ba1072ae773781c890f708d90001c4d517e2ecce8fbb791914f2e6769e5a0db63ade82f7d644c1ec3e9b19aae773c496d9059879a4192b7f26ccae
diff --git a/sys-kernel/linux-headers/files/linux-headers-5.15-remove-inclusion-sysinfo.h.patch b/sys-kernel/linux-headers/files/linux-headers-5.15-remove-inclusion-sysinfo.h.patch
new file mode 100644
index 000000000000..aa52ff9bd141
--- /dev/null
+++ b/sys-kernel/linux-headers/files/linux-headers-5.15-remove-inclusion-sysinfo.h.patch
@@ -0,0 +1,25 @@
+https://git.alpinelinux.org/aports/tree/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
+https://bugs.gentoo.org/828726
+
+[Adapted to drop the const.h change as things may rely on it like btrfs.]
+
+From: rofl0r <retnyg@gmx.net>
+Date: Mon, 20 Jan 2014 21:31:34 +0100
+Subject: [PATCH 3/3] remove inclusion of sysinfo.h in kernel.h
+
+the declaration of struct sysinfo clashes with userspace.
+it's not quite clear why that header was included from kernel.h,
+as none of its functionality is needed.
+
+--- a/include/uapi/linux/kernel.h
++++ b/include/uapi/linux/kernel.h
+@@ -2,7 +2,9 @@
+ #ifndef _UAPI_LINUX_KERNEL_H
+ #define _UAPI_LINUX_KERNEL_H
+ 
++#ifdef __GLIBC__
+ #include <linux/sysinfo.h>
++#endif
+ #include <linux/const.h>
+ 
+ #endif /* _UAPI_LINUX_KERNEL_H */
diff --git a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
new file mode 100644
index 000000000000..ce31c0eacbdf
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="1"
+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}
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="app-arch/xz-utils
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+}
+
+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
+
+	default
+}
+
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
+src_install() {
+	kernel-2_src_install
+
+	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
+	find "${ED}" -depth -type d -delete 2>/dev/null
+}
diff --git a/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
index e3271e02a49c..19291889a475 100644
--- a/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
@@ -15,7 +15,7 @@ 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild b/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
new file mode 100644
index 000000000000..6541482454d5
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="1"
+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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="app-arch/xz-utils
+	dev-lang/perl"
+
+# bug #816762
+RESTRICT="test"
+
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
+src_unpack() {
+	# avoid kernel-2_src_unpack
+	default
+}
+
+src_prepare() {
+	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
+		eapply "${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
+	fi
+
+	# avoid kernel-2_src_prepare
+	default
+}
+
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
+src_install() {
+	kernel-2_src_install
+
+	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+}