gentoo auto-resync : 22:07:2022 - 20:47:41

7 files changed, 419 insertions, 0 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 54ab147f7cca..54ace5456df5 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 d2e56325ece2..c48c784fe1c2 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-5.18-14.base.tar.xz 610104 BLAKE2B 1bb79a0ab1239773023c353305c30
 DIST genpatches-5.18-14.extras.tar.xz 3928 BLAKE2B 6daca2ba0f7a1a2f318f3a398a37303bc9e1524bcb9cfb2713642eeafc86f1919f2e16789815780b78a391607d2f6fc34a84682f257360fbb3793e34aa56c84a SHA512 58e6fe384be03255599468c196b89e8f3f266f113a6b7f623494937205892d5f7dd301361ead1569790f05c4bf0a6f3813b4511a11cc77294dfc2d2e69590140
 DIST genpatches-5.18-15.base.tar.xz 610660 BLAKE2B d3a1d9a432ffc110af26d74e96b042abb28a79f77d3b6984c20c5a880e29f05c372a9d499646915eabb71a51441734067b0e271a13d111f15c65f6efdca79a40 SHA512 53856c12e3c10733f6ae78e6408af7d628aca7dac8fce5569eed5b3f35ce58bd465d5e40da2183fd06ce70775c199b93f88f73324c68f73c7303d2bc7c71acfa
 DIST genpatches-5.18-15.extras.tar.xz 3928 BLAKE2B da2016d84154d129ef32595c04f06f861aa91c7981f9122e8120284a04ac0064785ebb2a4717d544c475f63388e36aa2d2012dc426a9a8f9f66492a507e1755c SHA512 743610e02ce92f053bf41351253d27966de5c3dc0a5499e00328debb2d64f7bb41d29dc5670f11e63dbe2e8baf466a7b99fd2b70ba37a7698f53b25044790196
+DIST genpatches-5.18-17.base.tar.xz 670556 BLAKE2B 9f992048a0a964e6a96b077682d6a8412c2f35a15c3b5533c36d474cc724fb9983205fa8f177a9172f5f0c1e26b6127edac3da89b702dc088d3b7bcb24513822 SHA512 d8f38eeebc11f382e0c57f668f213d07f5d2f99c210133d831ee29feef90bfc81eb57c9c9fa173548ef4dba05865990539a879cf0bc1b548ca6a75bdd934e069
+DIST genpatches-5.18-17.extras.tar.xz 3924 BLAKE2B 4d8bb90dc2446493cee33f5db27f46f4a5d6cb60dac8137f5677a133d71bf2feb5db6b9ebbf32fb148c39be3024f5f378ce096fb0c21ea584d3dca01862e160f SHA512 b1ccb518b25c7bea5cccbdec03d0d8d42ab0b048f6f10f2f036871699d5e75e3694ec10922a0e8f01f640cb3710d8e38124e878450842cce060f6202359ca090
 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
@@ -88,6 +90,10 @@ DIST gentoo-kernel-5.18.12-1.amd64.xpak 71608634 BLAKE2B 07608f0a3b180daf22bded3
 DIST gentoo-kernel-5.18.12-1.arm64.xpak 65242027 BLAKE2B 25e9b47341de15fdc4ff38c7c4b2bc4fcb3e5d6d50382feff3881e5ad8fd35c415174f3b4f30e4550d3474e5129eb8e5bffcb5fcd54022e4bd1cb15112c50d97 SHA512 5ba26d2cbc66644518cdf136a6fa2aa6f6f073e9456e5fec658458144f4cb09613164bea44df8cf2e73f75dcb4b7187f278af0022865ff48c2be4e24f6e987c8
 DIST gentoo-kernel-5.18.12-1.ppc64le.xpak 59511019 BLAKE2B 2340d0b8380d393dfb6aa85a5e5d363aae241a322ee381180989dd50d0d35731183d8360cf4f47c67a60480770d5eaa58cfdec745db14ba0cbde51e55300b195 SHA512 a8221197b1dc30768cb4e7e20ad835fb740b3f268c9bff5c21bd590a05f619cbe0b4552eef6c2735ab939dfa18d81473fad9c0606196b6c77f532ea77f4e8e5a
 DIST gentoo-kernel-5.18.12-1.x86.xpak 61804331 BLAKE2B 69ef17551948afa8114723a08320b9aac97fd319acb2255ec5f807dc82d88530fd26172494eb62d2a5c8d91001918f6fc16344b25374bbc1d69ff3599add5b8d SHA512 55dcd4c2957f91112c6685362fe10ba8fcef909f293364aaa8751e62e24c3b01f773ef6c6e42c40d710443f07863bb69c60a8a96652fc33b704bdd167ad8d76e
