gentoo xmass resync : 25.12.2021

3 files changed, 43 insertions, 19 deletions

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index eac61c993e3e..966555e67575 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-AUX linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch 660 BLAKE2B 9cde57de0b2ccc1329c6aebd89df859fefa8e7cad6e574d06fdde2b7a20ac9c563c645181ecd24a4a788b54e647fd0519a43d7b8c8cd8890dc24c171f63b6b05 SHA512 e15a8ad59a38abb7688936a3f8e3db8d20903ce3737a63fad6bee521dedaad0d0fd49ce3efdf27279cd9e7f41c6f0b3d4543aba2e6534db3e05ef1241b60afaa
+AUX linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch 2053 BLAKE2B 63026eafd7e624385e18341f1f96e2fa8c7bff865b4bfb5f0c643c9ed4398727f8b36ee7f6fe471d1154d9d5300bdcbe18eb5a3b493c1ba71c25f71d01f73c25 SHA512 39de4ca1704c8eed0a1a856a88ca25f12b2c58f6c1b903d6e9601a287db31c718fe088b211fb6151abfe922b624418fb220d357c27b758f2b58fe2987ccdef79
 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
@@ -36,7 +36,7 @@ EBUILD linux-headers-5.11.ebuild 1180 BLAKE2B 6fd5766c2545afc72cffef9004e428cf4c
 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 1311 BLAKE2B 07edda7ec6cd3c8dad59dbf91c0be76251897a408da5dfd11ae3d40534fdfce6ecda866a02ee61d64b62ab0089ceb96ec9aab226b16d1c4e2bc2e7a22e3d523c SHA512 9d116cf5acf31b923e5f7ce092b963480f35778d8e341295caea1f9dbff1ab03ae68ace200c740f2703d5d7589dcce5136f56ff6668f2e88fe2e7cf95086d054
+EBUILD linux-headers-5.15-r1.ebuild 1331 BLAKE2B dd2198cd9113de83be6723fd31b0cd974bc199d91346d36f316195023f51c776412d0576d53801b042417b1da0d37be3c67ba5456fb1bb323b1092c66b5d3e0b SHA512 58da953f6addb980239860de507d923336b5244081972a3cdc492c8bed7fc9bec1057e78f14990465c9c5fff29f5f2b3f97aee384d180bd2fede82d8d35102a8
 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.10-Use-stddefs.h-instead-of-compiler.h.patch b/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch
index ac8bbe8b55fc..07c780fef26d 100644
--- a/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch
@@ -1,16 +1,42 @@
 Needed for musl.
 
-From 9eb3c31415686ae1296d7d450f886eeba5861ec1 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Thu, 3 Jun 2021 18:41:28 -0500
-Subject: [PATCH] Use stddefs.h instead of compiler.h
+https://git.alpinelinux.org/aports/tree/main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
 
----
- include/uapi/linux/swab.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+From: Matt Redfearn <matt.redfearn@mips.com>
+Date: Wed, 3 Jan 2018 09:57:30 +0000
+Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing
+ __always_inline
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining
+of some byteswap operations") added __always_inline to swab functions
+and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to
+userspace headers") added a definition of __always_inline for use in
+exported headers when the kernel's compiler.h is not available.
+
+However, since swab.h does not include stddef.h, if the header soup does
+not indirectly include it, the definition of __always_inline is missing,
+resulting in a compilation failure, which was observed compiling the
+perf tool using exported headers containing this commit:
+
+In file included from /usr/include/linux/byteorder/little_endian.h:12:0,
+                 from /usr/include/asm/byteorder.h:14,
+                 from tools/include/uapi/linux/perf_event.h:20,
+                 from perf.h:8,
+                 from builtin-bench.c:18:
+/usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’
+ static __always_inline __u16 __swab16p(const __u16 *p)
+
+Fix this by replacing the inclusion of linux/compiler.h with
+linux/stddef.h to ensure that we pick up that definition if required,
+without relying on it's indirect inclusion. compiler.h is then included
+indirectly, via stddef.h.
+
+Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers")
+Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
 
-diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
-index 7272f85..3736f2f 100644
 --- a/include/uapi/linux/swab.h
 +++ b/include/uapi/linux/swab.h
 @@ -3,7 +3,7 @@
@@ -22,6 +48,3 @@ index 7272f85..3736f2f 100644
  #include <asm/bitsperlong.h>
  #include <asm/swab.h>
  
--- 
-2.31.1
-
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 ec21c8e94f69..e3271e02a49c 100644
--- a/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
@@ -11,17 +11,18 @@ detect_version
 PATCH_PV=${PV} # to ease testing new versions against not existing patches
 PATCH_VER="1"
 PATCH_DEV="sam"
-SRC_URI="
-	${KERNEL_URI}
+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
+BDEPEND="app-arch/xz-utils
 	dev-lang/perl"
 
+# bug #816762
+RESTRICT="test"
+
 [[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
 
 src_unpack() {