gentoo auto-resync : 01:01:2023 - 02:21:02

4 files changed, 414 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 86a4efe7c365..a520473066ac 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,12 +2,18 @@ DIST genpatches-5.10-170.base.tar.xz 4506932 BLAKE2B 9503a369d1d653fc08e0c244389
 DIST genpatches-5.10-170.extras.tar.xz 3868 BLAKE2B fcba4ddac271a957a8f2645fc833338bd2da71ded4cb935bf1f2df267f50fdf1bab0e2bb0967a3cae975bc7cfaeae932261ae0aab4bcad40b32546ff69850c41 SHA512 bb272928563d33ddf9a90db610ed013f625121f8a05cf497c14dfb74052300cae361474e71203be35949ace7aa9bdc23e98f2dedfe3eef885a59674a90166c6e
 DIST genpatches-5.15-89.base.tar.xz 3552056 BLAKE2B 2131869a216e9e99fe893e502e9dff10ef486fcbd0a130db2621ecbc61194d4f224745d146213edf35083752de89624346eb7fcd7c2fb53f414d3ddc200b5b51 SHA512 ac840d8ea832f5a388ace30cc435501112992a16834dfd01bef764683b415405b1f9fa644062c8ca3ecb18739e55133f2282281436847d9ceae8fd6104dc583e
 DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd8d22be0c3e570dab6d45a7e6a0015227a1b4cd468582bebe3ebc7f47600d3ad30a5853dc2398e39ae02352a1b5df1faea36 SHA512 b4ce39a33610e5ff1c3309f787dddca702e55d81b19dbfb9300386a246e758ca9192eb98189ed01ba138d38947fa35e27dc6d3b459da059807bee93289845879
+DIST genpatches-5.15-90.base.tar.xz 3757428 BLAKE2B 30e129e5362a5fd690d8273a36e102510e113415e3241f838b366c2e35dbf1b95fa30d6e34e6e36c5d938855aefcc66a039f1242ea8a69263fdbaf84c46434c4 SHA512 bca6d1252657ad611a71ed2ea128887b131f9dad83f4c0007573b2637fd79b117023d0ade5b833070a8c86ab4f698d0b3250e01b612a0b65515a164fdc9d1212
+DIST genpatches-5.15-90.extras.tar.xz 3932 BLAKE2B e84edd591a94f2d21593f86aa7ed2a27980e099b388f49e899655dd687d459be87491c6441b73a5c024c43bb81f74103ef226d3bc3ae42d089749db0b06ccf45 SHA512 687240f034abd1e91d85e057bae2693129ef6fc4b6119c71df00c306ae2d1cc64ea294a76ce8017b7f2b0ac557c41b9ac70d4fb466ca2899a3c544490421df45
 DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567 SHA512 45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4
 DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44 SHA512 16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473
 DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775
 DIST genpatches-6.0-15.extras.tar.xz 3804 BLAKE2B 84856863ba0897a7ac9238094fec3d46a39cfed7db81d1021b236fcf0bbd4bd893ba44af4ddcc9ae955ab66424afd70ead4fa714a1b68e11d7e66539f94a6cf5 SHA512 7e49da632e9bf5a78c80a0817708e571452f92a99fa91daca8495282fd0ed955bb16a5fb57ebbfff68e9fe6733655c4d04967c6931d1acf6dc6102a44bd9b04f
+DIST genpatches-6.0-16.base.tar.xz 995192 BLAKE2B 17cfba17971fadc2e389f14e4787604489f8a30760f3687df364d053999819dfbe63264eaff4b04bf7df00d66278e6d56d856e09a043407e282bbcb2fbce4c7d SHA512 fc199b59ee9392693147cdfcd11d26cacc5ae5b4a76a3734f32e2b86a027e0d13a4ad5927ab06d333b7ec89f1983acacd876c272cb48e6555e1b067b0c7ae63d
+DIST genpatches-6.0-16.extras.tar.xz 3804 BLAKE2B e03fc44e706291fe586f115e0cf58c78fea7f259a02cbc05cd9bd44166de7f329c538e00a86ca9151cdcad66f029f52266816199743fcf176e0e0295c785a833 SHA512 06ad99c99c6b130e6b6aca4918ffdd693b04830ec475a397f697e70ed2356c43a177a67ef46141d28fdc7ade2eb9941f24402c82304340b000f28831f4ea83e2
 DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05de48739400f66253fd277167144ae0c259579e539d43ce65d2ee206a2820ec2ef288d9296c68a4dbd674c43d378102b9 SHA512 e349b8b535e8ab9f70cd01c513480cf75bd10dd2f2d5ef15f97734ecc9e481f137dc1cfa4c50f8a1a2f3549bf0142f83f7224603f881e66af130cbe1f8023496
 DIST genpatches-6.1-2.extras.tar.xz 3808 BLAKE2B 70f549904446897e8f955146dba039b43681e03e0d72049e35473ac6ff5d05a1a72c124d410fdfe065d5652c0f0312c6eb4907afbb475e3cd9828c3f0edb6fa2 SHA512 9f92c3b899a8b106649003acccd33cb3cfaf9838ec421998d3b587893b2e6705068fdc0ff7b52ae78203dc793b6064742b721e68bb1e8d7160c48b419062448a
+DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c98420c15160c7c9073b3107efc2779aceca0bea1643be6c06d5d1ea15558cf53676d25921013bd437027090be4acb85228 SHA512 5873cfa3f67a8118d92b141406298760b54c8b3625081c5dae79fe0c07e3eae20474cbc85601e871a6bdb5b3ed2f70e16e1939d8e4af67db7598af845853f0f1
+DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef SHA512 17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
@@ -37,7 +43,10 @@ DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 EBUILD gentoo-kernel-5.10.161.ebuild 3596 BLAKE2B 862e8da83e0e335ac202ea0d0d4107062b203ed4d6e1f438a8cb860649dba325082935cea6f4d08f92648cd206d67f13600ed24f7849f10dbadd1457a2f69ccc SHA512 b7d09fe2b0b1a46916bbd61f613e1da08ad7a12f48e0c0b408850224e58c07382e23cd964d31f33a89541a56be4a21543fecc86cca065dca0f60f21235a6b90f
 EBUILD gentoo-kernel-5.15.85.ebuild 3593 BLAKE2B ca333666fe35d2df100f147f640f88ac514169bf66560f5f13640de7415899756eb7ed172a577742dde903ec1530788411fbdade882eb495a3f83dbbc61a6bf2 SHA512 12d96643b5e0f1b99535fc4de43475b85ce7533d0034bf12df653e49570262ba9df8cb82ff71ac4b99ad927e0dd1c3ab408319f25bc194313cc766f7ce6bf6b5
+EBUILD gentoo-kernel-5.15.86.ebuild 3599 BLAKE2B ce2f332e14d6420a0ce635a8f1ea29788e46f385b7aef0fd7f86b2358c66574ea9e713927df98ae3e95b37ef0cf321cc4325bd1e8ad3a0da128d8942097286c9 SHA512 bc805c80743ad1ce74a09910c234e3ceddd6ff333eafc0babc7ff9ac7ba44ddc09d2c9e108a74b3223e6677eb77f91fe832b58f25e82a204a4adf8cc85517dec
 EBUILD gentoo-kernel-5.4.228.ebuild 2797 BLAKE2B bf6bb6f68e1a7458389c1a488dea8c8b5528eeacbfcba30371278eaa40961aa74fffeba292d8ee806e8c8f6057f2debc61010e3b32cbcfddfd515d8dc68da8ef SHA512 e1674ab6bd781577b805e1494dbeb43fc6b36c36e7605ba172f4324330488e7c6e81c6dac8080ba54f1b17705d02e23e895f3e34e2ca5d69b89d5b440906445e
 EBUILD gentoo-kernel-6.0.15.ebuild 3856 BLAKE2B 48a2e0b820e22cf8e12dd4b4b7ebb454c414f5077c6f9d5df417dacd915309ebb88becb225abd84fd2141e8b72435ad8411b1bb4766a97727073345abf94e860 SHA512 05e23e285445816dd8e23d5879f6a51e5640af55fac1d38129ac6dcad290b96b179fadc8e87a170d8c2a54969ec3ce05544607048a579604aa0d74b4589f93da
+EBUILD gentoo-kernel-6.0.16.ebuild 3858 BLAKE2B 6431c930908b4ee1ac63c6a792a9f227122ca5822d4cfa76825c6b2b0ce2e22daabf3e29d885ab5cc0cd8cd56f49df82fe20fcb0bd38ca274ddcedadf5420db5 SHA512 edda364adf40995b1ba2ac3b158aba4216e859ec1d09ed0d593092d3d4986f06ee3bd3f13356a0397ce0bef555b494e6202bed857f3be03d65039e330f3e6277
 EBUILD gentoo-kernel-6.1.1.ebuild 3856 BLAKE2B 053fbd428449390254dffbd2daee8feb629267ad2574ba50d5175e0ff47ab9397177d4cf6dca52d5d0ee64566d893b40856e79c9458905473e7cd9c49b8dcd9a SHA512 6bcd472d946d50755f9a36b837f3eb66e2298a0bceb90cd2e07a5dfdeb53a45620d5de10dfa1147931cec3b471b91b9132efcf01691cd6e2d56d2e48b494280c
+EBUILD gentoo-kernel-6.1.2.ebuild 3858 BLAKE2B 6677b42cca4a9bac82aa3a79b1941a030bc4a87127ddc163fdb7c466f4fac1908de8ed29f9fdc6a514bcb8501a76b02d15401b99a3f384dc678df8254b257ff8 SHA512 0c442183148d7476d937eef32d3a73f4e30d6deb21848676482c658c9d7e4fe7f7fe2bd4d0806becce56984a7eac8b44a3b11271a75e5ef68cb5299cd85a44a1
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.86.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.86.ebuild
new file mode 100644
index 000000000000..4ea02f952baa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.86.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16.ebuild
new file mode 100644
index 000000000000..8dad214e738b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.0.8-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2.ebuild
new file mode 100644
index 000000000000..9b9df2d2f7d4
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.0-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}