gentoo resync : 28.04.2021

11 files changed, 129 insertions, 115 deletions

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 5e51bd7481f0..6561c12e7918 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -5,6 +5,7 @@ DIST gentoo-headers-4.4-1.tar.xz 6624 BLAKE2B 9cdf0c22520e413f175942c4994dd90b0f
 DIST gentoo-headers-4.9-1.tar.xz 5416 BLAKE2B 2538870b340d4e4b260ada37b0571ba770a4bf93b0f0cf78819b4bf68b8ddc43c314d7fc5d12a78bc71c9bb12306d986ae0ae74159ec7edc7deea371f6b5f015 SHA512 1069f50c58f25ceb8a13c8e53dce6a21e352e2a624da3b9a6d139939e7613e9a97226eb0173fa060ee69443c6a50b53b6d5c6d752dcaebffbe2a78f06cfbe2b6
 DIST gentoo-headers-5.10-1.tar.xz 4304 BLAKE2B b5006ff13c8ef8394806919d547f1b15ac32cc4d290e8c5f5a5073f54112db194a9e743177ae54941d8a504e15b662751258259183c47c574936744d7c51b405 SHA512 3154558df20e3a8821af23b2a585eaccb6c40877850b1cf752c435c170f7f322a48e77cee63bcc061b69aff8602987f4506d803c73f394929716295aface4f3d
 DIST gentoo-headers-5.11-1.tar.xz 3624 BLAKE2B 378eed88876a911e47ea08563f4fea840bfc11def916bce47c3268029ba926ced06e621edb53c9248fed4de547cfb447cc25da2222a864983a746fec06fb60d9 SHA512 896cacd48e9965ea724c13ca5a69b8c9aa4f47e631b539c71e4936462d50da3d34863e7419217ba434bcd97ebf8b05d2fc65bc9e60a584a108e864f4cf7f02fc
+DIST gentoo-headers-5.12-1.tar.xz 3624 BLAKE2B 71206e81c9df3c26b93384231094f2e7762cc3b957261a18999b4e3c782ca3edd2ba25461dcb308b938f515495aabbf5d34234f2b9f072fc344a1c8eb1c3a001 SHA512 f15f31116e81114794de8d2ff30e60ff3844a2202837753754b8ee2c2a56dffcfacc6f873d3d67bc313367ad678d00d84410bf6ced0a32cf391e2978d9eaed6a
 DIST gentoo-headers-5.4-2.tar.xz 11352 BLAKE2B 0ff989dbfff9070c291efe1a8b925462770e71d0c3faeb2e53581dcce02abe45969ec293a7293b6d843f483927b15f4accc1f24ee4966483164e8f72727cfad8 SHA512 b460e4d00bdd9ec2ecf229f3b2dde7c6468f775399ba6a49fa0533c0688628c7b27d83835c21eab07407fd98c220043cd1b20e37cc4decbd08a3f2fd9cf6c2be
 DIST gentoo-headers-5.9-1.tar.xz 4304 BLAKE2B 5dda91dac529cf3afca220d0ec323f679eae00e850e127ca6fb7dd42313afe7d4e2b23860a5b58673c070456e1ebd6b0d48efd681a764eef1bab996de579fd11 SHA512 3522d25e4d13f703e69a7e8da1813b38c8977821363b56af1988d78c446087dea4c3499283a2fdef2dc000fde29b945abb821a01f53ac0ac6c2b551699b3b18c
 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
