gentoo auto-resync : 12:08:2022 - 14:22:05

15 files changed, 840 insertions, 8 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index a8d05d70791c..abae25188295 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index bf53f96e9b51..c90857b4c2ff 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,8 +4,12 @@ DIST genpatches-5.10-145.base.tar.xz 3914420 BLAKE2B 0d6f00cfba2ea5bc70bf44549e8
 DIST genpatches-5.10-145.extras.tar.xz 3868 BLAKE2B 1e6d3c0402bd46656c9f524ff9b309f4d8f4ba85be0dcf210774b5975d85d2098301ff8e6b33fe419d1bc70faf0a4d1d7572fa5c70122a5508a66790a2f18c4b SHA512 d51bcafbcd6cfa70b9aefddb416020363720c152944edba3a41ae152c9b3a0ef1ca3fc70252d9a75b0b636c3480890aa8bd727e18b699d789ad5b08fd065cf7a
 DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
+DIST genpatches-5.15-64.base.tar.xz 2531728 BLAKE2B 9e4501d9a9e423b50d1cea9265dceef035879be1f16b9745aa7bbac8370f7f79c4e6c36fc2f3971a7d766a00fe6bab585148433601ca0ed30b40ca4a9a870406 SHA512 70d7c3f805b0ce6a9cd8034f0fcf22db203621c7464c7eb158a0d7a01dfeafe313934119a639305d02da25afc1852aa29d16d9d0de3d0101bc3bc4a0af18e8e8
+DIST genpatches-5.15-64.extras.tar.xz 3932 BLAKE2B 3d6407f9f8da0b68072b93f74e33255c8c33523f7101a2fb9ca5ec4156f6f8cedb558a6cecca2c46ca8775869a06805ab21962f2fd7d1e974ed1813f3c0fc59f SHA512 6dc7dee3aae37c5504857188fd6957ef85765ecaa5bc17f70e172af66e3ba9d005f27aabbe9171b848f17c9bff5acedb42f01389ae1b6866dca44a1b6611d4e0
 DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
 DIST genpatches-5.18-20.extras.tar.xz 3924 BLAKE2B ddea420397d5b64ac5e964db6b2d863cca0a4fd46a3969af7f24b7803b0f07278b54363c1b43fbc4f305ac4b44e5880d5af0bb10cd2a0a08bc0e4fbd51c9e35e SHA512 51203e404cc8084974725f78dd521f5d7864f40380bc1f45596b8754a57f30535e32c3984c01a4d12b38b6118eb1448126f96042d8a2b5007167428e09761726
+DIST genpatches-5.18-21.base.tar.xz 786248 BLAKE2B 60d007f0ad81b8c8af63789f98613850edc92836672a743bf543c2e7078b666a41f4f277d5b9f001a018811733f266d87651198e3c087c00f8bc8239b2b89236 SHA512 0018fdc5805dff2f92b0f3c2e78e0a30359eb5a02b8b24cc4ced7c42d90e6fa904e8b43982ffdf9bc5c55b9faed1c003bfd6510f3f9c8042180884aa3a87ba2b
+DIST genpatches-5.18-21.extras.tar.xz 3924 BLAKE2B 582b7320bf607d925d9b2e88094032b161cc08df1d5118777454f4f6b966812b333235f2bcf016957d7bcecde6d77b4dc7b76047b8374e34b9262e2aad5e4708 SHA512 26aed20e6cc179d10bb017b1707d5bf5d76a92aadd9ab73acc655352dea8c6fd03cc4848da953800077bf43d1d5e1dddeff01ba486d5c2f6524707a236a956b9
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
@@ -24,10 +28,18 @@ DIST gentoo-kernel-5.15.59-1.amd64.xpak 70780970 BLAKE2B 6728820f88324d719530871
 DIST gentoo-kernel-5.15.59-1.arm64.xpak 64214058 BLAKE2B 8c92101954e62c9ba3eddfd04726dbd03d254d6f506f5072dd1c7d725d29c498d480a1697513a3459127ab133aafc1657d1c9872beb7d5925adbb7bb5fc16ee5 SHA512 0d21c083fd3f971d2fbeae1d012dc03d4bd17bb37ab59e5bab6e87f171554e5ff19703b234c0fdfa9a9e3e98a295fe8037d49ed252a141603debd0d33149bd09
 DIST gentoo-kernel-5.15.59-1.ppc64le.xpak 58200347 BLAKE2B ee5d04f4455c9ed7449e06078f96a5372379bb11ab34b2aa3f39bb3d6941959a4ebcb99ecc3f47532944588c92c4c59078ab1a0f2a2d32b459ec6c8082546850 SHA512 63e9a38db9414b8851d274942df40ea5f35cd0200743aae906288a436cd0121e71e1a7541224a0707e261b51a1d474d5921838a134bc4597b009c7b8bf9885f3
 DIST gentoo-kernel-5.15.59-1.x86.xpak 60984002 BLAKE2B 8a47890b6ceb979684b68bb99e54efb0d4246ab595d4e46441cd4f0e82a580580f17d1911d4ce08ed79c7d8c81c74c3780f5b1e4dd1881ab28bc74958f30f71f SHA512 35efcfba200c6bda7183055a7cfff277472862f44a4abf3c3bc8c0e701135ec9c9f4f9ed65f4c685f744b963ffab9bf79d1c82bedf4807eaa05737d949063feb
