gentoo resync : 29.12.2022

9 files changed, 212 insertions, 10 deletions

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index dbd97a0d522e..a5d8d9165fb1 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -9,6 +9,8 @@ DIST gentoo-headers-5.10-1.tar.xz 4304 BLAKE2B b5006ff13c8ef8394806919d547f1b15a
 DIST gentoo-headers-5.15-1.tar.xz 1496 BLAKE2B 9d88ecc517e226580ba43cba1b5cc62232690ed219f9c5e2d26047de6dbc4056eaaf04c320b2758acb3cb08b44ec402c7185989e0c5ded40c44f7b4bb1d77328 SHA512 f31d5fb4b5264a8b9c060d4215462796240c2423f0872e55ba4e96904086264f55b54d00342aef625a8f710c2ebc2d731bcf79cd0362b398c84235ff949eb229
 DIST gentoo-headers-5.16-0.tar.xz 1508 BLAKE2B 8a98768f3f33ca2fa5f61dbcea39388f7faf13033dc4f64dab989b0ecf06a193b22f3e692ad4aa882e4ae1428daae127f0562c7e3416b381d6825beff239a71d SHA512 e48e50ccd79ef79d59b986931dd65881e8a72d0531ff5043897c862795acb54fd3c3c0667eaca572cebd835a8c3196b01348f3865855d06fd409c185970855ef
 DIST gentoo-headers-5.17-0.tar.xz 1496 BLAKE2B 562923dd1fdb1fc8afc97196cf8ada2345170d91a4166722b474fc15484840bfcbb31d33b1a71d98fec7684f0c01660f3437dabca541dfbfe802591c81bea2f9 SHA512 27372682de83ba04aebcaa5d25aea8cfdf1ac51166b155c7bcd5e03ef2722f7cc2d4761d519c325267bfd79e69996d1a9647f0f24b4059d7771bc1f8e94a027e
+DIST gentoo-headers-5.18-0.tar.xz 1172 BLAKE2B 136ea2989239f776ec0873c87a9d53f7f579f8c7341a80543912161073c22e0af275141a7e935e7af03b8fd82be19f88538f8a4b2963e7dc31cc0a4b2324fe2e SHA512 f0df48f3926eda93da8cf637e377ce5c3b06a55744870224dd4968ff5fac9a68f79ce62e0c1635fcc02646b9ff94672678f241cbe6048161c4784a1ec48f402e
+DIST gentoo-headers-5.18-1.tar.xz 2064 BLAKE2B a988b180ed5d885b62f1913b3f43243f77be5dcca03c8df83748ceb71c79d5359785cc64811fea251aa055b9193bd436184f66b8e773abf028722424977ee6b8 SHA512 f7c9279115e836c1bc0f065fdae7d3a2260ec82eaa729f395c96bed2bf53f2ddc40325a2d116b39337e00d841fbc19d072f48475bab382c63fa89331b226aff6
 DIST gentoo-headers-5.4-2.tar.xz 11352 BLAKE2B 0ff989dbfff9070c291efe1a8b925462770e71d0c3faeb2e53581dcce02abe45969ec293a7293b6d843f483927b15f4accc1f24ee4966483164e8f72727cfad8 SHA512 b460e4d00bdd9ec2ecf229f3b2dde7c6468f775399ba6a49fa0533c0688628c7b27d83835c21eab07407fd98c220043cd1b20e37cc4decbd08a3f2fd9cf6c2be
 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
@@ -19,16 +21,22 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
+DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-headers-5.19_rc3-only-arch-and-headers.patch.xz 1330360 BLAKE2B cc6f521037aeb898b2e2470f9e8f06378aa67a1b17679a38fa195c0a599a415eab763f6534701411cb658c8af28e8e28a3ff916fd29e01419713232336ce78fd SHA512 50eba921f2aabbf27a78c966aa1a2920e7a1f6060cce70285d450e4f949890a90ca54114a95f43240d0daa87285561f11c1734aecb15e2d05bc575a3c3145cb6
 DIST linux-loongarch-next-on-5.17-20220423.tar.xz 177296 BLAKE2B 947fd8c2192fe454beb346ea700a09a711f629d87cc5ff5b5d882fa1d57bb5e918fea821f5eddd44152812502479f853527b8317176326f8926bd1a532666a86 SHA512 b18df78802c2718181da95fdd5f83761bec7fced16b0aec05d00dcbd9b5c25fc0f84fbdd7e3b3fa5a3f78aea66e268dde3d9272a3f921b595b16270623ae0b7e
