commit:     776f8df44077be7adc03b2a05219da5a097f8001
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 16:35:54 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 22 16:36:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776f8df4

sys-kernel/vanilla-kernel: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |  22 ----
 .../vanilla-kernel/vanilla-kernel-5.10.113.ebuild  | 134 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.10.115.ebuild  | 134 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.10.116.ebuild  | 134 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.15.37.ebuild   | 134 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.15.39.ebuild   | 134 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.15.40.ebuild   | 134 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.17.7.ebuild    | 134 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.17.8.ebuild    | 134 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.4.191.ebuild   | 108 -----------------
 .../vanilla-kernel/vanilla-kernel-5.4.193.ebuild   | 108 -----------------
 .../vanilla-kernel/vanilla-kernel-5.4.194.ebuild   | 108 -----------------
 12 files changed, 1418 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index e8b02c89062e..3ef975b1a255 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -15,33 +15,11 @@ DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 
0eda9d4f3f973336cabd67c1
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 
239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf
 SHA512 
9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B 
a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2
 SHA512 
8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
 SHA512 
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.10.113.tar.sign 993 BLAKE2B 
076662f2ab09e172f5aef9817beda56753a35c0d48f12d3d096871dca8af6b85f635c1de6d562be0719b475ae66074b659f7a855825c09889bc18d5f9b659784
 SHA512 
c82e59dcb47cc8acf4d08e148ba91bebdf4e4c35a4ec5405ec5401165583d4c509fa287817cc343345da8f24a4cf7ec7e0b8277653f6d230c81beb32eca75fc3
-DIST linux-5.10.113.tar.xz 120410360 BLAKE2B 
bfd4cac707bc8232767aafc0e666ed9fe23951802b87998aded0197a2141d2db20d33f8961e4e03159fd4c397466049ebaa9d47f1f7c512a42739b07e6c899a7
 SHA512 
7099c83243f707d66ac09bf7215aa3fbc63957c2636fa63f287e526de210952c4106de411201e2ac001aa46c73c05cd4892e633911cfa30b96db7613f832b81f
-DIST linux-5.10.115.tar.sign 993 BLAKE2B 
a9a276dba44fc0c663c812d3ba96e8bb0c1849d8dac8c65dea9559ec3064c4fffb9b7a29a90ef663a76ba14f987ca8130b26ddc0c0b3c529809b341c37d41e2e
 SHA512 
a51ce18ca8f33cffcb4aa73b0d92a03ed11b310b0266338a0a07e371dcfb2fbbb340b7829f960c17e9cbeb4b5f9ca6f1139b9b64f2671e9a4fc6c795b3977ff2
-DIST linux-5.10.115.tar.xz 120399008 BLAKE2B 
95a5354c70d75c92fdaaeb70ac6fea360b0dfe5dbdc8574bceac30a07fa0c93d066528f97e40cbcf375923f526d4ab592d9e1c4a06120c5aaee2595a1e1d50df
 SHA512 
787c1fb601a05f7f0d0f235b703a9dd5f6b8f49bbc4bf4ffb8a46fd96d53a96cf2d508d7e575b3d7a8445118730f99516a250e706803b0271215af9a1c058dea
-DIST linux-5.10.116.tar.sign 993 BLAKE2B 
b48c9740ec9a207a85aaa122b35c9a0ab05a54e08bbfd796b5459fd6948ea4a667e593b9455a9009fc399a97673b7e52adddb3dd681b7314d3a87191af70fe12
 SHA512 
b173638751cdad0f0796b102e94f8bc14a8a82b46557d69be052534c88638192af86224f859dcec58a6a53a5afa6a085180b1a7a3c5fd9ec20444feb8c792ac3
-DIST linux-5.10.116.tar.xz 120404384 BLAKE2B 
137623431836c8fcc1502b889280876dfc8d48ede1664f4a325e072d3e9bc5d43211ecb97d7fdd7a816aed3bd74546caea2f6a62aa243fa61f8950bac0e8f997
 SHA512 
b3558e89998501fb95cfe0831739d00a30a3d6979e7aa12399f74ff45479cc8d720470916ff35ee1fc6b0898afd7b40f1ec1ecc5d29cd5c5853886e227c2e5ec
 DIST linux-5.10.117.tar.sign 993 BLAKE2B 