@@ -14,15 +15,17 @@ DIST gentoo-headers-base-4.4.tar.xz 3911752 BLAKE2B 5031ecd48b99cb0c9c35ca935fa6
 DIST gentoo-headers-base-4.9.tar.xz 4052748 BLAKE2B e279954c56170fbfa4ebae8dade731825b3d5f0cd5d73a5b33cd93a9c8f5fa140e14edf0d5ac26a452fe8a61b16fdcc851f5329f56e4c8dcf4472a995de44c4c SHA512 a03418cfba7fa4531279d9122411af3e285e962506e8df9279fbbb27ae08a4e30725bd1cf03f48ad523f61f2889195e6c844fa4c7b4ef2f828baf47ef402abfa
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
+DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-EBUILD linux-headers-3.18.ebuild 1421 BLAKE2B 868c21a9099d59a64cb0021d3ea829020d9e79a7eeace4eba410ac4ec539579a74f86ccfc7b232ca96eba914153cec0aaadd34caeda7882db1ebef25291fde6b SHA512 dadf4dca955d388faa00ffb87fc9fc8e7374a3b1c1c1e9f8bb04642217d80cfa9d20d2a4806e11113687d6f57675f59ed91d244f4cf960ef96f3f76ad1f8876d
-EBUILD linux-headers-4.14-r1.ebuild 1495 BLAKE2B b868a7aead670b2eaee111407708412ed84f5f4d639b3fe643baf49d0286a6627cab8592b166d685ae66ae718d19313c671374e920ba7d1b15e0059a5b774102 SHA512 e0cbe2dd55dd8e90320f5fad03afd58d2cf718fb578502c119811fb0a90e762c17b0e318d43941ffa166ec8d0c4fb3c224dc5eb43faf1a6e3abedbc91259df0e
-EBUILD linux-headers-4.19.ebuild 1666 BLAKE2B d26fdf6198c744a14cbcf4f0e80cabb00bb8147b4264d3c29933ef13c74822ba5014cd6f72459bc05ee9a41bdbbec26f0926aa47538f94ed70657723c8efea14 SHA512 fd03381a44dfa74c9022ffdd8b9e096226ab21dab496ae620f3e68ed9b60fa99116122b227c6b97bf241bcf68388f5dd46c41748f23ba0a37e1863fb3bc379c1
-EBUILD linux-headers-4.4.ebuild 1495 BLAKE2B b868a7aead670b2eaee111407708412ed84f5f4d639b3fe643baf49d0286a6627cab8592b166d685ae66ae718d19313c671374e920ba7d1b15e0059a5b774102 SHA512 e0cbe2dd55dd8e90320f5fad03afd58d2cf718fb578502c119811fb0a90e762c17b0e318d43941ffa166ec8d0c4fb3c224dc5eb43faf1a6e3abedbc91259df0e
-EBUILD linux-headers-4.9.ebuild 1504 BLAKE2B 626c6622060a8d906314f4b32edd77253cabc13ce35d136dd62a8a05100788e038bed639ce4a3ece091e8512d38e631b8b6ee7bd9d0c13e2919a2c4bb4111e9f SHA512 3397bacde65e6f2b6752e976128156abe8ba9ab345dadae79f6c72f2f042f16702b1c5594bb26ae2546c593d45cfe807b61ff8714ee985e04f700a29bf979b5a
-EBUILD linux-headers-5.10.ebuild 1208 BLAKE2B 2f1543b0a2bbb507923f2ae432091974c8d98c37804ddcce2175731e95d52a4839fdac7443f2bbc4765d1beeedc4c004b61c2b81937e5a38d0a2fa768383f6b9 SHA512 038335afb08334393557c0e6b57d2fd7d544d8865e75024cba7c63bf615beb0561609f0d141c73ca3f3699e6d2d40f1945762e84a2c2dc222ce3285210b843b8
-EBUILD linux-headers-5.11.ebuild 1215 BLAKE2B 49a56d82d4964850c9c0d0f19fca40e4168cf6654030eadc5d869b1f0ee40df71d0631274844fb3298c96d52f21eb62a22d701ea941ff1bdc63c521dca3397a3 SHA512 c2b94b98ab12388d3f460aadfbd2f616ada45433d27b48ac851206788791190c445b316b09178d254f1465da5f67e5024e30006a3abf6edf938e950df6e16138
-EBUILD linux-headers-5.4-r1.ebuild 1216 BLAKE2B 5623127ce22ffb1c4a4fee5eb9501146acaccf491375968931199d0b97b5cc64b79824e7c22c4adc70607398afeac33bffe7852c70d48734ed8b213bde3c41ab SHA512 b6ecc13763f2b9fe5b9b05d522e77a05ffbb4cb8cb8bb1774b74f465b33355cfa6638ad08b913356baa2011d280a4b71e56497c38c8a9a49f9e33b0073197ec6
-EBUILD linux-headers-5.9.ebuild 1215 BLAKE2B c8067a971c440b0a8578806e6242ee35374c1bb1280b68c1fd59acd848d49037963bbd3b60393e03f236eccab7fc7f0dd9b681fa0a556b68cc197f39681523e3 SHA512 449b5aac3e08e96ff928f3ee072e557aee686b2508721abe32c5967c97eabf60a25eca078b718882431b01d2e111988ba23d3442e2b1ab9378c02036298467fa
+EBUILD linux-headers-3.18.ebuild 1307 BLAKE2B 018ff8d6cc95bb9611f2b38fdfc81c64e2c3e0873bfceffa247eba0a9c2323e6ae04f71540fd2fdb85151b55c9f953433770e6af503e025c0592e25f49a5717a SHA512 119080bdbac1a3b21738e3aa6dde7265f1aeb54f198acf05d955ab3c174d71fa9fa38b64560b81fe4c723c99b2e4b2e23635868c9e4710b93ceabeece411f3f2
+EBUILD linux-headers-4.14-r1.ebuild 1234 BLAKE2B 8b3ba1e5a7cc105e5332110e9bdbe9ce740eabb514d19d7ab2d80f4e52769dce51a42fa0fa4a16f1e10e7f9faf9fb3a43f2ff4f1671de44e929880589b555e5e SHA512 969d3533419c0137991c17abd139affda393fdb0888e2fa88502778561eeae720c9abbfe284c429beacdc134ba8c62be37acd4eb60e3ebfaebfb67c0c5ad971e
+EBUILD linux-headers-4.19.ebuild 1405 BLAKE2B f63c848cb212de0c0940f1101ec435bcdcd32bb6c34d1013606b1c38edf23e53b4acd5c07dc8b090fb66555e94d31ff9202388bfd86e5b874639883284f191c4 SHA512 c0140476252b3060dc312d610af92c4c1dec74dd94991ae56e2d68fe5fa590a246f03a5d24f22c1c8c9beb8a74ecacfc25ed6420521fa3f320dd242e59df4d51
+EBUILD linux-headers-4.4.ebuild 1234 BLAKE2B 8b3ba1e5a7cc105e5332110e9bdbe9ce740eabb514d19d7ab2d80f4e52769dce51a42fa0fa4a16f1e10e7f9faf9fb3a43f2ff4f1671de44e929880589b555e5e SHA512 969d3533419c0137991c17abd139affda393fdb0888e2fa88502778561eeae720c9abbfe284c429beacdc134ba8c62be37acd4eb60e3ebfaebfb67c0c5ad971e
+EBUILD linux-headers-4.9.ebuild 1242 BLAKE2B 00a727e93fb995953cedd630d35a94822ad2fd5f14edc99b15696212ce1a44e7782c802aa76c84ae1f8f75981090670928570e4dbc137d9b1735abe5644fe6f7 SHA512 8d714c0de3c9b2d079f0d2cb4db07e3bc1b8025c16d79173cf1a4232c8aac21817cbc51d12d18726a3918befea655f5cfffc048412392e56aaeccbd75427a3a3
+EBUILD linux-headers-5.10.ebuild 1207 BLAKE2B 9424605aa011b353838655ac05160b8effdcc8f5c622423b483b22c271c0826d359c87c57ccd5837aa9393a141c5cccba6f7a47d03f5178a3b5cc14226552b46 SHA512 57805323b96d73ff813c6e255fb4ec3421c3e4ba1a6bc03f4d4c9d99d0b7b006329ad662a85b2e6710f0ba7c32240a9e01787396d4be8cea9fafc58caeb438ae
+EBUILD linux-headers-5.11.ebuild 1215 BLAKE2B 70f485a79f1d858295d73090390481f38d02e4d6dd4b0accfd0673f1ad2ce925d2b369f1c7ad533f745d6ef5846d5be9d63f3ef9a62799b1d4b9b5817f1267d6 SHA512 c5442aea092d4659aecfbe042834255ab50fbaf17ba9276af125289f36ae765e30abd70fa327a7b172bf200be3ef7e837961255c850d2eb8055953166824e985
+EBUILD linux-headers-5.12.ebuild 1215 BLAKE2B 70f485a79f1d858295d73090390481f38d02e4d6dd4b0accfd0673f1ad2ce925d2b369f1c7ad533f745d6ef5846d5be9d63f3ef9a62799b1d4b9b5817f1267d6 SHA512 c5442aea092d4659aecfbe042834255ab50fbaf17ba9276af125289f36ae765e30abd70fa327a7b172bf200be3ef7e837961255c850d2eb8055953166824e985
+EBUILD linux-headers-5.4-r1.ebuild 1217 BLAKE2B ff592b579caf43451b8583119bf6fe4698cfe1106c87e6d8b13e4d307c276ac5e443b8e6cf67259b7c953ff30e44680feef263a720b45a32cc86334076d14ce2 SHA512 30b388a58c94496f3f67d24f138134b489f1216e1f471344b67af632e522ff141df4d1e53fd425f16b400ec6276b2a4b869190e67f30b41b655cebd8e08d9da6
+EBUILD linux-headers-5.9.ebuild 1215 BLAKE2B 70f485a79f1d858295d73090390481f38d02e4d6dd4b0accfd0673f1ad2ce925d2b369f1c7ad533f745d6ef5846d5be9d63f3ef9a62799b1d4b9b5817f1267d6 SHA512 c5442aea092d4659aecfbe042834255ab50fbaf17ba9276af125289f36ae765e30abd70fa327a7b172bf200be3ef7e837961255c850d2eb8055953166824e985
 MISC metadata.xml 344 BLAKE2B 383045f9629523bb66545a2e141c51056a1dffcc7cb084b251efd9da73253dbd4be8beebc659d65dbe2faf7852207db39feadac2ab07dff140db1c7f8dbf992a SHA512 4dfc3a4130e5ae01c17510c693c4f2bd81fb019cf003e866c7f359213b58c6e36ed59699d6a458464e1dabd73c8f4a24eada8ced06d7ac513ec3553c0179f164
