gentoo resync : 25.03.2022

18 files changed, 111 insertions, 478 deletions

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 4d3092073c3a..949a8c64bed7 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -6,43 +6,25 @@ DIST gentoo-headers-4.19-1.tar.xz 4040 BLAKE2B 4ccaf4fb6bde84f0b1f29534cf2f6effc
 DIST gentoo-headers-4.4-1.tar.xz 6624 BLAKE2B 9cdf0c22520e413f175942c4994dd90b0fed8f72c67332a05e7ed72b901ee04594f4e4a3c0252e0a6e057d9c08c4d653387dc36cda82ce9ef8a16e7317ba9ea0 SHA512 dd8a5c627a9cd373022d7afa1beb126f15694f80452821f31fc5c1a3439635814d205bcbc873a5869946472d86cdec872a44f4870751b96d42e89893fca1b983
 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.13-1.tar.xz 2164 BLAKE2B bd2a7454111961c29134087801c5bcf88c9d0ff9d066c87ba8e81b9004c89290ebec46508324f2062e52166c0e4f82a1a740a66e48140030ce8adc7f4b4c9ccd SHA512 9f7fc903c7ad5142322e83a15a356acfbddd0b8f67c998dd03d74c57816eca7eb54f4b8b02c31f92bb9cf63b3285ff98ad9fe09a5fb8f0864a88da2ec80d3da5
-DIST gentoo-headers-5.14-1.tar.xz 1496 BLAKE2B f58c7079fdc95a4f0add255b3aca6f39554349369930364d1d67df9a2020213c1dd3f24f00e1992877d69839a28183a2139c26ac52db42b9edfff7a2254ee333 SHA512 1c1052405e2ec7bc0b32ed3036d173ca8f471ea2997f52cd5915a5a0963c86ec263beb63615f14267cb473ec2e5d047fd78960718a6866b64f84b634a0062b07
 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.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
 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
 DIST gentoo-headers-base-4.4.tar.xz 3911752 BLAKE2B 5031ecd48b99cb0c9c35ca935fa6a62cc36c076bab193ec397fc0d543170f29c6d5a0827a2ea5517eb68fc838819cbe3e5abd125bb920992492369d5e5c1e7cb SHA512 1cd3de58ff790c3730bea38138c7a45ef95d04288c69ffeabebb884fab3add13bd9c99785ddd87a3ee467a0e1b1cdc457bbd28da349e7c178b4d2374c5fb78a3
 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.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
-DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 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.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 1282 BLAKE2B 683e464478fb6cd75f091bda109203bf3253b49951e2e6df75e8e1d4e5409e83216baddac3498baed7351cb802dfe409df6585b4694a28a9049781385dfbe854 SHA512 ea353948cdc6df277176a174bf3517deac5d09022b3f8de40cb917c6d34d0c36bab223431519939766d30bde610b8dab8de70b4f3c45f30d67d8da466a7c225b
-EBUILD linux-headers-4.14-r1.ebuild 1209 BLAKE2B 25087eeb954dfb1e135d126c05ffe23be900f3ebb552920b425bac7373e024f100553c3d4493f4c6ac14ce0d4f482cf65adf5b41b90b9375d0ad89caa0c6e42b SHA512 8eb1f202cd2b38240ced9fb3c68e6014acabbb971c19060faec97d58fe1d022f2affcff5040e484adaf710648ef00f1dc00a26ef6122e01f745f3a5875613b17
-EBUILD linux-headers-4.19.ebuild 1369 BLAKE2B f75c172fc7ad4f7bff3640bf8bf0ccc235acd5d6aa9c3f870281dbb7e13b53362ceddf9c199ca4fda0fb724407184f1ef1f9c1fb6c8546ae0ed4e6cb6c0cded2 SHA512 a7e7efe3b347f052fe419eeca39a510b1f03d5669466ffc2effd8d194d3ce2ed58c7143653dc070d9be689d29713f5762d2bf0ceda860dd941d8df96aeedcef0
-EBUILD linux-headers-4.4.ebuild 1209 BLAKE2B 25087eeb954dfb1e135d126c05ffe23be900f3ebb552920b425bac7373e024f100553c3d4493f4c6ac14ce0d4f482cf65adf5b41b90b9375d0ad89caa0c6e42b SHA512 8eb1f202cd2b38240ced9fb3c68e6014acabbb971c19060faec97d58fe1d022f2affcff5040e484adaf710648ef00f1dc00a26ef6122e01f745f3a5875613b17
-EBUILD linux-headers-4.9.ebuild 1217 BLAKE2B 972fb625ffb53e3568da8f9c3362bee0c5c514d100964cc8b45f1f80071cf4c5362c86a95b355ba4cf98237e8791ccf933279eb841e49b83eb5deabf32be9d2f SHA512 343a7f1e83a887571a2d0a21f0c5f797f35507d8a03ffd770765850affe60db10a4e55b66744a85bbd10fb0c178af13e56c6a1e4ba0b8b36e6dc73dcb4ec5e5f
-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 1330 BLAKE2B 43e4bd06e7105b8861c2ef54fa881f9c771803ca061eeceb5616ff8b87e638595759fe1c8f243f2aca9f5843b6b7203fa1f1ddf653211cbbad45139b6c06bbec SHA512 7f6ff43c762dd6ca19ebf7ddab6de1b583baf2f8f86f9da959e0588fbebc1b421bef9bfaebc77a62c1c2e53410e8745176a6bed902cfcd5eb021034941c14146
-EBUILD linux-headers-5.15-r3.ebuild 1397 BLAKE2B 1db3d00efdc8481182ddf33ffe5a11c44459d21331a5e10ed035eb277cd6cbf7086211e39c3275e30baac7f2d5ffafd2e3340f0df43dfa4e58cebc8b3750e157 SHA512 641d74493ad0346360b4a6d77c6d1c218be6f425bea99a168d5aa523636406f15315970e3dac0dec54516a5507a082fa3fd80f7f66531fb0bf91f13832262334
-EBUILD linux-headers-5.16.ebuild 1406 BLAKE2B 2f1186484e3ceb74d4a3bd2b848489a264807160d2e8e9c97065d084d602079890f62b54483dc6caf148be2b9473fa073d3866c252af4dd7f88a6deb4f2d006a SHA512 542265221e37538328cfcde500081296b4366881fd4f9acad9cb36b14c745ec09b17089c7d515f5e9b285ce51794d40bf76fda97af1f30f6fcf4701231dc9df4
-EBUILD linux-headers-5.4-r1.ebuild 1184 BLAKE2B fd287162a9a8871d1166a6135889bd95fb6f03f1a89a8845eb6833cb0380608f5ad36eb1094411564b29ac599b40d03831d2fc64e4464d0204a01a265073f6e0 SHA512 a9e5b5a3da057dbbc5b8e16e1cd970b4d46a8e94fdaf4b5ecc4b62417bac8f6ca0d5417cf7b84bcd6583f1b8541a377881e8c5692980adc02eb036e7e06d051b
-EBUILD linux-headers-5.9.ebuild 1180 BLAKE2B 6fd5766c2545afc72cffef9004e428cf4c07c1f73a73c6f1d8241ae83e323890c639dc341e31eed93dbbe1841a52978153d48acaec562ce7abacad6f6e66a0f3 SHA512 6a50a05cdb78aefb84f2c627af7ebf5a1b2728bfe77cb71130cfa8340bfa471d71299afbeea0c07571250cb8dc14a66ee1c3834c112286927e87b71963c61fb6
+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
+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.4-r2.ebuild 1254 BLAKE2B 4b8545aff89fbce63ac91030a81aa416664969e1475ab33e40e2612adaaac4918231b12178176dff833e9b8292575d1a9b17d32041d8362a3fd99671e5bedf8b SHA512 ba73a588dfde65af652ad9f8fe39ad4a59cdd285f0afaa7a6c038d1bb351770028864de5c304441fca9db3ebf1f1b2f0b2d57e4c8f2aba1c2ab9466c8e099176
 MISC metadata.xml 345 BLAKE2B a7d97a94b8b2b72cbd9c7cc730bd66c6e174a2c0bb8bfcff7c279a87000a4435afbb048ca2d9424b391a0b0f992d0afd5efb20c0504062de3dfd49968fec0e74 SHA512 e7a62638f5ba1072ae773781c890f708d90001c4d517e2ecce8fbb791914f2e6769e5a0db63ade82f7d644c1ec3e9b19aae773c496d9059879a4192b7f26ccae
diff --git a/sys-kernel/linux-headers/linux-headers-3.18.ebuild b/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild
index 8b2fb4022b85..184ca9358ef3 100644
--- a/sys-kernel/linux-headers/linux-headers-3.18.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
@@ -11,23 +11,24 @@ detect_version
 PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/gentoo-headers-base-${PV}"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
-DEPEND="app-arch/xz-utils
+BDEPEND="
+	app-arch/xz-utils
 	dev-lang/perl"
-RDEPEND=""
 