a4365bbb057db936510aa6f1e50b136a4e35c601d6003c3f78f0dbc2e5c18daeecba040e621c0c14ca25319da406c94b8dc469cc7c8d5003bbe94e1a90749e0a
 SHA512 
dd63b7be79912d46945f5017bd00c45ef73ea36cd8549aa38bfdb7ac9bc71b1c9d1b3c83794c38239b2b4beb17e83ba3fc8f8fa3921721519ca0577af9d59765
 DIST linux-5.10.117.tar.xz 120409348 BLAKE2B 
8258d709d637891dcbb8523c6d9c8c007a44b7f7a109ffa9cd48f9fd9b4e7dfba170f9ed97828f4beabe6c6ed34ac69b287ee489321569adb282c7d0745d3750
 SHA512 
3f9488c55a6e9458cf53e06992ff56054cd4c933eb0e87a5122b6b7367d6ca7aa3587572e8f5362cd3264104f839102f87f40ac98476f666c44488b9422fc39f
-DIST linux-5.15.37.tar.sign 991 BLAKE2B 
224f222dda3d7221a32b575ae52fe0ea36cf5315860ede2bf8b16ff3e9ab6c03f05fc5604c99da9abe44ebb9af0726731449c7d827dbc29bba5c9af81088108a
 SHA512 
cb775ec01ee9d1de53a0b958c804f8bf7d84185438e4a63e94b805dc0dbdababf0ec85489b8314303a78386090afee30525b9993dc669334dc131b65ead7305c
-DIST linux-5.15.37.tar.xz 126314716 BLAKE2B 
41fa48151cf9ba20aaf9161ff1bc48a890a165107784e41e9e7535093ea7fb833ed5d0ff75534bd721ff1c80dc52d55b3585c3473917c665ee4d0f107d7e1e41
 SHA512 
afc84a10b96e70b859ec328f8d803d7e270264c8649492899292b92650840586c08e1df3196af41c09185e68f2d400cdc302bd0a474cd4ee86c34979098fae48
-DIST linux-5.15.39.tar.sign 991 BLAKE2B 
e1b9446d695c20140108320471fe9f6d9c95a0d525ae1e88b5a4acfbb082afde83272461befca10e253799b088cbabd856256d83856ac03aca0e5cfb4c787f63
 SHA512 
30951a220de1f8cef56d2f4267d12fd78f03a966b11af0bf74b4521c746147549215a6d435c130f230685f2bd90500ba47fe1b178cf5aa560e3024ba10b7de8f
-DIST linux-5.15.39.tar.xz 126317316 BLAKE2B 
c2b7e8e944e30aca07b70355a89b86e15756226e8a13826e749b330668cca28e0caf758c1a4f8166590d5a26ecda49f665ad0caab4c800c599e857fdf281ce3e
 SHA512 
712608b95a53ff3ae31313c518614c1376a809d621d845bc23f096243f3ea509a11e451b14709ce4ed48b964547f177bcb20d57e62806938d129e0187a2cd296
-DIST linux-5.15.40.tar.sign 991 BLAKE2B 
0fc23aa789af5570448d723f11e6503c508e9485a32dd675cb9bc45b3685294a6b175d6f95d5976ca0996c6d2d738cca8720f68df27bc57cee84a02ecea763e5
 SHA512 
ca2e4d86175736613e6529d97e2be6fd3b06300aa902c21fce3b8ad809f3085fdd4cd3ca3e0fea40fc86439238ff3422b9950ee82c6cc7c5bd642bd453f275c3
-DIST linux-5.15.40.tar.xz 126329200 BLAKE2B 
5e6b6948a137542594011918d059fcef49fb13b35b99a3eff57838257a97749534a568a2caac7f97ca9d8d0685a6e73be9c6b5494e0a67bf45db49e922c37069
 SHA512 
2cd0ef9f0932bf5a2a400a467687937cc5164cedd79ec0cf726921249e1d540a9ecc99cd8edb3e8ee74ebaa7a131dbf19886f5e858bf7834b59779f0d110dbf8
 DIST linux-5.15.41.tar.sign 991 BLAKE2B 
a5ffcbc8a9127288f6ec5d640178a286114343643d91d218a85e9ad9feddcb3d1febaf0d36f6ec230a732cdad0f8bc41967308049b3c7a4bece24c70ab546552
 SHA512 