diff --git a/sys-kernel/linux-headers/linux-headers-3.18.ebuild b/sys-kernel/linux-headers/linux-headers-3.18.ebuild
index ba6ba023e84d..a9b5d7f61969 100644
--- a/sys-kernel/linux-headers/linux-headers-3.18.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -30,6 +30,16 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
+src_test() {
+	einfo "Possible unescaped attribute/type usage"
+	egrep -r \
+		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
+		-e '\<([us](8|16|32|64))\>' \
+		.
+
+	emake ARCH=$(tc-arch-kernel) headers_check
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,16 +50,3 @@ src_install() {
 	# provided by libdrm (for now?)
 	rm -rf "${ED}"/$(kernel_header_destdir)/drm
 }
-
-src_test() {
-	einfo "Possible unescaped attribute/type usage"
-	egrep -r \
-		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
-		-e '\<([us](8|16|32|64))\>' \
-		.
-
-	einfo "Missing linux/types.h include"
-	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
-
-	emake ARCH=$(tc-arch-kernel) headers_check
-}
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
index 7179ff17febc..0bf7828fca73 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -30,28 +30,20 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
-src_install() {
-	kernel-2_src_install
-
-	# hrm, build system sucks
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}
-
 src_test() {
-	# Make sure no uapi/ include paths are used by accident.
-	egrep -r \
-		-e '# *include.*["<]uapi/' \
-		"${D}" && die "#include uapi/xxx detected"
-
 	einfo "Possible unescaped attribute/type usage"
 	egrep -r \
 		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
 		-e '\<([us](8|16|32|64))\>' \
 		.
 
-	einfo "Missing linux/types.h include"
-	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
-
 	emake ARCH=$(tc-arch-kernel) headers_check
 }
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	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-4.19.ebuild b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
index 6b5b4f2a6279..fa07a3ed3b91 100644
--- a/sys-kernel/linux-headers/linux-headers-4.19.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
 "
 
-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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -33,28 +33,20 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch
 }
 