-S=${WORKDIR}/gentoo-headers-base-${PV}
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PV} )
 
 src_unpack() {
-	unpack ${A}
+	# avoid kernel-2_src_unpack
+	default
 }
 
 src_prepare() {
+	# avoid kernel-2_src_prepare
 	default
-
-	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
 src_test() {
@@ -43,9 +44,10 @@ src_test() {
 src_install() {
 	kernel-2_src_install
 
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
+	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+	# delete empty directories
+	find "${ED}" -empty -type d -delete || die
 
 	# provided by libdrm (for now?)
-	rm -rf "${ED}"/$(kernel_header_destdir)/drm
+	rm -rf "${ED}"/$(kernel_header_destdir)/drm || die
 }
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild
index 619e37227597..c2e4b27768e6 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
@@ -11,23 +11,24 @@ detect_version
 PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/gentoo-headers-base-${PV}"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
-DEPEND="app-arch/xz-utils
+BDEPEND="
+	app-arch/xz-utils
 	dev-lang/perl"
-RDEPEND=""
 
-S=${WORKDIR}/gentoo-headers-base-${PV}
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PV} )
 
 src_unpack() {
-	unpack ${A}
+	# avoid kernel-2_src_unpack
+	default
 }
 
 src_prepare() {
+	# avoid kernel-2_src_prepare
 	default
-
-	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
 src_test() {
@@ -43,6 +44,7 @@ src_test() {
 src_install() {
 	kernel-2_src_install
 
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
+	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-4.19.ebuild b/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild
index c64043d1577b..dc815ab8f84f 100644
--- a/sys-kernel/linux-headers/linux-headers-4.19.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+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"
@@ -12,25 +12,25 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	https://dev.gentoo.org/~sam/distfiles/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
-"
+	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/gentoo-headers-base-${PV}"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
-DEPEND="app-arch/xz-utils
+BDEPEND="
+	app-arch/xz-utils
 	dev-lang/perl"
-RDEPEND=""
 
-S=${WORKDIR}/gentoo-headers-base-${PV}
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PV} )
 
 src_unpack() {
-	unpack ${A}
+	# avoid kernel-2_src_unpack
+	default
 }
 
 src_prepare() {
+	# avoid kernel-2_src_prepare
 	default
-
-	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch
 }
 
 src_test() {
@@ -46,6 +46,7 @@ src_test() {
 src_install() {
 	kernel-2_src_install
 
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
+	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-4.4.ebuild b/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild
index 619e37227597..c2e4b27768e6 100644
--- a/sys-kernel/linux-headers/linux-headers-4.4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
@@ -11,23 +11,24 @@ detect_version
 PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/gentoo-headers-base-${PV}"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
-DEPEND="app-arch/xz-utils
+BDEPEND="
+	app-arch/xz-utils
 	dev-lang/perl"
-RDEPEND=""
 
-S=${WORKDIR}/gentoo-headers-base-${PV}
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PV} )
 
 src_unpack() {
-	unpack ${A}
+	# avoid kernel-2_src_unpack
+	default
 }
 
 src_prepare() {
+	# avoid kernel-2_src_prepare
 	default
-
-	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
 src_test() {
@@ -43,6 +44,7 @@ src_test() {
 src_install() {
 	kernel-2_src_install
 
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
+	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-4.9.ebuild b/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild
index 22670cf7f55e..689310c20111 100644
--- a/sys-kernel/linux-headers/linux-headers-4.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
@@ -11,23 +11,24 @@ detect_version
 PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/gentoo-headers-base-${PV}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="app-arch/xz-utils
+BDEPEND="
+	app-arch/xz-utils
 	dev-lang/perl"
-RDEPEND=""
 
-S=${WORKDIR}/gentoo-headers-base-${PV}
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PV} )
 
 src_unpack() {
-	unpack ${A}
+	# avoid kernel-2_src_unpack
+	default
 }
 
 src_prepare() {
+	# avoid kernel-2_src_prepare
 	default
-
-	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
 src_test() {
@@ -43,6 +44,7 @@ src_test() {
 src_install() {
 	kernel-2_src_install
 
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
+	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.10-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.10-r1.ebuild
deleted file mode 100644
index d305baff01e2..000000000000
--- a/sys-kernel/linux-headers/linux-headers-5.10-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 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}
-"
-
-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
-
-	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.10-r2.ebuild b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
index ce31c0eacbdf..08907ac2fb24 100644
--- a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
@@ -5,7 +5,7 @@ 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
+inherit kernel-2
 detect_version
 
 PATCH_PV=${PV} # to ease testing new versions against not existing patches
@@ -14,25 +14,28 @@ 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}
+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
+BDEPEND="
+	app-arch/xz-utils
 	dev-lang/perl"
 
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
 src_unpack() {
-	unpack ${A}
+	# avoid kernel-2_src_unpack
+	default
 }
 
 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
+	# TODO: May need forward porting to newer versions
+	use elibc_musl && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+	)
 
+	# avoid kernel-2_src_prepare
 	default
 }
 
@@ -43,6 +46,7 @@ src_test() {
 src_install() {
 	kernel-2_src_install
 
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
+	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.10.ebuild b/sys-kernel/linux-headers/linux-headers-5.10.ebuild
deleted file mode 100644
index 716f218f7da5..000000000000
--- a/sys-kernel/linux-headers/linux-headers-5.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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 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}
-"
-
-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
-
-	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.11.ebuild b/sys-kernel/linux-headers/linux-headers-5.11.ebuild
deleted file mode 100644
index 0368a1aa7b2a..000000000000
--- a/sys-kernel/linux-headers/linux-headers-5.11.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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 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}
-"
-
-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
-
-	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.12.ebuild b/sys-kernel/linux-headers/linux-headers-5.12.ebuild
deleted file mode 100644
index 82fa20bbed27..000000000000
--- a/sys-kernel/linux-headers/linux-headers-5.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 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}
-"
-
-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"
-
-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
-
-	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.13.ebuild b/sys-kernel/linux-headers/linux-headers-5.13.ebuild
deleted file mode 100644
index ae7ecd30fe16..000000000000
--- a/sys-kernel/linux-headers/linux-headers-5.13.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 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:+https://dev.gentoo.org/~soap/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"
-
-[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
-
-src_unpack() {
-	# avoid kernel-2_src_unpack
-	default
-}
-
-src_prepare() {
-	# 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
-}
diff --git a/sys-kernel/linux-headers/linux-headers-5.14.ebuild b/sys-kernel/linux-headers/linux-headers-5.14.ebuild
deleted file mode 100644
index 8ac754c008de..000000000000
--- a/sys-kernel/linux-headers/linux-headers-5.14.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 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"
-
-[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
-
-src_unpack() {
-	# avoid kernel-2_src_unpack
-	default
-}
-
-src_prepare() {
-	# 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
-}
diff --git a/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
deleted file mode 100644
index 19291889a475..000000000000
--- a/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 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
-	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
-}
diff --git a/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild b/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
index 6541482454d5..9d2ebae3daee 100644
--- a/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
@@ -5,7 +5,7 @@ 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
+inherit kernel-2
 detect_version
 
 PATCH_PV=${PV} # to ease testing new versions against not existing patches
@@ -17,7 +17,8 @@ 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
+BDEPEND="
+	app-arch/xz-utils
 	dev-lang/perl"
 
 # bug #816762
@@ -31,11 +32,11 @@ src_unpack() {
 }
 
 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
+	# 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
@@ -49,4 +50,6 @@ 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.16.ebuild b/sys-kernel/linux-headers/linux-headers-5.16.ebuild
index 56a633840c3b..5a407e44b3c5 100644
--- a/sys-kernel/linux-headers/linux-headers-5.16.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.16.ebuild
@@ -5,7 +5,7 @@ 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
+inherit kernel-2
 detect_version
 
 PATCH_PV=${PV} # to ease testing new versions against not existing patches
@@ -31,11 +31,11 @@ src_unpack() {
 }
 
 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
+	# 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
@@ -49,4 +49,6 @@ 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.4-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.4-r2.ebuild
index cd9d9d53db40..be894fb9ad8d 100644
--- a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+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"
@@ -14,22 +14,23 @@ 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"
 
-DEPEND="app-arch/xz-utils
+BDEPEND="
+	app-arch/xz-utils
 	dev-lang/perl"
-RDEPEND=""
 
-S=${WORKDIR}/linux-${PV}
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
 
 src_unpack() {
-	unpack ${A}
+	# avoid kernel-2_src_unpack
+	default
 }
 
 src_prepare() {
-	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PATCH_PV}/*.patch
-
+	# avoid kernel-2_src_prepare
 	default
 }
 
@@ -40,6 +41,7 @@ src_test() {
 src_install() {
 	kernel-2_src_install
 
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
+	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.9.ebuild b/sys-kernel/linux-headers/linux-headers-5.9.ebuild
deleted file mode 100644
index 0368a1aa7b2a..000000000000
--- a/sys-kernel/linux-headers/linux-headers-5.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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 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}
-"
-
-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
-
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}