e8420f18f3ea201669fb1ba3f6565d41ddb3c6063b81ea27de5ae51501e01a1fc73283d0fd55255f74003857ed9b07645eee7ed8a6322e986356d7b5685b10ce
 DIST linux-5.15.41.tar.xz 126321620 BLAKE2B 
c92592a3994c607242053cde655ebc7ba837e2a8d06594fd14c54c63e227fab42eb9ed3e1c452a76e7258c3f46cfed447306f9cbde62c5cd96f04a334edffafc
 SHA512 
f93bddc7c7890c5014c0b506884bd5487cddac462f74e965e869538f97e22428739e5f71badfcb6ccb5b20f642dd66b53286d85036d239245cca9865d826044b
-DIST linux-5.17.7.tar.sign 989 BLAKE2B 
8e83a92b4be4a20521051e04ca6229aa72441ea1634e7140ce28049f569a8e9a91a963f3aad816d8ffc89e1e43ac7f0346f9230dfb7eea6b67f8ec4f6dd7b36a
 SHA512 
8c3de748ca7d1ddc25932acca0d4dfb1e355ff77cdde9add0f6f9f911313b0a6ea797e44e8c9813bf97d7cc4bbf4d34e71c19b940daa0bf226bbba082fe09666
-DIST linux-5.17.7.tar.xz 128454448 BLAKE2B 
1c1b1f59404becef201c28d6677a2a52a828a51903d0fe5b38a931fa25694d766eeb222b02f674d95ea8c67c29e0f3420b88f94bdccfc2f9bd575c2605e8f229
 SHA512 
c70ce704b65bba14237e1ca042add6ca075b08d65e9b90d5441962ee2e6a70a58da72ee847a17917e5d170021933eea6b681a5774454f2228b2153e76b440c97
-DIST linux-5.17.8.tar.sign 989 BLAKE2B 
29e345830f5f82b3384351d3896be04e51f5cbcef1d63be36fa2e5aea5220de77dbfe29dfc1b79998314ae494d5e76a69d394b8645b98d8c5d06ac1473a66ced
 SHA512 
3b5ccb002fd27ec29675ed50c33118cb758ba71d694df43fb9f1a3e0ae9002f135d50ddddfd3a856ca14fdf41e13367fab6f95432625477f4d0ab0a3b7b6541e
-DIST linux-5.17.8.tar.xz 128448020 BLAKE2B 
caa76ccfba188bd868e0a1820802df10d369ade805e9bd0e4ec9efc3bf489070afe8fba469ed8480805feccad4ad38232a6f0ad64ef4a8f56582c4d1158382b7
 SHA512 
032feea7138d0b9b016a50769e6f10889e0ec8cb532569b1aaecac957211e60cc9207aa6ac2bb379c967c8322f8ccb19d2834bf1f88c03d0774b087e08a9a22a
 DIST linux-5.17.9.tar.sign 989 BLAKE2B 
a078037dddf7634cf5e854b79a873cb743a3809a4be3d6fc4c8d9ea2340ed61d118dcb58edecadcdc653ded2e4c552d44b56d5d962d833b6b37234726ac35b5c
 SHA512 
07c2d483e0b02ed17b27d774513cca9be47b7d163964e7f2b14f0be273e8d67747a164274ee1fcdf67abf39f7141297322eb5f39cf9cf4df89bd03f48fc95143
 DIST linux-5.17.9.tar.xz 128449736 BLAKE2B 
83dc3cf66933f42a3cdce0015716017ed7fd7810a380a9374bac495b9f0a96b1b95b05bd012332c4156189f6a02d8a9b8b33c9391458adb9909a75bf661d8547
 SHA512 
8866b6f0ab8cbc122bbed0083ee9b351193780143259b818a15cdde1581222ee728a60344ea9267d7f3e6b1563b24a23100f46e6bd185fdc1e169b804e48cc2e
-DIST linux-5.4.191.tar.sign 991 BLAKE2B 
0897c615b6b49b0d18c2c3f3bd6767b706c5fde582c6cf2954f4ef91756b11d8d10fbe5c83ad616208ab5fbd2bceb64b358b3aaf87f4678538e85096dc9b22cc
 SHA512 