-src_install() {
-	kernel-2_src_install
-
-	# hrm, build system sucks
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}
-
 src_test() {
-	# Make sure no uapi/ include paths are used by accident.
-	egrep -r \
-		-e '# *include.*["<]uapi/' \
-		"${D}" && die "#include uapi/xxx detected"
-
 	einfo "Possible unescaped attribute/type usage"
 	egrep -r \
 		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
 		-e '\<([us](8|16|32|64))\>' \
 		.
 
-	einfo "Missing linux/types.h include"
-	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
-
 	emake ARCH=$(tc-arch-kernel) headers_check
 }
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	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-4.4.ebuild b/sys-kernel/linux-headers/linux-headers-4.4.ebuild
index 7179ff17febc..0bf7828fca73 100644
--- a/sys-kernel/linux-headers/linux-headers-4.4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -30,28 +30,20 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
-src_install() {
-	kernel-2_src_install
-
-	# hrm, build system sucks
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}
-
 src_test() {
-	# Make sure no uapi/ include paths are used by accident.
-	egrep -r \
-		-e '# *include.*["<]uapi/' \
-		"${D}" && die "#include uapi/xxx detected"
-
 	einfo "Possible unescaped attribute/type usage"
 	egrep -r \
 		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
 		-e '\<([us](8|16|32|64))\>' \
 		.
 
-	einfo "Missing linux/types.h include"
-	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
-
 	emake ARCH=$(tc-arch-kernel) headers_check
 }
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	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-4.9.ebuild b/sys-kernel/linux-headers/linux-headers-4.9.ebuild
index 3b5fc0c8ba58..14349ca8e261 100644
--- a/sys-kernel/linux-headers/linux-headers-4.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,28 +30,20 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
-src_install() {
-	kernel-2_src_install
-
-	# hrm, build system sucks
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}
-
 src_test() {
-	# Make sure no uapi/ include paths are used by accident.
-	egrep -r \
-		-e '# *include.*["<]uapi/' \
-		"${D}" && die "#include uapi/xxx detected"
-
 	einfo "Possible unescaped attribute/type usage"
 	egrep -r \
 		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
 		-e '\<([us](8|16|32|64))\>' \
 		.
 
-	einfo "Missing linux/types.h include"
-	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
-
 	emake ARCH=$(tc-arch-kernel) headers_check
 }
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	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.10.ebuild b/sys-kernel/linux-headers/linux-headers-5.10.ebuild
index d93cdc7bc630..2ca94a6ef16a 100644
--- a/sys-kernel/linux-headers/linux-headers-5.10.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 "
 
