gentoo auto-resync : 04:08:2022 - 08:04:47

7 files changed, 419 insertions, 0 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f6d4d88bceb3..8a6c0d6cb746 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 fd1a77ee5c83..416da60e01c5 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-5.18-18.base.tar.xz 701140 BLAKE2B ee91222d6f6ce56d30cfe02b5546f
 DIST genpatches-5.18-18.extras.tar.xz 3924 BLAKE2B f01ece5d1568a0a760b58108571cfcad343a37be3d344ea728ff89d3fa5c972d7d1c6808ec41ec699ece98a2049ea2c5cc036bae5f44e93cf23528a71e3aa922 SHA512 e810217c00867d3836c4606586e35cc26e8c934382d5927ca188249610b613605437013ca0015217d650e89bede32d67f4daa443bd445dec382832a4e43937ab
 DIST genpatches-5.18-19.base.tar.xz 754304 BLAKE2B 4827ddbf25d32b89c8635f7cbb16bf2ebe3533450d86e358f0f47084a240bcc5faece567f3d8ca943ad980463b324eac184e04c2fee80229f38db8cddf7d25ad SHA512 157d3093573091224d151c930d309fef2160b2d8130ac4d28155d56cde993b6d17ede10fd33d436fa820da5c029bd45021ff393045250e260f7469660305338f
 DIST genpatches-5.18-19.extras.tar.xz 3920 BLAKE2B ba251facf88903832ba28ea4a7619b2ebfdac8b3d507201cad624763523283936c2d8251a715a7e0bd8c72569b55468e2d5c43dc48e6b504cf5d3c024dc840b7 SHA512 40113011145749e3aab4d0ad23ecf2bdaec2eacbe8def70201f13c0208cb0aa142a4e7be8d484e3db3b31142defdea125fbd8f54f4e3220e15a10b4b4f67bbe0
+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.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-209.base.tar.xz 4887256 BLAKE2B 56d7ea7975b228df055d1bd4cfc41b49890d815409a159772230c6e9d081061a9b438b525b5e8542eb03feb0bdfc1841e5bc5e14dd1570aff8f964862b192b00 SHA512 5ea69d50d836dad1f68f000c6c1f5bd8459dcbc4d50a4fbd4ba3241c4c87638850215c0207dfea6fe06cc596957e3cfa61a3dfc00f0b60513596da43d286615f
@@ -146,6 +148,10 @@ DIST gentoo-kernel-5.18.15-1.amd64.xpak 72935393 BLAKE2B 05eef3933a4d3d6c061b79e
 DIST gentoo-kernel-5.18.15-1.arm64.xpak 65247697 BLAKE2B 545902d4d44e4e2ec7fd7040ae155c6bc4123fa099f447703102ffba00f4c39a94c41215e207c58a211a497b00b4b03eee495d53679d1e17aa363cfe2665e706 SHA512 1b8576829432a400cc418dd45041229b377713caccb96012fd2fbad9c898bb95d1fa70bb3a9994821612286cb39c2fe8d405cb16a95737fb81ace80e59976887
 DIST gentoo-kernel-5.18.15-1.ppc64le.xpak 59363169 BLAKE2B ea5af950dfe764441a740337d651cc2551590ceef754162b8985073d0eb813b7f4fb37b104da9b5e43b791493466bd9c2f1c69f46292b31420a1d43ff3e5cc94 SHA512 c8ee366fd027e4577cc9793e4c23da0834ff129faef2e8fc031dde66cac1864ac5ff202076c592823faa9187ba9e7671d80373ade457657fbac500c4014b9ec6
 DIST gentoo-kernel-5.18.15-1.x86.xpak 62832725 BLAKE2B fc315f531e839c90b1ac691e418ef0dd0fda73f217d512fba39e962a7843782a74c07de9425d11d395b18b347496559b58c3b7d61f67db002dba311a05ec8583 SHA512 1fca66ae3322b598dcd58fcac6926769dbefcdd6b412091a4ba9e02cfce058f09502cd5ceddda93711406b123e93d7b2e9568c19077735a4e7dd63224049a666