-EBUILD linux-headers-3.18-r1.ebuild 1361 BLAKE2B 270cd9ff81c46a9ca63f968439b872dbfaf902cff9571635d96f6d6f20485df9a521c7d80b650565093155653921cd7acc40742b53d722a7e4b8cae55f0e2201 SHA512 87c35378df120141326b526893d674ce950f2c6e3b25a441b2f0d90a7d042d8eca8f4dd72d1d81fc56055def19695214b357e63009c6cf5647a187ef7e17a442
-EBUILD linux-headers-4.14-r2.ebuild 1281 BLAKE2B fc61b7667db0aa822a21779554864856855b9cbfa58f93e870381c732d5aee9bf7237f9eb792f6144d30886f90197df27ae927c3f9373d5881ab228851365b8b SHA512 f17f2c372f8970b24c06dedac4736a4da5615b3872ebef1320cdf4a15e99ffa6be567d9c5d7864de885a99f81422ed29488f30bda15e4dc8ce7e083c54823f93
-EBUILD linux-headers-4.19-r1.ebuild 1438 BLAKE2B 28127a5ae8061d037ea02afae8d4291dd3e374997df0a7ea98f695b1065b2cd6ace7e4512771a85fbf20800cff6da33d5f413403ab57ce5c84da34620ec9513b SHA512 97a1e60174b28603fb9f81e0919f346fe57a58a506e94b4be4a2c17ca13cf2c2c715746d3233aa0be239c312dc80a4719df098038cc9252f639a3bc7c8fef65a
-EBUILD linux-headers-4.4-r1.ebuild 1281 BLAKE2B fc61b7667db0aa822a21779554864856855b9cbfa58f93e870381c732d5aee9bf7237f9eb792f6144d30886f90197df27ae927c3f9373d5881ab228851365b8b SHA512 f17f2c372f8970b24c06dedac4736a4da5615b3872ebef1320cdf4a15e99ffa6be567d9c5d7864de885a99f81422ed29488f30bda15e4dc8ce7e083c54823f93
-EBUILD linux-headers-4.9-r1.ebuild 1289 BLAKE2B 6daaf5859cf5e0febabc680963c9048efdd5f405ab2b5f81a5d3e25ebc2f95c7e133e5d3f369e28769a7113a2e72c003cbf4e8810132f93ef6aaded76dd8e7f3 SHA512 0340d711ec70b37824fa315a04012aa4c37c6c3904a6b3165b238bd8aa0b03196ec8e5a952c147a8f134ed2094e030d83c2e5a7d503d4ca1d73c77fd88fe3d63
+DIST linux-loongarch-next-on-5.18-20220523.tar.xz 160468 BLAKE2B ccb6df7fbee86fba7ae725362efeb03cdf4187cf877a7f21e470639c14509214ed31c06434207950b219d34ed41a9fd2be0b711faeb5c6c02198836f06ef7dce SHA512 d87b667947a1d41fbea6db80dc2896c2c7e297bac471b99820b10a4d1e8a680f3566a89bdb4e70c0bdfba335ce158f3e82f930eb2f6b64fd6ba736028bf709f2
+EBUILD linux-headers-3.18-r1.ebuild 1363 BLAKE2B 4a0c5ff3c52a22cb7f4c23945887de8acc3e5ed6176e6a899d86cf795a09403152241df75834cf7a3085782052e7f0f785b6831751bbef51aaf3105ca82bbb5c SHA512 5ad47c9ad8776ccabefab9011176a7b6a2d12264a44159d653baa57b57d19f1a02cceb6e537ba055519d1578965229e5a680176b69530003e2cac18fa417581e
+EBUILD linux-headers-4.14-r2.ebuild 1283 BLAKE2B 2f0282f1078199c2e451ec8f2b4fb08e4e00e4b19cabd72d8abc6d8cbeb905cab9d84cac2436fda97f7a5bf476038ea1c85204bf4cc88634e98c18669611288b SHA512 c3b91a9c96f6af0ecb53e31da5224f61a5350dc8887679f632d9eb28788ab1f0221391950b92142734b0234a5a9d7070ff3cad78cf12fbeb5b08583144bda07e
+EBUILD linux-headers-4.19-r1.ebuild 1440 BLAKE2B 2fd246a850a1d1ccad8d1599bb10f6fb40492332eee2f8dacf172d834c94f7ff992d7b29d3f2510d19856249346bda102b9ae01ca3e0786d177943129ef5ca62 SHA512 7b4b276f4653d6c60b6aa1d55efc07fa7d9625b29dc4449cbaa7bcd7a583b0b26a8f84906977c870a76d4b00765a5870572f4e0be2804dbcec62d8949f026a72
+EBUILD linux-headers-4.4-r1.ebuild 1283 BLAKE2B 2f0282f1078199c2e451ec8f2b4fb08e4e00e4b19cabd72d8abc6d8cbeb905cab9d84cac2436fda97f7a5bf476038ea1c85204bf4cc88634e98c18669611288b SHA512 c3b91a9c96f6af0ecb53e31da5224f61a5350dc8887679f632d9eb28788ab1f0221391950b92142734b0234a5a9d7070ff3cad78cf12fbeb5b08583144bda07e
+EBUILD linux-headers-4.9-r1.ebuild 1291 BLAKE2B 2eade237107c4ff1174403241cd628b1d4a7b8fbfe2ac60297f94e32eabeec2c8899f56abc6a308afe1eaa60798203ca8bc7143a029baa42bb4af924f83f329b SHA512 b2f8134bb8015cf93812ebbb5f3002221ecb1c847ad660e5b3ecb56e494fa09a4f3ec88b3380461fb93a57d5ae803cc79d74d0603650377a1d981b656589dca3
 EBUILD linux-headers-5.10-r2.ebuild 1381 BLAKE2B 17cf6059383874449a8b2940ecc63a51a98c63a2f4dce005faf1882a52a1b26dc31081b035938dbcf50678da299691f9b42231e55fa9d2ccf9c7ec169a812878 SHA512 81088894b07751c740fcca91500af49548b2aa40e6c2ebe5fd41e44f529d52e7f0a60e23ae663db553b354935e5c6a3a802030a89f552bc8fe7f09b33b916866
 EBUILD linux-headers-5.15-r3.ebuild 1443 BLAKE2B 146180323a23927e6363809988e34660a06c9b552a40959cceec727b7218e8cfa984264c3e6532892a133c8dc71118b3d01a8f0d885c4060bd49f3648375d13d SHA512 516b8403e8bcfe701c6453c378ab309ff2a3d6ab3b942f6df8dd700627550a1e3ef94e24c6baa378c3b96ebaae77bda15ac19770bce994e93088776cc7afb5ea
 EBUILD linux-headers-5.16.ebuild 1450 BLAKE2B 76b1d118180ada6f141cf86fa69065ff1d4cfd6e3c7aa91dd55d94008ff0d564c0ae5d87b84d5674562c3af71cc908e2baf1265a964ea648bc5cad1664289ee8 SHA512 24336b922a8f12c34ad5449dafd3c1a862051a914c0bf670eca9596f4c5481ebea00892c859c0b717ece7052457e86e21f0de01d7df14a6801f04b5fe0d7e2ed
 EBUILD linux-headers-5.17-r1.ebuild 1808 BLAKE2B 8e8ddd9ba579a60c94b7ffbd030fb77827ee2ffaab936b28d4826fd6ae29132e0a6c2094c17db00faf1875f5654fa35b58f6abbf4be4c3284b18571d2cc5d00d SHA512 daedbbba0db22adc3d950fa5c754520d9a6b839304413b8148b0a306ec0014471114e31a62ee49fdc70c591895f0286a1fa8f6d41ce264041207fe43b2742814