+DIST gentoo-kernel-5.15.60-1.amd64.xpak 70797308 BLAKE2B f1b03cdb40fad00add7e464066301f66e8e1790041109c9076a985e6793b6df15954c85d74b10ccc23f98d2172e9176f82458cd68db6f39786917fbab68cd308 SHA512 705c1b82f61bf562ad5c3dea923839c6c94dbed6bd5d3872a5c7f3e76dadf4a5df8fe62c3aad4830c9de183820af07100e9a5453f4facdd0a5a6298290336dd7
+DIST gentoo-kernel-5.15.60-1.arm64.xpak 64204876 BLAKE2B c52b3857eaaec74d72798a975597e5eeabf85a87c5712ddab18437219970f4d5f69e2b2418f0cd725fb714e7b54c165e4a6e3a04fe22f590ef1e29b770d3f3a7 SHA512 98bbf7e5092afe5f4163488abfeab6804ffd89538e03bb62f26bb3d83c7ed843dc2068fd8e9535bc1418b6f412cfa2727b9218110e968b278fb4fbe4e018252b
+DIST gentoo-kernel-5.15.60-1.ppc64le.xpak 58046287 BLAKE2B d559a1301f5fbfd181555577aa8920fe9b0f7b0dcf951772ce1f86e578a5c0807d4b6209c47517fd8594594831c0ab48ae72909d4f7505db4a61b51c5dd0a615 SHA512 b6eabf9bb15678afc165e9ffc74c96b5e16a9cfdeabf62eb3e868c49f7c7eec3d44e889be0223c0bab57853978e0146ca7c52c53fd01236e755bd46c42e8f456
+DIST gentoo-kernel-5.15.60-1.x86.xpak 60117817 BLAKE2B f74cd729b8d1378c6c7d431054632400089e1e86ff67d1f3080dcd509069e63fe3e6b0d60d49729774336a128e78a92972cdb4defa50f3a7101f0770d772689f SHA512 b052e220de708d7822a06015ee4f0d5582fdd87f889a21468d555a8fe900ba4b940fc8513bcc6265b336fe93b8f9f54031ceb02a49e42301510879170dc0f5ff
 DIST gentoo-kernel-5.18.16-1.amd64.xpak 72884888 BLAKE2B 1af89a98a01ac244b4b49f669f739a5040d35e1357c41e6477159a7bb538b8b4ed844a28d512bf1513e2234c20cad663555ef028b2d5378b364eca95d3cbbc47 SHA512 b654a185147259c5100a1ea162c9f945190e472014edeae6704ece63e9486b95c9dfa31e955f9576611d461095f2e309b58c1abc9ecb0dafa5bc1fe92ea0654f
 DIST gentoo-kernel-5.18.16-1.arm64.xpak 65231934 BLAKE2B 0ca27c34a9dcde9ec1bec606ba86489f780e31e3b4357135d10292db04028cd346246d71e10a7c09103bad99a4fa7a2a19610e94890af06baf617ff52bc973b3 SHA512 c75d1c72db2f74d52ced1c46caa12cf25c81834aeed42a038dc049a54aa4f9e45ca51a419f55e021a065159f81c3e8303d5e03967dbed7de2102bd7ca68b3d2e
 DIST gentoo-kernel-5.18.16-1.ppc64le.xpak 59491902 BLAKE2B 805bcb11a93fcdd8fa7e264025c662f46e555aa640838c25578084a3995dbfab2292e7056d5c52352a0060a8114a3d4ae8068f6f3896b46e61c563a6080053fd SHA512 83b37cb57fea22468398a40a04d222dfa2f784e2819bc5e4850d7223b78a72ce41cc2ff6f66f6e7d2fd495c1e7555a287bc143417d28271de0904f50cc22901f
 DIST gentoo-kernel-5.18.16-1.x86.xpak 62813706 BLAKE2B 90ff8f512ea3d9b3d5ac8492294191cfeb438a499ff76c25ab57f18214fb802edc9f90c91939f9446c9f6180c5796b394c24d4d430625337f976179cc55ce33a SHA512 994d78d292dcf1ed35f4167ed871fdbb4a3caca68182fca21398d9794283f9a12f1fe4495fda26e5e43676621ad7bf153ca252e0d6fd0ee94f0c05b8eb8e4530