f18cf2d5bdc7d2c60bf5d2057073e4a0afffbb0673b809b98ab80ed203a4ff292fab45ac8a6faf1853715f5e3155afefbc663aff28f31166ad17a629157c6a31
-DIST linux-5.4.191.tar.xz 112925776 BLAKE2B 
c4ac730ee2d6686b844009d9ea5bc461a5eca9fe0600a3d66a819ae32e0d3a92aaceeab9785a325a5c03fc50120e650c16b349d5dc6ef7e571980859c16446a0
 SHA512 
c94b274c3d49cbf3de085fabe99a0e63ff8fd6a6628eb0f2182db06b0480bc0c67991de9c5786c1d252e020b3cda4ccb29ce93ab599065149b3211786842baa0
-DIST linux-5.4.193.tar.sign 991 BLAKE2B 
868843780609978ca9a6393914d3e4bbc4f0d5ce348247286434ce67514ae5c34f741f0a9aa137cf8eef5254638edabc439dc83294c9f9c3fc26feca2f846a21
 SHA512 
743cbbb2989deeabc881efb1c1b2b56d623a4c457770c6de4b4498edc826f8039e729d8dbbb0a351d17e2ff290b122d5b85f5944aa1aed7ff5a73705ade449a5
-DIST linux-5.4.193.tar.xz 112910204 BLAKE2B 
36ce7f9d1312537e2b7859af857189d63c3680d90cd9d2388be06ff8e7e048259518fa75f330a9f8b8001cc80813fda80a29fb0fa5e92cd032e3e9259261ab52
 SHA512 
36b201808b9d0870e33dd6a10bc9c803a728ff5bdb0cdee2e14e4824e21e611de98cb3e5dfef26a8b0eb7dcb4e8e9b41824e9208fb20967e226cde65ea884d69
-DIST linux-5.4.194.tar.sign 991 BLAKE2B 
d9de26a71db215341367b41d239f4d1b4efa9a7d66a139b9a75b2b853c161ace1196cb56ddbcd38bb64979343717c696778b011f78250b1c6903d97bd8cf38eb
 SHA512 
a9be800562cda71e4d06fce8254c9cef2c1932b33faef13b6ecf7f50c9bb473ae727607a09f194227d2cbf2de7d5fa9b055145a524358a4606eafe5426ec137e
-DIST linux-5.4.194.tar.xz 112918432 BLAKE2B 
5322ddb0355020847834bc0330253c079a14fd7c427563fa3e3f2756cc40d7298934aed5c7ea81fc263fd534a5b1521898a9ac576f4c0280d93dbb8e436fb687
 SHA512 
9b316e71c7f5feb263ef78f99f30b42d39a14f8cabe0e2fc87c2af94b33ced09d97167a9b6d74fa0b0e3a7eea8caa7014fe5ba09efcf8dec147bede8ea0f8066
 DIST linux-5.4.195.tar.sign 991 BLAKE2B 
c80a3a547d82b7d394155f396e3beb66df61272dd5f57be00fcf3b8b6bcc419914fde3488b950f29f6c235210e8f777e28199a4126530963749ed3107c49a249
 SHA512 
a770e02e59031a8bc74c832c1f9947d0f2edd397de23eef234f18b7070128c8adb1836ca4297dce1afa9f5ddbdb97fa4404e2c90faa81d5502d8856dca4112fb
 DIST linux-5.4.195.tar.xz 112920616 BLAKE2B 
9c3b21e2bf18800c4b55bb04810e29fadc6414fd100d4c2bdd3df1ba7db72124a0bab389b9d5038fd04440ac69a06383df5b4c42d6e2a6382c81af8aba366bca
 SHA512 