+EBUILD linux-headers-5.18-r1.ebuild 1808 BLAKE2B 3139013d9c025d91363a1c88904845ac5462200b3b17267de4d8ea009cf9dce6df30cfaf74abda33835ce1f9d871ad61cc1ee4d2547ad1d1927b58f8204cd31c SHA512 866f71903e085561252462291683e9b524ea2872be2299a2215ab0496c848be695b6e58888b3b916ee06c600d4d2158d4e73daae1c5db1990a6f638a7127b481
+EBUILD linux-headers-5.18.ebuild 1810 BLAKE2B 13ed9f80d145ff0be8da20e85314953c4c73e1ffa983a8312c12ab07fd780a5130b083f2edd6fdb3863ad599579ce9dfb3887ad53c4922af142f0e12dcb68199 SHA512 3f8b2823079455ebf7c5a3450607eca1554c154a174113868f8b9bdb52be118aac86ab7d9f2554b76076838626c13ff81a103307bee96c9b21b063141ca1b0c7
+EBUILD linux-headers-5.19_rc3.ebuild 2122 BLAKE2B 2f34126ea905cc62a79d597c2e8e9b3a7c3edd95c4fea1b5cd8715d8e667b55606520370d976ba914d3c5ae15aef9d92ca214457f7f35a43a9303a2b66907e5c SHA512 ce1a2625f540c5beb71264eb476c79b43c769da1e8bcba07c305a0bedf23bf24b441411b91d40fa2d46c092c85a2ff536f31221bc756f950626076ddfc5adbbe
 EBUILD linux-headers-5.4-r2.ebuild 1254 BLAKE2B 4b8545aff89fbce63ac91030a81aa416664969e1475ab33e40e2612adaaac4918231b12178176dff833e9b8292575d1a9b17d32041d8362a3fd99671e5bedf8b SHA512 ba73a588dfde65af652ad9f8fe39ad4a59cdd285f0afaa7a6c038d1bb351770028864de5c304441fca9db3ebf1f1b2f0b2d57e4c8f2aba1c2ab9466c8e099176
 MISC metadata.xml 435 BLAKE2B ada9ec733091d4cd57861d44af76a14f7c9e89c577ef49503f14a8b4cfcf052d7559bedd84a414cdeb2a250b70fdac7b488a23b31b41cbbb515523947b5b4aac SHA512 91c300ef36a8e9a855f8657033b549f9fb699b3d21d46eddf70fca7c802f61bce1274ffddcb15b1454fff4c5b400ea55fedacbf7a7e24625f391641309238abb