+DIST gentoo-kernel-5.18.17-1.amd64.xpak 72811508 BLAKE2B e4ba9c9f723cce9d1659a4782ed1c85e0bdbb45e38d69c07e14c06ee7c05f38dcde608c276d37c566786372fc97156dc33fa54c0c62ac7e1da449863d0e33093 SHA512 e48405e99686c3aa033c0f8beb2e201b0ecb1be1c1a6bf1dc1df224ac491c6bb07e14289c48d3390c718ad193be504474d9c16811bb291825b94215e76a6efca
+DIST gentoo-kernel-5.18.17-1.arm64.xpak 65244760 BLAKE2B b080ce68f4da9bda3aa439185c027183952c34c1814d19da7c51c5074abb8ab5b6b17382750b7dee1e4c7710a0c2f95eaca9c9363ba334d37db07622fb47d0be SHA512 14b0c35ef8d3f70c1d2d4b1dc1b126feb7e9ec1c46c214906f672d4548ac39d29bef05fda9732af50a9e099904a45aed59bd4bc7adbbb2f3f7142d6fa7a83122
+DIST gentoo-kernel-5.18.17-1.ppc64le.xpak 59474452 BLAKE2B c9a877cf9be0a5843a8083c323ea3a24fd1c99272316f64487b317a9d18075365fb7e0d65b8ab283ddb08d26af7812b9e1ea355f9716e597660d273123561707 SHA512 ae4117e9d76a85a5befe2178104c3cf913615b9a3537dc4c952603b5f5dcac9f03bcb7d2f7be67b9436e9611cd5df6eb8739096d091f40540c9a2c3c24058a3c
+DIST gentoo-kernel-5.18.17-1.x86.xpak 61829723 BLAKE2B 12f41413dd83e28e93c6e6d0bca80a65399803fa24ccd3beb2937f337fffe9d293c233c753c305cce57942779b10081610e9448efcb77eda75b3bc42bf2e9610 SHA512 ecfce7fd1ba4b64fb87be1a84d610627e2347b795dd301f713f34cabddd3de875beff9c8d37f1610bd774bca70603975fe7a020970cecefa98f0066c8037978b
 DIST gentoo-kernel-5.4.203-1.amd64.xpak 61567440 BLAKE2B 7cb004bf0d90e517a1636e984afb21be3408da74afcd4ccd886007dea5a221b33bde828ee8dad4e8fcf120d737be2d7ff4a0780f36643300209e69f996921112 SHA512 a79fbd6ce459265e4eda827063aee6557208c73094bf937959eb265d100a0533083e35276d6df77a8b8a7a05161b292232ac42b18b8a903232f2eb065192d0c9
 DIST gentoo-kernel-5.4.203-1.arm64.xpak 57698276 BLAKE2B 2bc0a4eba7ef829a4e705706b7ce33496b8a36d33f0808bc315df45b9d7a00e6aabda71274956b484d394f3431bb22be118c9b37711bd5cc74d6d1d6dfa0027b SHA512 d4849d69a3a6134d260945721b164d74604a4b2e590d1545f7444fa9cfac4f7d8419b8d77dd586c87a52ef4bad3620810993a7161083370e2438b9723f249d37
 DIST gentoo-kernel-5.4.203-1.ppc64le.xpak 55132763 BLAKE2B bfba496c86aeb1c0e0826e8222e60fa96a0c57b0b66af485c619eea277ed64fe590ffe0c7932da36de2c2f180772ec6dd5d1925bbdca3d52ec2c9e0ed0808113 SHA512 e598776a8d6cf90d6a92f12af3899a28eca53fe037906c0de5e57f5b8a128fdde98d9453b06e0796d4c4b8d27b5b211db1aa777a0f1636b4cfe73e26be96d9fc
@@ -47,8 +59,10 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 EBUILD gentoo-kernel-bin-5.10.135.ebuild 3175 BLAKE2B 00db42c3c9ad24c64d887e8e2faeb17c00b227fefe0a25a0fc3a247cd791430b6e27e597a6da1c6254b21c7e6f69d3e60ca09efc1a0297a2a85cab9a9a2b2a57 SHA512 60efcfc45ec0310c41aecbbae6d840cf647fd91c36c3312622e7f68e7704868bf1ebb67456f4bd6e9224e53d88289e79ee11d374cb6d481e17c4fbc431b317fe
 EBUILD gentoo-kernel-bin-5.10.136.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
 EBUILD gentoo-kernel-bin-5.15.59.ebuild 3175 BLAKE2B 123d18c5ecc2a7f61fc523212e65288686e70f8b90f0f4a82e4293ee4125c1558e6eb2706740e8761203215871dd4974ad8122f42c851faf657792d0f77a77ef SHA512 956abe2b5146b901039e677523c787ae86824a973f78900c32f2956805c6f8d62bde05f6ddd1a77c1ec7c5c512d945267fc2123de4763489d6cf6bad60f38da2
+EBUILD gentoo-kernel-bin-5.15.60.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.18.16.ebuild 3167 BLAKE2B 51f48f8c0da28e2063601a0acefaf96d1b6910ac56a80cfd585f2930112c52945e17287a1025f282a35918d24f58caef907a336f532f24962367355a9c3d92bb SHA512 d114a4460c7ada94b8b06ca44b8ba09077170a13165f089bf3a55c04b83f7911d7047c593cdfd18292e91b29bfdf4fa09d534cd1364c8fd1274e77e11f551ff6
+EBUILD gentoo-kernel-bin-5.18.17.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.4.203.ebuild 3177 BLAKE2B b9df1ff36a996b688640bca679f8342d7cfd016e9305d8b967f5b5895b417ad0aff4e5b07023bef65c3aa7c2f895d3a21c019ddcb48a0dea5844bf16a35a9602 SHA512 46ec6d4b5f3b818ae84d60e7dc1a8abd69f5221d609c5d176a8160cd1bfbcbaf41da3b374369747c98143d5db532bb8e4969d84fa3164d7a2b1e9819b8131ddd
-EBUILD gentoo-kernel-bin-5.4.209.ebuild 3178 BLAKE2B 1a4f63a4f4007360962a4fd46a17a6fd8a6fa998ec258440a952538a5121922ae7c63ef967f1decc4dba894464b0234d64313ac620bc8d32fd7aeade536e190f SHA512 3c654d7c8b937908f5d130df2fd355f8dd4435e779078df2505c020cd094bc17f76bc21fb1ea4d2bd63c8ce5f767d45c2525992ce07a3bd72b0ee20952eb65dd
+EBUILD gentoo-kernel-bin-5.4.209.ebuild 3177 BLAKE2B 5259243ab5339c96bf9400e79d7a693f4797992c9695f71da43fecc9a211a5f79f4f0511d7105778ec4b63da7e13e5cd9f2f1d20359a6cfbc6c8d7c9142224dc SHA512 18cd8a3b737f5a28d8abc2647ccb37c1dae97179a251514d359cda14592ffacedc74630175b30adcdd599037cdb8e5e6241918f6e5318bf40e8e5f8029d7a464
 EBUILD gentoo-kernel-bin-5.4.210.ebuild 3181 BLAKE2B 852c1e5dced74978b88730b17ec3a1bf8461ef9ab922b07b1b2e40dd1aa6cb32b9452e0fd96e63369bec9e235c3a99a7d0f2215e0e3ac331aaa161232cbd613b SHA512 e0b994133da4ad035094bde587951a4a41f161fe067b58076a759fba38fdd724ad127e25a912260b26db9fbf2bec3cef5488d87735400fae46d89cc68650a867
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.60.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.60.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.60.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.17.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.17.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.17.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild
index e2688e863685..a4e237e39df6 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index d3fc63f821dd..281ba5795f1d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,8 +4,12 @@ DIST genpatches-5.10-145.base.tar.xz 3914420 BLAKE2B 0d6f00cfba2ea5bc70bf44549e8
 DIST genpatches-5.10-145.extras.tar.xz 3868 BLAKE2B 1e6d3c0402bd46656c9f524ff9b309f4d8f4ba85be0dcf210774b5975d85d2098301ff8e6b33fe419d1bc70faf0a4d1d7572fa5c70122a5508a66790a2f18c4b SHA512 d51bcafbcd6cfa70b9aefddb416020363720c152944edba3a41ae152c9b3a0ef1ca3fc70252d9a75b0b636c3480890aa8bd727e18b699d789ad5b08fd065cf7a
 DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