695e46ea1ac6c587f39f724460c480f4994267969cd620a776766ee7a5bb88b346154baa3ecc3444dfa1d0d39a5e8a0f1a5e36cdd76a2c71ea7a899b8a8a9d7b

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.113.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.113.ebuild
deleted file mode 100644
index 96cb3e86fc4b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.113.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-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/mgorny/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.10.115.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.115.ebuild
deleted file mode 100644
index 96cb3e86fc4b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.115.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-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/mgorny/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.10.116.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.116.ebuild
deleted file mode 100644
index 96cb3e86fc4b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.116.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-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/mgorny/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.15.37.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.37.ebuild
deleted file mode 100644
index 0ef902726d5d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.37.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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/mgorny/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.15.39.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.39.ebuild
deleted file mode 100644
index 0ef902726d5d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.39.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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/mgorny/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.15.40.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.40.ebuild
deleted file mode 100644
index 0ef902726d5d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.40.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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/mgorny/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.17.7.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.7.ebuild
deleted file mode 100644
index 87bf3c98dde9..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.7.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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/mgorny/fedora-kernel-config-for-gentoo
-CONFIG_VER=5.17.3-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/mgorny/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/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
-                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
-       )
-       arm64? (
-               
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
-                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
-       )
-       ppc64? (
-               
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
-                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
-       )
-       x86? (
-               
https://raw.githubusercontent.com/mgorny/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[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.8.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.8.ebuild
deleted file mode 100644
index 87bf3c98dde9..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.8.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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/mgorny/fedora-kernel-config-for-gentoo
-CONFIG_VER=5.17.3-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/mgorny/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/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
-                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
-       )
-       arm64? (
-               
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
-                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
-       )
-       ppc64? (
-               
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
-                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
-       )
-       x86? (
-               
https://raw.githubusercontent.com/mgorny/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[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.191.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.191.ebuild
deleted file mode 100644
index 4f5f7870ccb8..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.191.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-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/mgorny/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.config
-                       -> kernel-x86_64.config.${CONFIG_VER}
-       )
-       arm64? (
-               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-                       -> kernel-aarch64.config.${CONFIG_VER}
-       )
-       ppc64? (
-               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-                       -> kernel-ppc64le.config.${CONFIG_VER}
-       )
-       x86? (
-               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-                       -> kernel-i686.config.${CONFIG_VER}
-       )
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="debug"
-
-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
-
-       # prepare the default config
-       case ${ARCH} in
-               amd64)
-                       cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               arm64)
-                       cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               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.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               x86)
-                       cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               *)
-                       die "Unsupported arch ${ARCH}"
-                       ;;
-       esac
-
-       echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-       local merge_configs=(
-               "${T}"/version.config
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-       )
-       use debug || merge_configs+=(
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-       )
-       [[ ${ARCH} == x86 ]] && merge_configs+=(
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-       )
-
-       kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.193.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.193.ebuild
deleted file mode 100644
index 4f5f7870ccb8..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.193.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-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/mgorny/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.config
-                       -> kernel-x86_64.config.${CONFIG_VER}
-       )
-       arm64? (
-               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-                       -> kernel-aarch64.config.${CONFIG_VER}
-       )
-       ppc64? (
-               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-                       -> kernel-ppc64le.config.${CONFIG_VER}
-       )
-       x86? (
-               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-                       -> kernel-i686.config.${CONFIG_VER}
-       )
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="debug"
-
-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
-
-       # prepare the default config
-       case ${ARCH} in
-               amd64)
-                       cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               arm64)
-                       cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               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.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               x86)
-                       cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               *)
-                       die "Unsupported arch ${ARCH}"
-                       ;;
-       esac
-
-       echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-       local merge_configs=(
-               "${T}"/version.config
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-       )
-       use debug || merge_configs+=(
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-       )
-       [[ ${ARCH} == x86 ]] && merge_configs+=(
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-       )
-
-       kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.194.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.194.ebuild
deleted file mode 100644
index 4f5f7870ccb8..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.194.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-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/mgorny/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.config
-                       -> kernel-x86_64.config.${CONFIG_VER}
-       )
-       arm64? (
-               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-                       -> kernel-aarch64.config.${CONFIG_VER}
-       )
-       ppc64? (
-               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-                       -> kernel-ppc64le.config.${CONFIG_VER}
-       )
-       x86? (
-               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-                       -> kernel-i686.config.${CONFIG_VER}
-       )
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="debug"
-
-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
-
-       # prepare the default config
-       case ${ARCH} in
-               amd64)
-                       cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               arm64)
-                       cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               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.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               x86)
-                       cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" 
.config || die
-                       ;;
-               *)
-                       die "Unsupported arch ${ARCH}"
-                       ;;
-       esac
-
-       echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-       local merge_configs=(
-               "${T}"/version.config
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-       )
-       use debug || merge_configs+=(
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-       )
-       [[ ${ARCH} == x86 ]] && merge_configs+=(
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-       )
-
-       kernel-build_merge_configs "${merge_configs[@]}"
-}

Reply via email to