diff --git a/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild b/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild
index 184ca9358ef3..1644d1ff59d0 100644
--- a/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
 
 src_test() {
 	einfo "Possible unescaped attribute/type usage"
-	egrep -r \
+	grep -E -r \
 		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
 		-e '\<([us](8|16|32|64))\>' \
 		.
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild
index c2e4b27768e6..eacc730770d3 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
 
 src_test() {
 	einfo "Possible unescaped attribute/type usage"
-	egrep -r \
+	grep -E -r \
 		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
 		-e '\<([us](8|16|32|64))\>' \
 		.
diff --git a/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild
index dc815ab8f84f..0d29957aa907 100644
--- a/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
 
 src_test() {
 	einfo "Possible unescaped attribute/type usage"
-	egrep -r \
+	grep -E -r \
 		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
 		-e '\<([us](8|16|32|64))\>' \
 		.
diff --git a/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild
index c2e4b27768e6..eacc730770d3 100644
--- a/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
 
 src_test() {
 	einfo "Possible unescaped attribute/type usage"
-	egrep -r \
+	grep -E -r \
 		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
 		-e '\<([us](8|16|32|64))\>' \
 		.
diff --git a/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild
index 689310c20111..af1379dc4af1 100644
--- a/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
 
 src_test() {
 	einfo "Possible unescaped attribute/type usage"
-	egrep -r \
+	grep -E -r \
 		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
 		-e '\<([us](8|16|32|64))\>' \
 		.
diff --git a/sys-kernel/linux-headers/linux-headers-5.18-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.18-r1.ebuild
new file mode 100644
index 000000000000..4f5cb7cb58ca
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.18-r1.ebuild
@@ -0,0 +1,62 @@
+# 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 loong m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="1"
+PATCH_DEV="sam"
+LOONGARCH_PATCH_VER="20220523"
+LOONGARCH_PATCH_DEV="xen0n"
+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}
+	experimental-loong? ( ${LOONGARCH_PATCH_VER:+https://dev.gentoo.org/~${LOONGARCH_PATCH_DEV}/distfiles/linux-loongarch-next-on-${PATCH_PV}-${LOONGARCH_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"
+IUSE+=" experimental-loong"
+
+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() {
+	# TODO: May need forward porting to newer versions
+	use elibc_musl && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+		"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
+	)
+
+	use experimental-loong && PATCHES+=(
+		"${WORKDIR}"/loongarch-next-on-${PATCH_PV}
+	)
+
+	# 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
+	# delete empty directories
+	find "${ED}" -empty -type d -delete || die
+}
diff --git a/sys-kernel/linux-headers/linux-headers-5.18.ebuild b/sys-kernel/linux-headers/linux-headers-5.18.ebuild
new file mode 100644
index 000000000000..a986dc69d625
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.18.ebuild
@@ -0,0 +1,62 @@
+# 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 loong m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="0"
+PATCH_DEV="xen0n"
+LOONGARCH_PATCH_VER="20220523"
+LOONGARCH_PATCH_DEV="xen0n"
+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}
+	experimental-loong? ( ${LOONGARCH_PATCH_VER:+https://dev.gentoo.org/~${LOONGARCH_PATCH_DEV}/distfiles/linux-loongarch-next-on-${PATCH_PV}-${LOONGARCH_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"
+IUSE+=" experimental-loong"
+
+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() {
+	# TODO: May need forward porting to newer versions
+	use elibc_musl && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+		"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
+	)
+
+	use experimental-loong && PATCHES+=(
+		"${WORKDIR}"/loongarch-next-on-${PATCH_PV}
+	)
+
+	# 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
+	# delete empty directories
+	find "${ED}" -empty -type d -delete || die
+}
diff --git a/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild b/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
new file mode 100644
index 000000000000..44c60013ad3e
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
@@ -0,0 +1,70 @@
+# 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 loong m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
+# The v5.19 rc patches generated on kernel.org contain a suppressed binary file diff,
+# hence unusable. Here we only let kernel-2 handle the base 5.18 tarball; the
+# v5.19 rc patch is to be handled later.
+K_BASE_VER="5.18"
+CKV="${K_BASE_VER}"
+inherit kernel-2
+detect_version
+
+#PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_PV="${K_BASE_VER}"
+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}
+	https://dev.gentoo.org/~xen0n/distfiles/sys-kernel/linux-headers/${P}-only-arch-and-headers.patch.xz"
+S="${WORKDIR}/linux-${K_BASE_VER}"
+
+# this is an rc version, for testing on loong only
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~loong"
+
+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() {
+	# apply the gentoo-headers patches after the big v5.19 rc patch, for
+	# avoiding flooding the console because of the lirc change
+	PATCHES=(
+		"${WORKDIR}/${P}-only-arch-and-headers.patch"
+		"${PATCHES[@]}"
+	)
+
+	# TODO: May need forward porting to newer versions
+	use elibc_musl && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+		"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
+	)
+
+	# 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
+	# delete empty directories
+	find "${ED}" -empty -type d -delete || die
+}