+DIST genpatches-5.15-64.base.tar.xz 2531728 BLAKE2B 9e4501d9a9e423b50d1cea9265dceef035879be1f16b9745aa7bbac8370f7f79c4e6c36fc2f3971a7d766a00fe6bab585148433601ca0ed30b40ca4a9a870406 SHA512 70d7c3f805b0ce6a9cd8034f0fcf22db203621c7464c7eb158a0d7a01dfeafe313934119a639305d02da25afc1852aa29d16d9d0de3d0101bc3bc4a0af18e8e8
+DIST genpatches-5.15-64.extras.tar.xz 3932 BLAKE2B 3d6407f9f8da0b68072b93f74e33255c8c33523f7101a2fb9ca5ec4156f6f8cedb558a6cecca2c46ca8775869a06805ab21962f2fd7d1e974ed1813f3c0fc59f SHA512 6dc7dee3aae37c5504857188fd6957ef85765ecaa5bc17f70e172af66e3ba9d005f27aabbe9171b848f17c9bff5acedb42f01389ae1b6866dca44a1b6611d4e0
 DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
 DIST genpatches-5.18-20.extras.tar.xz 3924 BLAKE2B ddea420397d5b64ac5e964db6b2d863cca0a4fd46a3969af7f24b7803b0f07278b54363c1b43fbc4f305ac4b44e5880d5af0bb10cd2a0a08bc0e4fbd51c9e35e SHA512 51203e404cc8084974725f78dd521f5d7864f40380bc1f45596b8754a57f30535e32c3984c01a4d12b38b6118eb1448126f96042d8a2b5007167428e09761726
+DIST genpatches-5.18-21.base.tar.xz 786248 BLAKE2B 60d007f0ad81b8c8af63789f98613850edc92836672a743bf543c2e7078b666a41f4f277d5b9f001a018811733f266d87651198e3c087c00f8bc8239b2b89236 SHA512 0018fdc5805dff2f92b0f3c2e78e0a30359eb5a02b8b24cc4ced7c42d90e6fa904e8b43982ffdf9bc5c55b9faed1c003bfd6510f3f9c8042180884aa3a87ba2b
+DIST genpatches-5.18-21.extras.tar.xz 3924 BLAKE2B 582b7320bf607d925d9b2e88094032b161cc08df1d5118777454f4f6b966812b333235f2bcf016957d7bcecde6d77b4dc7b76047b8374e34b9262e2aad5e4708 SHA512 26aed20e6cc179d10bb017b1707d5bf5d76a92aadd9ab73acc655352dea8c6fd03cc4848da953800077bf43d1d5e1dddeff01ba486d5c2f6524707a236a956b9
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
@@ -37,8 +41,10 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 EBUILD gentoo-kernel-5.10.135.ebuild 3596 BLAKE2B 82ed2819c4a7fa9ec1359008005fe9522180ce5b7ee433c7e523d3849c6df4939735b01e6044cd8ac1e280216f9ab796915a63915abcff1e4b530ba2c602ee81 SHA512 a9da72910325ec2096ecf4e392c9cf8cea810e4ec3ef02621cfcdaff20ffce474f76119b95c2c7cd98295ee4c8714d37688a4c4040474873f1417feed38f1d04
 EBUILD gentoo-kernel-5.10.136.ebuild 3602 BLAKE2B 352e6cbc7b4c3dd628368308fcd01ecf133d36603a284f0c20d8e65da3e87ef29a7097a5f03c62b8d3aa6db1b5725a079b491abae7d8e0847695ec0dd0218776 SHA512 b5f058e544388a1c99337cd517479ec508f580ac5f107d8a6c39f5e3ee2c19d6953896c7fd654bf7a726a1ac974e8eb7872e4c4a1cf884277a5818cc438647c5
 EBUILD gentoo-kernel-5.15.59.ebuild 3593 BLAKE2B 0854919a718f192cc5422a4dd2d551fbb39c6ccd2b9bad56c86896c85ebded885639f80327c8f1806b5750112293848652f664acc7b0984457a378d6b4d2e0b3 SHA512 17878f909948b0de1255cecbcdbb04fd5223a212c2a6cc441e60f09bc28effda02183e2b7a8a9d597fe1bb5ad419cfe5acfc66d97503ec09f48b3eddac97d899