-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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -33,6 +33,10 @@ src_prepare() {
 	default
 }
 
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,7 +44,3 @@ src_install() {
 	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
 	find "${ED}" -depth -type d -delete 2>/dev/null
 }
-
-src_test() {
-	emake headers_check ${xmakeopts}
-}
diff --git a/sys-kernel/linux-headers/linux-headers-5.11.ebuild b/sys-kernel/linux-headers/linux-headers-5.11.ebuild
index b543fdb5adc4..6ce8a6c038aa 100644
--- a/sys-kernel/linux-headers/linux-headers-5.11.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.11.ebuild
@@ -33,6 +33,10 @@ src_prepare() {
 	default
 }
 
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,7 +44,3 @@ src_install() {
 	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
 	find "${ED}" -depth -type d -delete 2>/dev/null
 }
-
-src_test() {
-	emake headers_check ${xmakeopts}
-}
diff --git a/sys-kernel/linux-headers/linux-headers-5.12.ebuild b/sys-kernel/linux-headers/linux-headers-5.12.ebuild
new file mode 100644
index 000000000000..6ce8a6c038aa
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m32r 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/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="app-arch/xz-utils
+	dev-lang/perl"
+RDEPEND=""
+
+S=${WORKDIR}/linux-${PV}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PATCH_PV}/*.patch
+
+	default
+}
+
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	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.4-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
index 5abde3861641..827a8767d0fd 100644
--- a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 "
 
-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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -33,6 +33,10 @@ src_prepare() {
 	default
 }
 
+src_test() {
+	emake ARCH=$(tc-arch-kernel) headers_check
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,7 +44,3 @@ src_install() {
 	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
 	find "${ED}" -depth -type d -delete 2>/dev/null
 }
-
-src_test() {
-	emake ARCH=$(tc-arch-kernel) headers_check
-}
diff --git a/sys-kernel/linux-headers/linux-headers-5.9.ebuild b/sys-kernel/linux-headers/linux-headers-5.9.ebuild
index 3c7e3cd2bc0f..6ce8a6c038aa 100644
--- a/sys-kernel/linux-headers/linux-headers-5.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -33,6 +33,10 @@ src_prepare() {
 	default
 }
 
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,7 +44,3 @@ src_install() {
 	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
 	find "${ED}" -depth -type d -delete 2>/dev/null
 }
-
-src_test() {
-	emake headers_check ${xmakeopts}
-}