+DIST gentoo-kernel-5.18.13-1.amd64.xpak 71622918 BLAKE2B c12712d7ea1a034f7494e2b60a881bc3f4dde32eafa6a383c8c968298f400b29014bd799537d322a8abcea13cb5cef5d25f1ba949babb7472189dad6f82271cb SHA512 5a77e8e335944b13aeb7df2f9bb3307f887a642100661726b7fbcfef99be994596ca7f220b5943a27155b2de7550319527d31c58b271eb9b8617306b9834958c
+DIST gentoo-kernel-5.18.13-1.arm64.xpak 65232762 BLAKE2B 672430a5ab03cc97d204bff80b382a862ec32e5c3981bfcbc7de98bba31921c14aeb815e129ef813fd0d2bfb2fa562be630f46677757dd1b6135c055181f6ec0 SHA512 74d62035b30bb5c07b265b0bab3e5774fd9446e50592c1d624dbe9d260767c8c871c34a413b6394828439b28659df3679946f5ce1d21c6d344d8da58bc303f99
+DIST gentoo-kernel-5.18.13-1.ppc64le.xpak 59566380 BLAKE2B 12a388ccca82764fb7c31f9d8cdee4fba4d7caee4f84d7188b31204ea6bc4ab46e37422eed6726db2819f8d827aa60b51f1d09929ad014ef49dd70f58bf539d6 SHA512 74f2ab286295e2b635dac955177f370c0883ba85cd7affeb4c21f7e73b20ea44848c98c32b8cf90103d685f369d642c60f0429ba479fa65e9de7014feac2f84a
+DIST gentoo-kernel-5.18.13-1.x86.xpak 61827666 BLAKE2B 8e90d06d79a4d3c99dd5fde88c56e8e7f6591fe7172da4b4da823682e35bf31c8e5c4dd5b2be999179bc9ffd5ad79b6f0a864ba711e0b621ac4d42ae8723e813 SHA512 ae8aa75998c5746d47add6e19aa05a9c4ea4be664733debeccb35d37f36187b25bccefd6c987a77c3c66e2f7e2d27fe14dc8cee8542280c9250eb033debec499
 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
@@ -129,6 +135,7 @@ EBUILD gentoo-kernel-bin-5.15.56.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3ef
 EBUILD gentoo-kernel-bin-5.18.10.ebuild 3181 BLAKE2B 3d96b3ef0bb3f97f101823690955371ffb3f27246651b9faee643ea972b930e53706bf164d4560d3f5e485e060a40c2bdad46f59c0192076c5737f7851c93ec6 SHA512 2e245d442bb5baf2c731bb328aa1c089d4d4480066b38b198b8ac15dd11f73fc99ad85e9745f4fafcbf3d1c304e76f6209bb931c57fdb02c15a54cb7cc53624e
 EBUILD gentoo-kernel-bin-5.18.11.ebuild 3181 BLAKE2B 3d96b3ef0bb3f97f101823690955371ffb3f27246651b9faee643ea972b930e53706bf164d4560d3f5e485e060a40c2bdad46f59c0192076c5737f7851c93ec6 SHA512 2e245d442bb5baf2c731bb328aa1c089d4d4480066b38b198b8ac15dd11f73fc99ad85e9745f4fafcbf3d1c304e76f6209bb931c57fdb02c15a54cb7cc53624e
 EBUILD gentoo-kernel-bin-5.18.12.ebuild 3179 BLAKE2B d787a408e8c9582f64476f84236a8e8147e2b839207662431c61018a708630ae1515d7811b1136b98c5d1fcee1b395089087c9067af8d94ee7287b87b825eb12 SHA512 d00b78275c6cefe31d3c95520f456fc6fde1c8a43e7e3bffa1b52148727db514838103b00c357a340a1a194218f48cb793b33d5f920a99300fa82705c2c0706d