+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.9-1.amd64.xpak 71596284 BLAKE2B e9eb499b587770b85cd230bfd5219c246f184addc2e4ff72be07ff8d8899a5532f35d67fd6d6c73289161b5ef5e83d62de8d7e6360a74f7989b16b74ab6122bf SHA512 1ac6bc3f97a9ee754fd9aa6c7360a725d2fc298cecdc28583db3ae8bb80c72d0d593a5c8a85dc868587285541437e1c62deac7baffdbf81aa9dd7f796df71c3c
 DIST gentoo-kernel-5.18.9-1.arm64.xpak 65216795 BLAKE2B 1947791701b9ad904633d8e65d97f098be88029a2d716e0e60d91cc02aff9c03eef429a90c8e85a8f1c0f82eaf49a2a03ea342a2b4537da044544523bc6ac2c7 SHA512 6557d0ec1b3072b51bac84dd99adf16cae9eee745a824ab5d39b227298a14ae5f2050aa1079b529593b583bdde0613dfa1fb099dd718d05aa2b3bb4828fc4a8b
 DIST gentoo-kernel-5.18.9-1.ppc64le.xpak 59391467 BLAKE2B 3d7aaf36df9ac13388101e16e90304ce4b0756a39f84dca004e0bccf054f34dfec4133e216ce68c640272047ba21a39f7d44761f2ea9e6985c92a6300c0bea61 SHA512 e6ccb620c255c5ba9e28919152fd0174f527a30906e3b0f30925ebfd37b189013a6d41343103eee57dec5f4afa29f9560bfb0e501d183496d2412214e11c919f
@@ -204,6 +210,7 @@ EBUILD gentoo-kernel-bin-5.18.12.ebuild 3179 BLAKE2B d787a408e8c9582f64476f84236
 EBUILD gentoo-kernel-bin-5.18.13.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.18.14.ebuild 3179 BLAKE2B 01eb5f420ac3cd98a4dcce1bff2e2fa20e7459c686aef304fc2750242c2db114817e2b981d7ebf426437c953df1e67f1a64af2affa693a5b8c55d81747688d9c SHA512 7e8559b147d4f3215a738b5ab501c5df18da96cef237b4996e554aa8ad1603fbbfb409f4c4cc21b8e9e769d3ab0d7cd3bbc0649a866da6223aa065b20bf385dd
 EBUILD gentoo-kernel-bin-5.18.15.ebuild 3169 BLAKE2B beea92a4d71574afbe65e94b0c65f2b66bfb7962cbb44b2867eaa97963281d99606240fe5aaa8393312df5ec5223404dcf631bc13f1404389b050de78f766016 SHA512 3874f69f775a6b88aa04e75b1157ce49e343af9df9a487ccfdeed01fcaf7fc9c9c84f29274470c362fa6fde6c2a13ebb2d87a3cb5bb1f4906f006c13dbfd89e5
+EBUILD gentoo-kernel-bin-5.18.16.ebuild 3169 BLAKE2B beea92a4d71574afbe65e94b0c65f2b66bfb7962cbb44b2867eaa97963281d99606240fe5aaa8393312df5ec5223404dcf631bc13f1404389b050de78f766016 SHA512 3874f69f775a6b88aa04e75b1157ce49e343af9df9a487ccfdeed01fcaf7fc9c9c84f29274470c362fa6fde6c2a13ebb2d87a3cb5bb1f4906f006c13dbfd89e5
 EBUILD gentoo-kernel-bin-5.18.9.ebuild 3181 BLAKE2B 3d96b3ef0bb3f97f101823690955371ffb3f27246651b9faee643ea972b930e53706bf164d4560d3f5e485e060a40c2bdad46f59c0192076c5737f7851c93ec6 SHA512 2e245d442bb5baf2c731bb328aa1c089d4d4480066b38b198b8ac15dd11f73fc99ad85e9745f4fafcbf3d1c304e76f6209bb931c57fdb02c15a54cb7cc53624e
 EBUILD gentoo-kernel-bin-5.4.203.ebuild 3177 BLAKE2B b9df1ff36a996b688640bca679f8342d7cfd016e9305d8b967f5b5895b417ad0aff4e5b07023bef65c3aa7c2f895d3a21c019ddcb48a0dea5844bf16a35a9602 SHA512 46ec6d4b5f3b818ae84d60e7dc1a8abd69f5221d609c5d176a8160cd1bfbcbaf41da3b374369747c98143d5db532bb8e4969d84fa3164d7a2b1e9819b8131ddd
 EBUILD gentoo-kernel-bin-5.4.204.ebuild 3181 BLAKE2B 852c1e5dced74978b88730b17ec3a1bf8461ef9ab922b07b1b2e40dd1aa6cb32b9452e0fd96e63369bec9e235c3a99a7d0f2215e0e3ac331aaa161232cbd613b SHA512 e0b994133da4ad035094bde587951a4a41f161fe067b58076a759fba38fdd724ad127e25a912260b26db9fbf2bec3cef5488d87735400fae46d89cc68650a867
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.16.ebuild
new file mode 100644
index 000000000000..cc187009eb97
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.16.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/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~sam/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/Manifest b/sys-kernel/gentoo-kernel/Manifest
index d5b5e9a8f573..866efca25959 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-5.18-18.base.tar.xz 701140 BLAKE2B ee91222d6f6ce56d30cfe02b5546f
 DIST genpatches-5.18-18.extras.tar.xz 3924 BLAKE2B f01ece5d1568a0a760b58108571cfcad343a37be3d344ea728ff89d3fa5c972d7d1c6808ec41ec699ece98a2049ea2c5cc036bae5f44e93cf23528a71e3aa922 SHA512 e810217c00867d3836c4606586e35cc26e8c934382d5927ca188249610b613605437013ca0015217d650e89bede32d67f4daa443bd445dec382832a4e43937ab
 DIST genpatches-5.18-19.base.tar.xz 754304 BLAKE2B 4827ddbf25d32b89c8635f7cbb16bf2ebe3533450d86e358f0f47084a240bcc5faece567f3d8ca943ad980463b324eac184e04c2fee80229f38db8cddf7d25ad SHA512 157d3093573091224d151c930d309fef2160b2d8130ac4d28155d56cde993b6d17ede10fd33d436fa820da5c029bd45021ff393045250e260f7469660305338f
 DIST genpatches-5.18-19.extras.tar.xz 3920 BLAKE2B ba251facf88903832ba28ea4a7619b2ebfdac8b3d507201cad624763523283936c2d8251a715a7e0bd8c72569b55468e2d5c43dc48e6b504cf5d3c024dc840b7 SHA512 40113011145749e3aab4d0ad23ecf2bdaec2eacbe8def70201f13c0208cb0aa142a4e7be8d484e3db3b31142defdea125fbd8f54f4e3220e15a10b4b4f67bbe0