+EBUILD gentoo-kernel-5.15.60.ebuild 3599 BLAKE2B 402de31263f3c4d3ec38d2d5712e5839862840a318182603cd2ce05090b162a4a581deae6ff3416ec62ac6980fe5454e79ac55672db81653052336ada9461cfa SHA512 209ce3b8b6cbff81dc66e3211811599efd954be45ca4a85bcbf311d23a5a55d86bbc6144a7dc1509a9201f5744c3b15583eeef41641b7318e240545778897a51
 EBUILD gentoo-kernel-5.18.16.ebuild 3857 BLAKE2B 92dd8fcfc85ea17399bbc5e9a15783647711d5e6ab1132100790236c6c7115377a58427cafdc404a4a03ba79189b2c9689acc7200294373976088d5d1c667c86 SHA512 ccb5878cc0881e9c3cc557c603e28633a18d7e6ecc277c68d9e94b6c1ce9f36d3e6509e45d8f3db166cf191811c4c2c542c3fab872c08a56ba24c97530604d51
+EBUILD gentoo-kernel-5.18.17.ebuild 3859 BLAKE2B 9e5e82039fff42abed2d5849ef461aae1c0fc815b5ec91582cc297f0a2dc9835da410a040e1c4df527b752d2959d7d92e0a4dba7395e034362a4759fb22af83d SHA512 dc4464dc9fe79a13e5b31d0e8d2dc07a214b6dbeab870c49d5dba27ed8d57a4b7bddbfae7ce7f28eebeed569041cfd10f1a3f9687542b1621f9ab3e5ed355ab8
 EBUILD gentoo-kernel-5.4.203.ebuild 2799 BLAKE2B 207cd00b51009fec32423c53d9c669b1b33ecdbf344ee4f963899370322bb5ecd24e8c12ee82913fa1d0459bcfa0efc85ef219a455ee0930c06e88b9d444c4a0 SHA512 e087902f31cabcedf79fbb741f323857f9627e5060441caf0700325a6d1f1a279611bef5e5fef75db8ff418ec33c3a5a2487b1f4c6eeea5d5edf4ae47f949c38
-EBUILD gentoo-kernel-5.4.209.ebuild 2800 BLAKE2B 9b3b2fc7905e8f8fcbefb63710da30a6144dafaadcc24a153ed813c2313995660db6bf1f1c3bdcaa2fb7992d0a20628bec5c32957f09ec38af152325b276d1b8 SHA512 2b9cf2fb9792099b15ca7c0da311e37d259c48e48733985158ab5726176215919a5a28c93402d4e4bdfa0cd4ee4c8903c7fafbebfd44eecd11c768de59eb4fe3
+EBUILD gentoo-kernel-5.4.209.ebuild 2799 BLAKE2B b8e03551a6850b15e47e21b0167b421fe900af6c0d7c5ceceeebb777df15a8cc92ad2284a81f5b0a45e2444b6e4237a75527330fbcaca45bbfdbd7c02b94cc68 SHA512 9d320c0e9db0873febffbc7b72c4d9e45945de6a783b8f8ae51954d2aadd193cddd8323d91526b855316faad8f7c642d12676134639780063fb510e133d84e59
 EBUILD gentoo-kernel-5.4.210.ebuild 2803 BLAKE2B a56ad91f6edabf8645ec65291587ec72114eea6a5ee23b0f068d49aa16ad5d79faa46bba5447fb3a351826c7bb576233d7a1beece9843256ab789ef6afb696a8 SHA512 6f1a85386010497e19047e42eaa8caab33dc40089926732d5d01c826bcf91555fdb01414aaa505a1d33ca5228d903ee32c412c5b93a494815f744d68846c9ab9
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.60.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.60.ebuild
new file mode 100644
index 000000000000..64c99e19532c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.60.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.17.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.17.ebuild
new file mode 100644
index 000000000000..5fdf81932f75
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.17.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.9-gentoo
+GENTOO_CONFIG_VER=g2
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild
index 015005407a4b..44a83437de1c 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 35dfdac5c8b7..a7db92178073 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -124,12 +124,12 @@ EBUILD gentoo-sources-4.9.325.ebuild 742 BLAKE2B 87e872fb425c07a71ddaf6124257e93
 EBUILD gentoo-sources-5.10.117.ebuild 667 BLAKE2B 638794ec57c82f72f14658cb37934f0c66dab1ea3b44e80a1f350756f43feff056074beea37727eb95837e769f59c248febd88e8c364e0adbb15933e84b64554 SHA512 b451e35b6e4b42dcbc10c4c06c25c68b084b36245f59cb463f4393759fe091f8e37f84f463942c5139c485e84571e769472a1051442e10c55c09d0072ccb9aa1
 EBUILD gentoo-sources-5.10.128.ebuild 742 BLAKE2B 24427c09689e5ef8e14c1eddc4a38dd9538221f2a9284e736da271667fe7dfabea725800e9401591906578a0f47ae6f9f85e067c47e0c64b1015bc04d0923128 SHA512 166d903f07230c7c7b2287c1b01a6f93332ea2f4ab2bd87cdc2a7d9f09cd92898603367a12b79c60d8f4478ac486a0ef4790a81dbe4ce4469c574c8b6503400a
 EBUILD gentoo-sources-5.10.134.ebuild 749 BLAKE2B cbcfb384a75e395e35cc6da2847056a4182e3dfeb6e9325eec1e0c317ecc00c0c6e3b56b342503c6c9a8f19971107ff2a181fb1cfa5d90617739d6550370d0af SHA512 4f696bc98214d44a62ced8a7135816b5178abc9169ff03446054597f5fb93cfc65e4ec869ebabda53e08e8bdb77e6d4b6b6bb4ab6a75a8ba4dbec84262b7931d