+EBUILD gentoo-kernel-bin-5.18.13.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 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.13.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.13.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.13.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index d8f42ba3112c..3e52adbaab13 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-5.18-14.base.tar.xz 610104 BLAKE2B 1bb79a0ab1239773023c353305c30
 DIST genpatches-5.18-14.extras.tar.xz 3928 BLAKE2B 6daca2ba0f7a1a2f318f3a398a37303bc9e1524bcb9cfb2713642eeafc86f1919f2e16789815780b78a391607d2f6fc34a84682f257360fbb3793e34aa56c84a SHA512 58e6fe384be03255599468c196b89e8f3f266f113a6b7f623494937205892d5f7dd301361ead1569790f05c4bf0a6f3813b4511a11cc77294dfc2d2e69590140
 DIST genpatches-5.18-15.base.tar.xz 610660 BLAKE2B d3a1d9a432ffc110af26d74e96b042abb28a79f77d3b6984c20c5a880e29f05c372a9d499646915eabb71a51441734067b0e271a13d111f15c65f6efdca79a40 SHA512 53856c12e3c10733f6ae78e6408af7d628aca7dac8fce5569eed5b3f35ce58bd465d5e40da2183fd06ce70775c199b93f88f73324c68f73c7303d2bc7c71acfa
 DIST genpatches-5.18-15.extras.tar.xz 3928 BLAKE2B da2016d84154d129ef32595c04f06f861aa91c7981f9122e8120284a04ac0064785ebb2a4717d544c475f63388e36aa2d2012dc426a9a8f9f66492a507e1755c SHA512 743610e02ce92f053bf41351253d27966de5c3dc0a5499e00328debb2d64f7bb41d29dc5670f11e63dbe2e8baf466a7b99fd2b70ba37a7698f53b25044790196
+DIST genpatches-5.18-17.base.tar.xz 670556 BLAKE2B 9f992048a0a964e6a96b077682d6a8412c2f35a15c3b5533c36d474cc724fb9983205fa8f177a9172f5f0c1e26b6127edac3da89b702dc088d3b7bcb24513822 SHA512 d8f38eeebc11f382e0c57f668f213d07f5d2f99c210133d831ee29feef90bfc81eb57c9c9fa173548ef4dba05865990539a879cf0bc1b548ca6a75bdd934e069
+DIST genpatches-5.18-17.extras.tar.xz 3924 BLAKE2B 4d8bb90dc2446493cee33f5db27f46f4a5d6cb60dac8137f5677a133d71bf2feb5db6b9ebbf32fb148c39be3024f5f378ce096fb0c21ea584d3dca01862e160f SHA512 b1ccb518b25c7bea5cccbdec03d0d8d42ab0b048f6f10f2f036871699d5e75e3694ec10922a0e8f01f640cb3710d8e38124e878450842cce060f6202359ca090
 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
@@ -71,6 +73,7 @@ EBUILD gentoo-kernel-5.15.56.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d
 EBUILD gentoo-kernel-5.18.10.ebuild 3859 BLAKE2B 39a5bf5ba05e8966d0c154ca944547d1d0fcaa320c278de676259385b59da46c41dad6cfb5a4d384e70283668a6bb8c89e297b55117ac479a307f02ddeff351c SHA512 98446575d30ca3131c36c2642cd14ce6a8e0b4053ad94da0e6cec93c82f92add00ef0c34fc18800643347c9ecbc9830ba6103485f43e991cbd4460ad37f9caa9
 EBUILD gentoo-kernel-5.18.11.ebuild 3859 BLAKE2B 39a5bf5ba05e8966d0c154ca944547d1d0fcaa320c278de676259385b59da46c41dad6cfb5a4d384e70283668a6bb8c89e297b55117ac479a307f02ddeff351c SHA512 98446575d30ca3131c36c2642cd14ce6a8e0b4053ad94da0e6cec93c82f92add00ef0c34fc18800643347c9ecbc9830ba6103485f43e991cbd4460ad37f9caa9
 EBUILD gentoo-kernel-5.18.12.ebuild 3857 BLAKE2B 0dee6d23887d04b56e4f6228ca833ee0cc87bfa66038ec7c36ee6874a066cd53322d92d0e12715d92843eb37e40bb71da53ee068c70af45bb3d0465d5036a71c SHA512 49bd98f3c1c0d1ad11d6156e59ccb757df9ab31c81d871efa8dc0e59a1f14e726729cd773a27b30237aa14eb0b364d5325a4818f0a8dd418eb9849e939da42b9