+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.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-209.base.tar.xz 4887256 BLAKE2B 56d7ea7975b228df055d1bd4cfc41b49890d815409a159772230c6e9d081061a9b438b525b5e8542eb03feb0bdfc1841e5bc5e14dd1570aff8f964862b192b00 SHA512 5ea69d50d836dad1f68f000c6c1f5bd8459dcbc4d50a4fbd4ba3241c4c87638850215c0207dfea6fe06cc596957e3cfa61a3dfc00f0b60513596da43d286615f
@@ -102,6 +104,7 @@ EBUILD gentoo-kernel-5.18.12.ebuild 3857 BLAKE2B 0dee6d23887d04b56e4f6228ca833ee
 EBUILD gentoo-kernel-5.18.13.ebuild 3859 BLAKE2B 7d5e5654d596002eec8478b6f72c3e2b8896acdf1f691f3d329e030b031fc8d2fb46434ec039dea09f1def77086663df6710e5690c0318bc15d8028321d21271 SHA512 3af374c1492526da624dd26511c01d401750fa59a8184f978b8ae28c564644faeb91ce8652f2baffe40a8c8f7d9c59b2a269b8c36ee3636f61f8a9d70093f2da
 EBUILD gentoo-kernel-5.18.14.ebuild 3857 BLAKE2B 81b04a8e1a805ba912e4ad3993f5d2915d77f3318e37e39ac95dbed503b965e064be55fd2d8ed6685836eeebb9a50a9aae5f787577cf058098cd002cf8ff9a40 SHA512 b917d360876b37c99d6c43f5884b86910d933e44b095651acef5167e6ef46826004f8f25befe001a6bf42149065a0a3d23a6aff0911d4d17c4bc034be0f89d6c
 EBUILD gentoo-kernel-5.18.15.ebuild 3859 BLAKE2B 7d5e5654d596002eec8478b6f72c3e2b8896acdf1f691f3d329e030b031fc8d2fb46434ec039dea09f1def77086663df6710e5690c0318bc15d8028321d21271 SHA512 3af374c1492526da624dd26511c01d401750fa59a8184f978b8ae28c564644faeb91ce8652f2baffe40a8c8f7d9c59b2a269b8c36ee3636f61f8a9d70093f2da