-EBUILD gentoo-sources-5.10.135.ebuild 743 BLAKE2B d22403841d7df48f6899abfe9e7721322048197277d7ccf7e0fe769f859cddf7f206f243e14c0088753f5283394b4f215b0bd0ae2a14197b1b5086b6797fca0f SHA512 9c03bd0981f012bc5a8dcde138e75ff6d2bfd766e6bfc7854b28016e1112589230c2c6cad0fbf1d5e1bb83744013c77a36a78ff824865f5185cc78b80a88c373
+EBUILD gentoo-sources-5.10.135.ebuild 742 BLAKE2B 92e2938e1808a7de37d5af48359e16ce3a50e2fe30454fc3fb2f2b8dd9f921b64f1ddd49610c74f74a8a3fcad9c302727a413196e30f4658e907a79faf43f669 SHA512 ffcc459c2c3d84a322bae68cfd53a9a469d448519deded93283ccc20d66e99f38ee66d362139fc57e474349f423b9502e2951c31a552f7c997fd79cbd844e42f
 EBUILD gentoo-sources-5.10.136.ebuild 749 BLAKE2B 6b24f49ade0f425c1bb2051cf4d1ee93ee896a35dd2f47a5239f17da676d5dda68b2597d65cdd581ae39735f68f49d35311bf14d4f2a6ffec69954c5d1d2d38c SHA512 e52f5e2f1340ecd0fc5f79ab96c4c6e63a85b4e41ce204fd09f3ddf9357b0be80902fb56b902114b9de919f50c3c7fd3a47d8bef19c148d765d64e80b6e4ed7e
 EBUILD gentoo-sources-5.15.41.ebuild 666 BLAKE2B 54a0154beb3416c7d8043c92cb51f8e844216d5e0ce8966dc7bfead0efe84af53c6a9fe5d5d381b46ff5744dfddd9ed00314d1f329141e1567882a6801d453dc SHA512 d2af7925054fa71204d0542976955f32aeee5002b6be5f4c2498bc1e8cfbf9603f87a0ea1f708f05b00fe73fdce3d12f7a4c54206bc255086dc45bad50a0bfbb
 EBUILD gentoo-sources-5.15.52.ebuild 741 BLAKE2B f0807bb2c48707668b147d0478dcb519b706283fb6c4e720bfc43148f3957a0007ced878593ff6a694df4389904539cd42c1328c9786b9fce24edd0c514ebd0a SHA512 d9fa36c265693a77d20a22009621785328078674f87173a831333f1c4519073a01233d9922eaf79737958e36d5b1f370a0fb4b2c877c3ebea018d1b4afa5d09f
 EBUILD gentoo-sources-5.15.58.ebuild 748 BLAKE2B ed23f67bf9e2c73ad823341316327033a57ac2bb4a9bbeccb48756b6c6deaa9b469c1569ccad46c06788eb1af6c36f3d32be8d01f76fe55d840717443917cfe1 SHA512 b60a984333d0847795c9fcf198e4ce546e29aba2a73d892960402d7e12ccdf9034a1da976ceaf514b2dd88c448f47933b6bb3d3ec1e3df4c11902cd1a4505e4e
-EBUILD gentoo-sources-5.15.59.ebuild 742 BLAKE2B 1a34e976dcdedc215dbb07a937680e9a3c9dc9cfa98d570c26c0cacfba0ae4c13a621595ff87062823045f9791ff0421e04cfac48b885cd8ec70433d9b5c7f80 SHA512 bf645ce3548b257c1e5ccb3b2f2035a3a50f31486bddcf6c011bb821d8b1777887b0553c6d5a19b850ed01c55c92ce63aa91cb814027768fb83e5e2d1f920322
+EBUILD gentoo-sources-5.15.59.ebuild 741 BLAKE2B d796c978797d3d7d6f788ecb62936cc4ce65ab0d106a534dd43c6c4246384a8fdbd9c86f90a5e5f4ae869ed93d77af81e9ebe2e623134d83c885974744b7617e SHA512 2f81d078105796ce175cafcd30db2b07cda9ccadc3d312c100be6578267ebcdc153d09063a5bfb407abad9edb001de77623c37a7ae2cc5007bf87e2fafc85586
 EBUILD gentoo-sources-5.15.60.ebuild 748 BLAKE2B 98fae7968ab96d9c41815f688655ae32effcbd7c38370ebde37926e405e7c012fecb1380836279b681746e55d5fd5e60c9b742c88035176043860e4cd1978b23 SHA512 a0cfc198fffcc31604f999899ad9dc90186d3c98c98e2549cfae61c2a37aa5100a268ce9e07a14c861903e32af7cdb1d2092ba237ebabbf6fd27ecfcc670af47
 EBUILD gentoo-sources-5.18.14.ebuild 742 BLAKE2B 12997100b81fee9c1bc6a048d189f68b66a312046e7d7daf590f6db6bf31edc774a5e882cab430cac09c49fac8b0b4c3396bb712d7c8b22e275528ea4f9dfee5 SHA512 3bba7236c8c24e2b135ddec3ec7e4b8098c9325332ff82930a898a4081aeb2a68f4d3f68095fde6ed9be44ae46b646845a73b3a9357caf49cfe6cc5d443ac2a6
 EBUILD gentoo-sources-5.18.15.ebuild 742 BLAKE2B 09390111bf79b7d6192bb16fc2c27afd5e3d3446d595cae4e475770f84416fc4de320acbaaffceee168bcd0564377fa3d8bb9781c10d357b04f201e6f1e9897e SHA512 63aa56ccc9ca8263e44c96fd374187894f57d8baee3e6c1a70a679f55a6b26cf489f69aae648241ab414eb901fca95ba60b708f56e704c1240dd48ded28cbc14
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild
index 3673f97b9d2f..260cb204fb70 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild
index e0659eb27e56..3c51041f3d56 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 7cf6423a1685..7aa2351610a1 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -21,8 +21,12 @@ DIST linux-5.10.136.tar.sign 993 BLAKE2B 2b81f6dd2520fe5b5ed78a583a8451bf5f99244
 DIST linux-5.10.136.tar.xz 120473116 BLAKE2B b68c62f0ba53c0cc839bb5be07f0e4f458a565c47c627b6274e50a4b95e08276a30b9bb821bd17074bdbc8ea4a6f463772922a0b6445adc3f64dd3e9858db108 SHA512 10196bfa692646cd60885524fa8dbbb0f401bef83f0bb85415d4b4838b259fb2ae446e76b7c211b46c19d9f11077ecde1d47de97be453e2f06826231764f147e
 DIST linux-5.15.59.tar.sign 991 BLAKE2B 80fe92152ba1ec23c4cd3b1c3edf6ca8b4c381dcb4f8735daaa6dc1d417137b186a08d3d1af0fe9cdf7b3a562a7cd154b8bd9c9a28fe708613f1adbe932e56dd SHA512 34b52887f668c479f530120d0cbab7f4d30bb01cb204ff158b4908db5facf75d51722d2adab66b31dd2dbecf98c707ad0736e59d63ceeb3c27a4220c7633e027
 DIST linux-5.15.59.tar.xz 126404076 BLAKE2B c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b SHA512 1dd5badf83bdde38dd43fe1f678b883200b6b4b52547281ebd0780ea1cc628138e5798e21a2eb4bd2fb71755808017fdff5c85259e2c3211da79fcc8fb87361c