+EBUILD gentoo-kernel-5.18.13.ebuild 3859 BLAKE2B 7d5e5654d596002eec8478b6f72c3e2b8896acdf1f691f3d329e030b031fc8d2fb46434ec039dea09f1def77086663df6710e5690c0318bc15d8028321d21271 SHA512 3af374c1492526da624dd26511c01d401750fa59a8184f978b8ae28c564644faeb91ce8652f2baffe40a8c8f7d9c59b2a269b8c36ee3636f61f8a9d70093f2da
 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.13.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.13.ebuild
new file mode 100644
index 000000000000..14b88df81780
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.13.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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/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 59110c1bdd6d..750ac43035ef 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -41,6 +41,8 @@ DIST linux-5.18.11.tar.sign 991 BLAKE2B 9132a1d3cd6c72930518136df59dbb0a88831921
 DIST linux-5.18.11.tar.xz 129829072 BLAKE2B c13c12fee97349ff8a95219942857c83c4767f4dbca0286c2b2f366a323d05c1967e7557a9cbb6fe39045fcda48aeadb6dfee97a1340928b09873f35272f6a45 SHA512 a60109ba386825cba6184942281c2e055d1dd836408138e7052feb385b15be00d8ed27784754ded2ba2210045f828f3c14a8c6e1e6836e7c1d6119e598027116
 DIST linux-5.18.12.tar.sign 991 BLAKE2B 8fcdbdd14f841aa43856b2b9f52714411ca7eab5635301614136a93e1c3c1828a54f44fa2368eb9acb4594d73e30ca6732aca2eb853a9886fe2862ccc82c6df0 SHA512 165491156d9e18788bff4a3bcaeeeb455cf64381ed7a27fbd776c33d18d8b3e17dd977c3126eb72f2fdad2a1f1d382654ad45c32c8c99f175912d643949509b9
 DIST linux-5.18.12.tar.xz 129857044 BLAKE2B 000df730f6651173292a43745edd615b501d959f4d963a11df600a6bcb378db0750023c9025c8d63091658d7540693cc0e486f3bae3b49610135ca34f0b8edd4 SHA512 d414299f5d7286c2fad903e54375dafe08a63110ae4c758138e11b71b2269effa9d8247711c17858eda73a9a389ee7fa66736b0fd93e8ef4fa8f8d2fd7017623
+DIST linux-5.18.13.tar.sign 991 BLAKE2B 24d2de0e73e9cd235f58f2ae4c7008cb6d5868f55c62ca7901bcc1aa692fbb336df730e212910d6bd76d2e8e98c59ce4a5793a26968ea162cae3bfdef02737aa SHA512 b547e241db4a68c946cb23ad1b30446d12298422525b5b96d533c9d62157c48e7933f5aa646b80d25f22f2a1f0313b1075fd51ac37005c381f8878c9bb5f917c
+DIST linux-5.18.13.tar.xz 129828032 BLAKE2B bd365ff9a669ff17aeb06a9e227b1d2adfeb65e59c31edc78fa44f4522c9943071aea3f62058cf0f68d509f6d847ff98a469793f107a92ad069d5c6b81f13594 SHA512 f78eacc594db7f27941b0ddf5d4995890f7372ee3bd7ad377c29d263f1e61e5b73c43f7350eb26b0de746204f79e64d08f7622c1441ad98984458ea4d668e13d
 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
@@ -66,6 +68,7 @@ EBUILD vanilla-kernel-5.15.56.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b845
 EBUILD vanilla-kernel-5.18.10.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.11.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.12.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
+EBUILD vanilla-kernel-5.18.13.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.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.13.ebuild
new file mode 100644
index 000000000000..facbe03b0e1b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.13.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[@]}"
+}