+EBUILD gentoo-kernel-5.18.16.ebuild 3857 BLAKE2B 81b04a8e1a805ba912e4ad3993f5d2915d77f3318e37e39ac95dbed503b965e064be55fd2d8ed6685836eeebb9a50a9aae5f787577cf058098cd002cf8ff9a40 SHA512 b917d360876b37c99d6c43f5884b86910d933e44b095651acef5167e6ef46826004f8f25befe001a6bf42149065a0a3d23a6aff0911d4d17c4bc034be0f89d6c
 EBUILD gentoo-kernel-5.18.9.ebuild 3859 BLAKE2B 39a5bf5ba05e8966d0c154ca944547d1d0fcaa320c278de676259385b59da46c41dad6cfb5a4d384e70283668a6bb8c89e297b55117ac479a307f02ddeff351c SHA512 98446575d30ca3131c36c2642cd14ce6a8e0b4053ad94da0e6cec93c82f92add00ef0c34fc18800643347c9ecbc9830ba6103485f43e991cbd4460ad37f9caa9
 EBUILD gentoo-kernel-5.4.203.ebuild 2799 BLAKE2B faf615c3252cf128099b4b7359422d78b19be5b647e89e4524b519e75e1fe9a8e778398cce27093e6be22c7977f18a996a6f7e72afa813d6a8369fa9f2395e05 SHA512 70a94b7bcb72a3adb27fd4707a7a4b53d952d37857dc22a3523846faa8f77c7309017264e8601f22c4ab01c3b2726a1dbe1b0f5dd2d81c7ea28c5b486265f8d6
 EBUILD gentoo-kernel-5.4.204.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16.ebuild
new file mode 100644
index 000000000000..b0f35a014fbd
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16.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/mgorny/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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	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 ~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/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d03c0aa15b3c..745a6dd314d0 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -59,6 +59,8 @@ DIST linux-5.18.14.tar.sign 991 BLAKE2B 64bed04a35908e72950298e37ed4d200acafbd04
 DIST linux-5.18.14.tar.xz 129850900 BLAKE2B faeadb397c61f3adc70fb03d5ba10c203764d8a43b70cb70838d17780922bf05cd8389c19ba8d323f322d81169d11cf744d86103011c4a17606a2081e18a906f SHA512 270c27efc9557c001314dd80508d533e00c1f5dc6be496e1c4581144e2386550efd42048293f178816a01be1c18dc70ee99eeca5d0deed5dd64f4f8baf90a146
 DIST linux-5.18.15.tar.sign 991 BLAKE2B 9a66fb09918dda77b25b995cb10e6681c1a6c589c19afcce1a3b39d10ad922d728fa9174235c90e29462e34ade9394d4c28f3c485a89af688ee969ffe4fe9058 SHA512 815685c8b0aad3ecff7a1b781ce7d79bfb05e466195c08c39b6aa0c012e23da465537091ee416ce98ba09d928a566061ae43c5d6a748e92b1618b3cb3685072d
 DIST linux-5.18.15.tar.xz 129847068 BLAKE2B a99064b7725f84c6a99819a2356d40edb9117ee4a91c5243a7f8f0611200e7f54d300f48c79b86ea6f23d145b50fd180d33e664b305bcc07917c2162e9f193ae SHA512 9436831b84727bd751741d1f569dc8bc314c33daf02d2405d4ef612ae6797dc4b3b96e13b46088db65e518052780f1bc30c0d1a4c528373d3509039dc055f835
+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.9.tar.sign 989 BLAKE2B f763fcc33c0cdc17835596b89f3589aa23c2e42f9569a31ce359595c45f558fdd79b04a29a3165a18271d23b2f7bd2388b589ae147c9395b46bc18271844d5d9 SHA512 c9928fb16009c3c61c19a9d0d3821496bc642c521bfbe942e9769a5f7b85eac1546f7db1878741f4e47875ace99732342ac75e39985003301fd405757f820abd
 DIST linux-5.18.9.tar.xz 129826700 BLAKE2B 9daa0be3f6f528aa4d761db357448c007f2647530940a12688b7b8b769a605d64b5ccacf0215759fff3383e8a9a179658e4e272bd4747c51663e120e0e12287d SHA512 8db3c73c91cc3cabcf24224bed97a790c562d28cd6a6562b924e7c07cc671d3721d7210defd5c9cc4bddfc16afee0086dacc40397823ca3ccb890f2f938f5814
 DIST linux-5.4.203.tar.sign 991 BLAKE2B 4e13305b908e1e158c61ae0667186cfd42e7dac237624cc871f584efc68c53d5de3a90379e801f5e26655293c584ab84e16c5f87d503c1e5381b6b9e8634d8d4 SHA512 867b1ac576df3db177f8c684291aed7a2094405a8c9f18c49c2f5f1e4c68b6fe4dbd211d65cdeb07db3522a6f485c03ce4993c687c0d93d85dd8af31b60fdb4f
@@ -97,6 +99,7 @@ EBUILD vanilla-kernel-5.18.12.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c
 EBUILD vanilla-kernel-5.18.13.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.14.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.15.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
+EBUILD vanilla-kernel-5.18.16.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.9.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.4.203.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.204.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.16.ebuild
new file mode 100644
index 000000000000..facbe03b0e1b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.16.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/mgorny/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/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[@]}"
+}