+DIST linux-5.15.60.tar.sign 991 BLAKE2B 9260f307fcc8726b5ccdf174ceb956ca37f0c835cd77ea8cdc001f927e376885adc1a7dc979034f4972715d3ddb700bcfec053dcbe436314dd274a076ee236ea SHA512 992aa8c6efcb4406ae508661497645f8a128b5b672960e2d39c2341510e812dd7768f79578b3f99d02ee550781bf2775936cf957f0235727956a282af89ede1c
+DIST linux-5.15.60.tar.xz 126417608 BLAKE2B 9c6dd581012cc21c26d2cf204eb92a2c28d9598bb8da1b884b6f78101b3b590c55f1b14d31aaf6b24e3b74aab3c2d00d632cc805d09ffb03de40ca89507a2c98 SHA512 b9d08ddd749c990a5e5413b5fe99f594b5b4b0a637ef3f622bd32d52d49126c0772fb7efecdfa998b2cbcf0de03f83bd76634db1f1d99f04098e252183b21b98
 DIST linux-5.18.16.tar.sign 991 BLAKE2B 5309ae0d80fbec35f4fcdfb82e3f1fd99c96ad53b82efe4ef95f0f7ee5f04be1e97f69bfe664080ff92fe21b327dc72e723515c0fe43fa52f6a43d1894454a34 SHA512 01edeffc25b4221907f0b57aca694361ff5cf5fd6235750422b23d95241b2a1b2cd3ba0fa4b8a895e1996df49d577654a16cb302c798e8c7365ec536088f6660
 DIST linux-5.18.16.tar.xz 129844784 BLAKE2B 60e9cc780af70242eaf3b41374acd8c11bb388a9aa17341aa98674e31a72cbd1c6ecf80158476fd762ed8955c6ded9a3ce8cd782ce0c956ddc3031c7487da686 SHA512 cc6813dc2c2bf8125159368e7b0b2812be220fd23cea98ec12ca727f3e032d313c80fc103abc55aa879c70105629dc54f14eed8e6fdfe00b9246bb850f86f5bf
+DIST linux-5.18.17.tar.sign 991 BLAKE2B ec46e8df0d2b2fa10b13a54284f46e058d2bb395599ebcaf5b5071b7ad61ec81673a73da4a5c09bd6603802d53f49b087e843f8b07b3b3529eaf12d3538e8c13 SHA512 053365b23cc7468b96b89ce56a788f6b67257727f35ff851a2a2006b9ff5b606c4d8c007553e0b62bec5989ba67667a3d47a169f4db9ee18cb35b2e5d860b582
+DIST linux-5.18.17.tar.xz 129891768 BLAKE2B 30af8d2fdc12378a8b4323757a2abee009a548c0b0019d14e38882e768d8f885b710a6f3e3e4eb8da746ce29a94d2f5707ce796fbdecb148dcda0e403fce1192 SHA512 0910f673fd457fece8e19abae6d538c6546463a290faf92e3b51cdfc28d876aff908e0d85bba221eebd4e8de70717a78f7646b16e738d70453583a7f2db8873f
 DIST linux-5.4.203.tar.sign 991 BLAKE2B 4e13305b908e1e158c61ae0667186cfd42e7dac237624cc871f584efc68c53d5de3a90379e801f5e26655293c584ab84e16c5f87d503c1e5381b6b9e8634d8d4 SHA512 867b1ac576df3db177f8c684291aed7a2094405a8c9f18c49c2f5f1e4c68b6fe4dbd211d65cdeb07db3522a6f485c03ce4993c687c0d93d85dd8af31b60fdb4f
 DIST linux-5.4.203.tar.xz 112925472 BLAKE2B 90467bcc6ca564affaa57adb0b0e0f7358dfedcb5d53309b987b239acadf6f9b5c77c4f265c7d5f8e6a6a42e9e5ed5a16cc17baeae004e2b55470c9d786de6ae SHA512 a7c7373cf5abe9ee48920b3f314020c9c552a8cd4e2eff67a32ef2f8300a789e7a7e9b78fd1a57b8a017ccc37a2d970b4abde5a85a7bd01766fc89af64cdbb69
 DIST linux-5.4.209.tar.sign 991 BLAKE2B e750fa4ffd74c55e555201c23c961bb056171bd009131132868a1d0af0fe878bc798d805461162e40009014661ce91f9da2aee863286bd82b27b359c701e8beb SHA512 6647e67a9515f5ea7cff75fb6e451475ca8115223d73eadd6762fd1874f51834f63d3b03c24895db25da9b635abc583651962bafdec4ba0e2dcf22ccc9609bba
@@ -32,7 +36,9 @@ DIST linux-5.4.210.tar.xz 112939860 BLAKE2B d02e73a6c1e597cb66d36995b7419a8bc1de
 EBUILD vanilla-kernel-5.10.135.ebuild 3715 BLAKE2B b05c31b018dd64fe0b94d899bc7a51a847cfc314e028fac2e7707cb910f1e208e0ba042f995ea94878a3a646ab654d422546a8f89dc78faea3d2884aaa72fafc SHA512 1427316489e333f980b3b5ec2d3eb1ebffcd13ca569146b81516a175b0681e5c5459f5cc0cbef64967d2c20765b56d9ba9c0f02374e92de1708702221d64cdf6
 EBUILD vanilla-kernel-5.10.136.ebuild 3715 BLAKE2B b05c31b018dd64fe0b94d899bc7a51a847cfc314e028fac2e7707cb910f1e208e0ba042f995ea94878a3a646ab654d422546a8f89dc78faea3d2884aaa72fafc SHA512 1427316489e333f980b3b5ec2d3eb1ebffcd13ca569146b81516a175b0681e5c5459f5cc0cbef64967d2c20765b56d9ba9c0f02374e92de1708702221d64cdf6
 EBUILD vanilla-kernel-5.15.59.ebuild 3715 BLAKE2B 0a92ef1cc83f1609e463ffd70fb223598a4d086cc996be80068e7e6fad7c5ee7c39cb8a87138721439fe9362d9001bd1f7c2c758f8579adc1e113d85acecb226 SHA512 39761d5bae8f003718e5ae9ed1b8c89b879b7214f5782c0fe81a1238d12b6944a22e9aadcdc5f2896b51a56052209677d0071c2fcbcdd2f48706c9199eec1755
+EBUILD vanilla-kernel-5.15.60.ebuild 3715 BLAKE2B 0a92ef1cc83f1609e463ffd70fb223598a4d086cc996be80068e7e6fad7c5ee7c39cb8a87138721439fe9362d9001bd1f7c2c758f8579adc1e113d85acecb226 SHA512 39761d5bae8f003718e5ae9ed1b8c89b879b7214f5782c0fe81a1238d12b6944a22e9aadcdc5f2896b51a56052209677d0071c2fcbcdd2f48706c9199eec1755
 EBUILD vanilla-kernel-5.18.16.ebuild 3834 BLAKE2B f30b546364123a5adbd88cedab76649064a66e2d3ad35d79254a9696d294fad52cbfc747ce27eec877c1c14ee2a731cd6094a7aed1c5f26d1fa2b0328dee137c SHA512 6cdeb0863fde0bdfe9380decb6fbb5a75e1c87c1cba4611835fa90315b4a8cae544ae9a479a5cd59a2ea0d920d732a240b7bfea0b3ac36dc704f90fce403a754
+EBUILD vanilla-kernel-5.18.17.ebuild 3834 BLAKE2B f30b546364123a5adbd88cedab76649064a66e2d3ad35d79254a9696d294fad52cbfc747ce27eec877c1c14ee2a731cd6094a7aed1c5f26d1fa2b0328dee137c SHA512 6cdeb0863fde0bdfe9380decb6fbb5a75e1c87c1cba4611835fa90315b4a8cae544ae9a479a5cd59a2ea0d920d732a240b7bfea0b3ac36dc704f90fce403a754
 EBUILD vanilla-kernel-5.4.203.ebuild 3001 BLAKE2B 7b8bce74e27909fdb673ee7477f8f8b988646071f112b1efabe3bde378872b21fb55f4486ef5f595562025506f5094866218a8afbf8bb69061dd4a3c24ed50ef SHA512 513282b9578460f32122cf9835c6a032e1659b691bfc8c56edbf459de57befa801ea881a86f1fd9ecdf96b838371e5ad319c748e97ae04253eb8e47479d7e579
 EBUILD vanilla-kernel-5.4.209.ebuild 3001 BLAKE2B 7b8bce74e27909fdb673ee7477f8f8b988646071f112b1efabe3bde378872b21fb55f4486ef5f595562025506f5094866218a8afbf8bb69061dd4a3c24ed50ef SHA512 513282b9578460f32122cf9835c6a032e1659b691bfc8c56edbf459de57befa801ea881a86f1fd9ecdf96b838371e5ad319c748e97ae04253eb8e47479d7e579
 EBUILD vanilla-kernel-5.4.210.ebuild 3001 BLAKE2B 7b8bce74e27909fdb673ee7477f8f8b988646071f112b1efabe3bde378872b21fb55f4486ef5f595562025506f5094866218a8afbf8bb69061dd4a3c24ed50ef SHA512 513282b9578460f32122cf9835c6a032e1659b691bfc8c56edbf459de57befa801ea881a86f1fd9ecdf96b838371e5ad319c748e97ae04253eb8e47479d7e579
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.60.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.60.ebuild
new file mode 100644
index 000000000000..13b58c5c9839
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.60.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.17.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.17.ebuild
new file mode 100644
index 000000000000..d959797853fc
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.17.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.9-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}