gentoo auto-resync : 10:05:2023 - 05:42:48

7 files changed, 427 insertions, 0 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 80480cb4001a..f3487008997d 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 8e300f0a1c9a..302551584685 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.2-15.base.tar.xz 763032 BLAKE2B b933b63ddc6d19f47ba58d5a5884ff
 DIST genpatches-6.2-15.extras.tar.xz 3808 BLAKE2B 6134125180afd914169eb329f5d9ec8f3f9fbd3ff61a0266200defdae573a62b39ba557c2a815229344ac762786715a6193ce3cb9c3ed08d07a87d83427ab107 SHA512 857e513619ab77e79461a337c02e9fa9fbb63ee9a837eef438b1e5af3c8c856867c738b0b28f21a8035a5e1b963eb8c13507223ad6a251f5320da67aeaeb595d
 DIST genpatches-6.2-16.base.tar.xz 768864 BLAKE2B e852e0feb635be67bbf0da77ca6c946abb4fdad1b7b6a6e72c350b7705c4c1edeaa152f8b5ab70e4089bec80de805dc4a506ca60f74f53d3572b3ad0214bcec8 SHA512 2ea683e51835696d825977f65d93b9c25259f59499669bbddbfadc1573e6510b46e916c4e4922d5c62bd64ecda992615fbdb076f5c50648debfe2f9f05e1974f
 DIST genpatches-6.2-16.extras.tar.xz 3812 BLAKE2B ffc7e5852ee193ff8bf364ae77394e10c0d9cf8f21ec4f9886d87803be3f6152e632990be009b68f3910ba3e95d7c2bd30c37d6cbf5c49cccf497dffd12f62a5 SHA512 b17df7f12e2c50bfaab0a0a865e1a7687f058e6b4d6fdcd1b107c690e6869e8ad5c127a51ea64b55ce3dc57d74da05fa075f9d99fb3f0b24dbe6dee5d7fb4402
+DIST genpatches-6.3-2.base.tar.xz 8036 BLAKE2B 754d46f15ab113a1bae41d154b47c4cde2a93df9dbc4333b93e7d3abc424ef19dca2993c25705020096ab9d500f794a852c4cff68f29907e7667edbec7503ff6 SHA512 45eb038e9118a2feff7625cefc7bbb96ef4fd8fa29fce118943dbd0685075fbf9c525202879abf6308d7e80e94b8e9704799e3c863105add026c86b97314d580
+DIST genpatches-6.3-2.extras.tar.xz 3808 BLAKE2B 6eccde5d3591804ef50d800dc7ec4cb8b2192d805832cde3496c519bf4ff0f9eef62a76f1e77677df66a054ed1f1efe341f71b8f86b185b10145de8200bc2c70 SHA512 8d79b8c2eed3c962a4c8fda80934720a2ee1436d4e42d762d3f945972537491f415aa6b3615f7a81a727bbb239cd0277ecfb18c83a90ba57252674bf135b35f8
 DIST gentoo-kernel-5.10.177-1.amd64.gpkg.tar 66334720 BLAKE2B 87d02bab9e9d14388e984b3a712e00b85ae14ee57040acbd9948f64173166337e2939a73cb787d172365fd4f6ebc42677cf3fa52b33f7017549d7de373301527 SHA512 f77551f0df9d37befee7f310f05f5e221cab19fe29b21d788c515a4cf55071456d00f232115525e541b94f9a0ce6713f5c764ab49119333d337a043888d61e85
 DIST gentoo-kernel-5.10.177-1.arm64.gpkg.tar 59361280 BLAKE2B ab78f801631243a1767abfb1e950206e72d030438bc9d6434900c5795686f9cc9cd7c804bd85153126f4206f2e1b3774f8288b1419d561492c210b030dca5ff4 SHA512 83434e8b1d6050e48967abe37e923e16a8111c0ed30773d016b80d34ff6caf52c27e10af9598e653d823a2f89e73a04c7f675ae027c248543cff72f87be04fc4
 DIST gentoo-kernel-5.10.177-1.ppc64le.gpkg.tar 54917120 BLAKE2B 5a86c6beacd641530e3d1d36b8730ee8c223f9d537922b6cfaf32629bb8ef85074d456536a2f861381398731dba633255372957bf6f79951f4c919f0c160c773 SHA512 b9f69167a9d9a74fde75eebf7d645fde1092ef785441ac6b57eaa37fbda9351e8a2e02b1659cf32d08c057f97ee7ca9865c57f014fd2b1e5ecadbdce912edec4
@@ -76,11 +78,16 @@ DIST gentoo-kernel-6.2.14-1.amd64.gpkg.tar 82647040 BLAKE2B c895ead21704cdd0d2f2
 DIST gentoo-kernel-6.2.14-1.arm64.gpkg.tar 71802880 BLAKE2B bd9f6c0368ca04f3a7512c4678b1d567bb4f7de336dc631639cd3c256b692464d48e1492911c231d907d189f71fff225d0710b1cbb3cccc5ba1104127c7027e0 SHA512 035ea2e7f7309b1080c58b5490c13bc6908df1ec8f01a286bdea83e15dcfe5f9ce36cb9664e3cf37dbbbd056b85621bda1c42f8ffd91ff77c4d56c392e02d0b8
 DIST gentoo-kernel-6.2.14-1.ppc64le.gpkg.tar 63928320 BLAKE2B 8287654a4864994f70124132669cb9eda0cc8397150a44950b9ffe0241af535cd8d7556af67b07b6129e62a567be9678220ed34aadb09f2a9678af536604fa1d SHA512 c3dbaef15e020deee482b696a183da22bd1de2ccb4eb27e8fc5b40b3c49d8e5e0a76b3478e75aea064c84cb03823f05d12360682b59f30fc4db66b2a1801763d
 DIST gentoo-kernel-6.2.14-1.x86.gpkg.tar 66519040 BLAKE2B 68dbd8c39de89dd97e8d29774df725cee0d67b74ce4d3c0860e0d7bbfb6564a7ade3a7b3ffecb079b9edb04b6b59ec8a22b668c86826ee64332e204a084abab4 SHA512 8a6b84ac77da67ec74de1a5c95e604d05298beeacf526ce23991c96ae3eeb13714d268d8ece6ee4979967310ebaa8773281c181d1af22cabab87cb6fac0e7549
+DIST gentoo-kernel-6.3.1-1.amd64.gpkg.tar 83415040 BLAKE2B 25b01c8ce51ae47c9ac32c8eb42b1ba78ed0c889ccc5538f3da96db671b5e4cafac133fb23fec7c2b315e1c5306d68c6c1072189cc6889cd1774ab7ab7a2a241 SHA512 f01cafdc3946fb6583d2412892498320a5ce896cbf3f27d1138de6698478522a68edde3610b22f4b8126ac0907d4cf63f602e71643ed06f8a87ddcc894eeefa8
+DIST gentoo-kernel-6.3.1-1.arm64.gpkg.tar 72376320 BLAKE2B 7bcbf05310a57d5d8417b13f94031f6876aa37108c8077a97c6d9e6ef67bc5052527319c0bdb9d470eaf398e6ba719079a8b4a121f900355343366c7ed749d4c SHA512 12ad556ed9b52774485de2e0a625a2fe3557425ad8c3971eb0988ac85ae17cbe4ab1bce5e8360cd28b12bf731edc1f6c8c60fffa86240fb45adc9ac8a7f12341
+DIST gentoo-kernel-6.3.1-1.ppc64le.gpkg.tar 64256000 BLAKE2B 4c094238f14f221fd42598b6dde1486e07f0998b51d834428ec294aa027d04e8f9dedf6c5d9129a12bf361ea4f009f5271b8bf542575e5dbc056d14eec4752cd SHA512 33ab3fc05bec10552e58796efaf63ae507af546b6edee2ec6111eca564aba71be1de00a1427386f0102b0cbe10b44e35ec8a2bc44f1d0a799bec7fcc2d85c695
+DIST gentoo-kernel-6.3.1-1.x86.gpkg.tar 67010560 BLAKE2B f3303c11d75dde5dbbd1d085845797a204ce72b00531befea8da2dc0a9aef38f30479d4a76108459e3de76b9af2f7e5cbc850959eb9fa242773aa1549d4c1b08 SHA512 ac74af18e7a687571154b6b9e7597902106fae65a3f1a4c1d56cc2ffbc6e93812756717040e698dce0fd3a39c82a656ef958347af985c74c6505cd5bb0577129
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
+DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 EBUILD gentoo-kernel-bin-5.10.177.ebuild 3024 BLAKE2B 5c9a656c167dbe2af9c96a69319075b0583d84c9b552b5be2d67de160375a3fc7abfaf75b71e893a01b7b403b7501d5f128aa63392582156af5ff4cb70643c5a SHA512 e400bea4b00533a52321fb68dc8960238c48dee0a60041cee59c6ddb03b12b45808f2cab06360b4bd2113bf83db9642145db315424b7192b0caf136fdab24eca
 EBUILD gentoo-kernel-bin-5.10.179.ebuild 3028 BLAKE2B f09e5f0570fd0166abc54b10b93433d1068d4f3a4713cfb6857697532f30b6e2a1df8d4afd66eaa665f4bd2023205334900392f020c62b0574c87a119479bc1a SHA512 e6a6510263e9cf194b9336e26cade4b76f190e1765b7000be003203f4e23fd2b2d64b645e37c0c69a35ba93c3a2e9c5e6f6b9d14eedc1b506b3b68debcf95911
 EBUILD gentoo-kernel-bin-5.15.107.ebuild 3024 BLAKE2B 999b56ddd10be1eaa056b5512c6fe05f17a9e8f6aa73e9d21d4c4e83e5544d3b410fce745805b970ca6f5e5d3f437f7b259360626d0d45990f3132cd142b7a08 SHA512 c76e3fb597b62966b6758f73b85328bb7433ebc53621efd5545c9befc2fa8623e11286c09dd21e7aa551d1106ee5eede2a55f2c33fa264637c84b7fa9a9c64db
@@ -94,4 +101,5 @@ EBUILD gentoo-kernel-bin-6.1.26.ebuild 3028 BLAKE2B c8314539c6ea447c8645bc304bfc
 EBUILD gentoo-kernel-bin-6.1.27.ebuild 3028 BLAKE2B c8314539c6ea447c8645bc304bfcf6cfa99398ad38f6106dc2fa6c9a9a759ccd288646b95f77a2e9a3e9ec2ab045ffd1544a70d9060096a0e04a91ecff46ad42 SHA512 22fbd6a7597f0a6b489e6e6cace828fa7df95cbffe48a6c79b7a4d568c2e79f7ffa7d8bc717fa2746015b0e4da295f446c6d7f20bc679fadf7d9ee6574921e2d
 EBUILD gentoo-kernel-bin-6.2.13.ebuild 3028 BLAKE2B f1a8609dc0df691418f250273a84d7d645ed2c84f3ec70d4bdf494938b2305053949c31dc1ca1020d602de2ecc66a5bf0a231205ecd5c1fc500d80577cab7071 SHA512 c01314ba4cdad6a38de547bf178cd75d2c3cd5b8ee732bf60facda3d1ebdfef371fc1bea1603111fc96e36426996ff247150751f6a23f67dc1eaa688910f2f56
 EBUILD gentoo-kernel-bin-6.2.14.ebuild 3028 BLAKE2B f1a8609dc0df691418f250273a84d7d645ed2c84f3ec70d4bdf494938b2305053949c31dc1ca1020d602de2ecc66a5bf0a231205ecd5c1fc500d80577cab7071 SHA512 c01314ba4cdad6a38de547bf178cd75d2c3cd5b8ee732bf60facda3d1ebdfef371fc1bea1603111fc96e36426996ff247150751f6a23f67dc1eaa688910f2f56
+EBUILD gentoo-kernel-bin-6.3.1.ebuild 3028 BLAKE2B 4bb3f46f40739c0304029ff6c4ccfdf255a4a8e247bef77c76e7d8bb57458e35ac2b2dddd1ebddbc189b1ce6402b97481c1e71e53337795b95de6700b1c1c1a7 SHA512 2bc1fd4438671d444003d3447618ae56c0efda7b2d82df6961cf48776d5c69ba39f4ffa83e6c0a818d7418291049cbf282a41d8c35de8fd7beff6c935c322bd6
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.1.ebuild
new file mode 100644
index 000000000000..37a5c18539e9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+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}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+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
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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 "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/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 04d67bc91aec..1eaa34392664 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -22,32 +22,39 @@ DIST genpatches-6.2-15.base.tar.xz 763032 BLAKE2B b933b63ddc6d19f47ba58d5a5884ff
 DIST genpatches-6.2-15.extras.tar.xz 3808 BLAKE2B 6134125180afd914169eb329f5d9ec8f3f9fbd3ff61a0266200defdae573a62b39ba557c2a815229344ac762786715a6193ce3cb9c3ed08d07a87d83427ab107 SHA512 857e513619ab77e79461a337c02e9fa9fbb63ee9a837eef438b1e5af3c8c856867c738b0b28f21a8035a5e1b963eb8c13507223ad6a251f5320da67aeaeb595d
 DIST genpatches-6.2-16.base.tar.xz 768864 BLAKE2B e852e0feb635be67bbf0da77ca6c946abb4fdad1b7b6a6e72c350b7705c4c1edeaa152f8b5ab70e4089bec80de805dc4a506ca60f74f53d3572b3ad0214bcec8 SHA512 2ea683e51835696d825977f65d93b9c25259f59499669bbddbfadc1573e6510b46e916c4e4922d5c62bd64ecda992615fbdb076f5c50648debfe2f9f05e1974f
 DIST genpatches-6.2-16.extras.tar.xz 3812 BLAKE2B ffc7e5852ee193ff8bf364ae77394e10c0d9cf8f21ec4f9886d87803be3f6152e632990be009b68f3910ba3e95d7c2bd30c37d6cbf5c49cccf497dffd12f62a5 SHA512 b17df7f12e2c50bfaab0a0a865e1a7687f058e6b4d6fdcd1b107c690e6869e8ad5c127a51ea64b55ce3dc57d74da05fa075f9d99fb3f0b24dbe6dee5d7fb4402
+DIST genpatches-6.3-2.base.tar.xz 8036 BLAKE2B 754d46f15ab113a1bae41d154b47c4cde2a93df9dbc4333b93e7d3abc424ef19dca2993c25705020096ab9d500f794a852c4cff68f29907e7667edbec7503ff6 SHA512 45eb038e9118a2feff7625cefc7bbb96ef4fd8fa29fce118943dbd0685075fbf9c525202879abf6308d7e80e94b8e9704799e3c863105add026c86b97314d580
+DIST genpatches-6.3-2.extras.tar.xz 3808 BLAKE2B 6eccde5d3591804ef50d800dc7ec4cb8b2192d805832cde3496c519bf4ff0f9eef62a76f1e77677df66a054ed1f1efe341f71b8f86b185b10145de8200bc2c70 SHA512 8d79b8c2eed3c962a4c8fda80934720a2ee1436d4e42d762d3f945972537491f415aa6b3615f7a81a727bbb239cd0277ecfb18c83a90ba57252674bf135b35f8
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.2.6-gentoo 255386 BLAKE2B ecae61e292a9491cadb63a7709c790d25cd74baf4ba8a2b6259105e40e3b6d19a786e032a7f2630c9d6167e1d41a1e42de723a93982aa0087742b40ef29e09aa SHA512 676752fce91f936b12eb079c0d9ebec52ac0b7c1ea2862311faccba83057d64ab8184e30c7d1839c951ba562aea2d5c9eb3f5d98eab87b780f8d15b3c4921e6f
+DIST kernel-aarch64-fedora.config.6.3.1-gentoo 258017 BLAKE2B 01b1d79b95d084941ab5337e7930ae4cbbf07749e2db303794575c1e2436b60003722ec87d09b045c8731cdb850a6ac059081d08dbc8dfe2271ad23169052055 SHA512 6bf350dc7d7ef329a3c073c9156eb03f8ef42f14d85942340f50a04eb86d354fbdb4e959fb81af1a7ee9626e041e89a3c89aec0200c60601d92335846c22e752
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.6.1.7-gentoo 228053 BLAKE2B 1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b SHA512 1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
 DIST kernel-i686-fedora.config.6.2.6-gentoo 229782 BLAKE2B 454a08b67638042004303e08b8106f46270dd73092fbc6da0251d84251e23dbbc6d608b95c48cde8d0d18ee7ecd202374e8295ebf884e616b307254728ad57e5 SHA512 950def3dbda61e6b35f32454e6230144e32cece797b78d9fd0a0afdb4a1c1a55e6f7c30ce3ad9bb5316ff6c95263711a2be6d6c69c5303d62a3cfdfeaf7da391
+DIST kernel-i686-fedora.config.6.3.1-gentoo 231336 BLAKE2B 67a63eb822a6a3a4b79a5d265bcc26711f757065428bc7513584ebfd8e8a7ed519aa19b00d2d161e4e15e4ad1ee08dfb1e30953a736db914ef31661bbabcb083 SHA512 b86718ea9163d1ad857419ae440d135b1c8d8e3ca4e37c5be245f68fd80d75806b03c327180456f47fdd323249c95a706b18f57551ccf787e3221859dcc51328
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.6.1.7-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.2.6-gentoo 220355 BLAKE2B 09646d6132365c5ade80db87953ce545213b8a88fcf4bd2efe2da42de77844f490bda18a0107087b28dcd57fece4332bea77cdbfbef9256c559f89327c784f09 SHA512 f6fbb4fb8cee616eebf3c18801cfab0cca0222e1ec91e10dc58e3ce44223de021811731be2d399ffa0e41f656670ddb1279517c0a3ec7cd5164c31226d8e0b7d
+DIST kernel-ppc64le-fedora.config.6.3.1-gentoo 221722 BLAKE2B 8ad6e1efe6f7d906dff1b8a8f27fbab140ec740586fcebd57061e4931b5db4ca88a035cec1184c57007cc2df4bf12584764e5d2f7e81b54523dc50d79850c358 SHA512 24108ed525d4120124fc3e1e3c1fa694b258be87b3a1daa89df4b4f0e587613eb91b460136fb1dc6287ea6befbc6acdea2a7f9eb930facda61e6e342174c05dd
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.2.6-gentoo 230455 BLAKE2B 5fe5cce9264480d2cb733bedcf060327e01fd6f1665d00ded7dc414d6439f94d5af8e01b46c36a8cd864f62033cc34cd4b3fb4f35d8316d07ab3d38d8ceb93f2 SHA512 c1962a824cf2a9d5f1c98c153beb5b29641c21e3462e59e42380eb9cbbfc3fb65129bfb1bced0f7f699e15bbaf1141f2ad4245b8f76f4fd662d779e7e0d452a2
+DIST kernel-x86_64-fedora.config.6.3.1-gentoo 232020 BLAKE2B 58ae6268d9571b7384bb2902d31402caeb35bc5185b2a9002a1aca1a50fc3caa4b6b113e748cc3c5a05cef7ec577a8f3ffe9dee5262a65ae2de06565e36be5a3 SHA512 7ed84e888e3c781a557bcd8fb62ca81d814604be2eb53f2bda7b29f28bce01e6821e7c31c4afa219b4a2c49588c81f3dda6cfb5b232eee86ac1e3549e67cbccb
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
+DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 EBUILD gentoo-kernel-5.10.177.ebuild 3659 BLAKE2B 81b15ff2680f53aeebff973baf4764216b3a914c90ac6224478bf97061b8cd636f91af8c4c0d07a1a42306d7b3f5e0553e9c8f92ce7cb74de5dc62a189aee71f SHA512 ed0a3f700b07fc89eed6bbf86884f203ceee2b822936ed39fe81203676fcb11ed7c37c43e8460956c923794fbe4ef32e56517c6fd76daaa1ed9b3647b00d5ece
 EBUILD gentoo-kernel-5.10.179.ebuild 3663 BLAKE2B ff1886edfded2e3912cbcf2bf03a91fb49e40c0ec756dc81ba3db92654fd7964f79280f8423bb13c34a941f8076ef0a18d1df7d9d3528fe93ee7a1e4e6da25f7 SHA512 01039d321cef56eba69e15313301646de36baae97b3562bda002205950aabe22c90c1145256d60dd458893f76616474f5cdd5a75b8b52d33a9c56bd76724fe76
 EBUILD gentoo-kernel-5.15.107.ebuild 3656 BLAKE2B 13b7a3cae43f584535dd213e2c592e4417c7cf238ed0387f36b658b7acd5b699c44d0fd8ce582bf6b8f93591c9a8383ba5b3537d92054e2ccff31aacdaa94d80 SHA512 a6f5db6abf9acd9a85c32c91357550399b621d6d97160dc61408624e00fa784412c4d2c5fb0ebeea06e9a22f03d208c4435fec0233a50f0798a4f13159808ccb
@@ -60,4 +67,5 @@ EBUILD gentoo-kernel-6.1.26.ebuild 3919 BLAKE2B 64c9b54b79a6af1830e09c699540230a
 EBUILD gentoo-kernel-6.1.27.ebuild 3919 BLAKE2B 64c9b54b79a6af1830e09c699540230a9592e6a0f1c1740616bb67558a21630ac9ab836cb15d0353f777523bf610e2f0c1c0e16955db7ee9343c85ddcb6100f8 SHA512 8bdf517026f34b3cc94e47a37a4624024a01482d51c734188ee06512b1ab9f4c7b1aced63df074956fe17c56f31290f802f9a8e0d435bd95df776866250494f9
 EBUILD gentoo-kernel-6.2.13.ebuild 3919 BLAKE2B cb715dc703a28905e5b51200455eeedcf9ff322e5cd2963485588c9ded95c5a11e1ebd0bec9cfb0ecf8b6e608e9f87ab6393e6abe458f695d382bfb6f244c9f5 SHA512 b5748a70552464cc6f1b724bf3a226f1f2ba661b33b87c8e382e9d54e3a94dba245aebafb7e52cc984c78beb56ef9c9c8359914970ae0873360aa29e2d13f016
 EBUILD gentoo-kernel-6.2.14.ebuild 3919 BLAKE2B cb715dc703a28905e5b51200455eeedcf9ff322e5cd2963485588c9ded95c5a11e1ebd0bec9cfb0ecf8b6e608e9f87ab6393e6abe458f695d382bfb6f244c9f5 SHA512 b5748a70552464cc6f1b724bf3a226f1f2ba661b33b87c8e382e9d54e3a94dba245aebafb7e52cc984c78beb56ef9c9c8359914970ae0873360aa29e2d13f016
+EBUILD gentoo-kernel-6.3.1.ebuild 3919 BLAKE2B 355eac8e044aa73cb9ecdccf0122fd721ed12223f8b555e9541d560ae52b2faab250fa3e40c931927fd88b6b21324cf877fefd72f85e05ebcd0ceaf0698f6d39 SHA512 e20d767e5eb2476a63b494e7263d9ad45a8882ce9027eabaf659cd9b4ab9581765a41c68d8a87f111ffd8dd3edc91516019450eac97cd4bddb88cd284d94f9bd
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.1.ebuild
new file mode 100644
index 000000000000..75e33b7ff8c1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 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.3.1-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 41b43de59e14..080ca40fd3dc 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -6,24 +6,28 @@ DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71
 DIST kernel-aarch64-fedora.config.5.19.13-gentoo 246842 BLAKE2B 4a824d02999749a0404437cae28721576511e06a5eaa9ebb1b1479c74e2b54402c440be7ea9159bf304661d4baaa5381c36b266ac0bba0b9bf3820eb04c6e4e0 SHA512 8862cf24b177ef3871f118712ceace2b496b04a488b045bbe3d83ab22942f064995486f5534630321faaa96ce60e5f237c4ded24a5468bea6e365aa3ea9f09c4
 DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.2.6-gentoo 255386 BLAKE2B ecae61e292a9491cadb63a7709c790d25cd74baf4ba8a2b6259105e40e3b6d19a786e032a7f2630c9d6167e1d41a1e42de723a93982aa0087742b40ef29e09aa SHA512 676752fce91f936b12eb079c0d9ebec52ac0b7c1ea2862311faccba83057d64ab8184e30c7d1839c951ba562aea2d5c9eb3f5d98eab87b780f8d15b3c4921e6f
+DIST kernel-aarch64-fedora.config.6.3.1-gentoo 258017 BLAKE2B 01b1d79b95d084941ab5337e7930ae4cbbf07749e2db303794575c1e2436b60003722ec87d09b045c8731cdb850a6ac059081d08dbc8dfe2271ad23169052055 SHA512 6bf350dc7d7ef329a3c073c9156eb03f8ef42f14d85942340f50a04eb86d354fbdb4e959fb81af1a7ee9626e041e89a3c89aec0200c60601d92335846c22e752
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.19.13-gentoo 223571 BLAKE2B d56f8e019b0c58023b08ee358a9af46679ca0f734c075ba6cd65dd6e3277640c0b7683e5707c48f687644d815a3840eb58351c0dee84fe9ec1dcea525fb2e1e8 SHA512 0d9fa0592b6a9414f2967677c048a9e014a0e0d43274eea4fe10f8099befae7389bbcd033f4fb36c7c44bd30c2fb197e860151e27c10dc354fe9a86a8bb65e94
 DIST kernel-i686-fedora.config.6.1.7-gentoo 228053 BLAKE2B 1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b SHA512 1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
 DIST kernel-i686-fedora.config.6.2.6-gentoo 229782 BLAKE2B 454a08b67638042004303e08b8106f46270dd73092fbc6da0251d84251e23dbbc6d608b95c48cde8d0d18ee7ecd202374e8295ebf884e616b307254728ad57e5 SHA512 950def3dbda61e6b35f32454e6230144e32cece797b78d9fd0a0afdb4a1c1a55e6f7c30ce3ad9bb5316ff6c95263711a2be6d6c69c5303d62a3cfdfeaf7da391
+DIST kernel-i686-fedora.config.6.3.1-gentoo 231336 BLAKE2B 67a63eb822a6a3a4b79a5d265bcc26711f757065428bc7513584ebfd8e8a7ed519aa19b00d2d161e4e15e4ad1ee08dfb1e30953a736db914ef31661bbabcb083 SHA512 b86718ea9163d1ad857419ae440d135b1c8d8e3ca4e37c5be245f68fd80d75806b03c327180456f47fdd323249c95a706b18f57551ccf787e3221859dcc51328
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.5.19.13-gentoo 213984 BLAKE2B 9abc1d2e03bb34908019dbbc4e54d3d176acddca6e7af72fe73461e60eb249486c4e8a81bfe2515849aa26939d9abef5e981deeaa55605b34bb59552cd3444fe SHA512 d857ce4178950a96ff029c3c9870211424e1c5e95dfef88d25d6d1d517493a6fd95d9d398f42b8a6cf72482b07789be38f674dd4a2b9855da57c8391b0c2708d
 DIST kernel-ppc64le-fedora.config.6.1.7-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.2.6-gentoo 220355 BLAKE2B 09646d6132365c5ade80db87953ce545213b8a88fcf4bd2efe2da42de77844f490bda18a0107087b28dcd57fece4332bea77cdbfbef9256c559f89327c784f09 SHA512 f6fbb4fb8cee616eebf3c18801cfab0cca0222e1ec91e10dc58e3ce44223de021811731be2d399ffa0e41f656670ddb1279517c0a3ec7cd5164c31226d8e0b7d
+DIST kernel-ppc64le-fedora.config.6.3.1-gentoo 221722 BLAKE2B 8ad6e1efe6f7d906dff1b8a8f27fbab140ec740586fcebd57061e4931b5db4ca88a035cec1184c57007cc2df4bf12584764e5d2f7e81b54523dc50d79850c358 SHA512 24108ed525d4120124fc3e1e3c1fa694b258be87b3a1daa89df4b4f0e587613eb91b460136fb1dc6287ea6befbc6acdea2a7f9eb930facda61e6e342174c05dd
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
 DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.2.6-gentoo 230455 BLAKE2B 5fe5cce9264480d2cb733bedcf060327e01fd6f1665d00ded7dc414d6439f94d5af8e01b46c36a8cd864f62033cc34cd4b3fb4f35d8316d07ab3d38d8ceb93f2 SHA512 c1962a824cf2a9d5f1c98c153beb5b29641c21e3462e59e42380eb9cbbfc3fb65129bfb1bced0f7f699e15bbaf1141f2ad4245b8f76f4fd662d779e7e0d452a2
+DIST kernel-x86_64-fedora.config.6.3.1-gentoo 232020 BLAKE2B 58ae6268d9571b7384bb2902d31402caeb35bc5185b2a9002a1aca1a50fc3caa4b6b113e748cc3c5a05cef7ec577a8f3ffe9dee5262a65ae2de06565e36be5a3 SHA512 7ed84e888e3c781a557bcd8fb62ca81d814604be2eb53f2bda7b29f28bce01e6821e7c31c4afa219b4a2c49588c81f3dda6cfb5b232eee86ac1e3549e67cbccb
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.177.tar.sign 993 BLAKE2B e692501352ad2ee680db8613b1c72cb76ce46a104c1ba9ce7f3ed8ade4ca755666c6c4724e73a7e8aa43d7978f1a15570024e181052397bee844b2ce63b4039d SHA512 af3d67dbff2337f5abddac24841b43d47cae05d8bea2281339da268b4cdeeb2c1bdcae0255ec00689322e93224f466bbb2295e7b461bd524f4ecde5d4e1aa15f
 DIST linux-5.10.177.tar.xz 120593728 BLAKE2B d69e74195bf594c25e9e5d450520ca1941a360fea009a4037021608cc8fa7c95a4e4ccb8a302762324b62da2b207842d30c67230eaac44b990b262640c08dfec SHA512 27d60975e63cb61b4df1ca4419f25d9339818ea69c4275ac8066139e705eedb93b49eb6b86b4d4b59c09cc5080c1d7e9f1f083f274d94bb99d2ccf61497a2991
@@ -49,6 +53,8 @@ DIST linux-6.2.13.tar.sign 989 BLAKE2B 9109ab0ebdd93de0906382f65c4ff7da00ebfb94c
 DIST linux-6.2.13.tar.xz 136481716 BLAKE2B 94d9032a12ff0f1df819d39ee411f6ba52f4dfafaa0c217f32f15b111f0e342561624de90492caceacf07e550f76fdccea3278e46c7c1b0468cf398569d81001 SHA512 fa44de0d4023595e36eed1e5af69a445a44fbe98c51a6f67ed53085d9ccb6d4bced66f0496bce203cf4b2f780ec8172eaf856e323c747229d75de5e9dc950be3
 DIST linux-6.2.14.tar.sign 989 BLAKE2B aee0a80be752237fa2061ae5199265b74d57c8ad7f62687e16e8b1ac67240bae32492b4e6ad3cab9d7021d7428bad2c4fb17b307a3cf505a8d22a3a998eb26c5 SHA512 a0cc0604925381f7489b52a8620c92304c8ac31edb0694d5c138980c672329e45ffdf69f48cbde9faa37eb2d8a51df80ddc761638b10d89a2d76b8f78b9c51e3
 DIST linux-6.2.14.tar.xz 136508180 BLAKE2B 9c944a35da1549bed2d43f2095dea351281293dc3ab1db34575b86d2df7b292dda3adab076840d52e60c5c83f1df870397d20957089cd4a910c2eca9405573cc SHA512 39fe2e687614886618ec94b133cd05394541fc423ec9f7e7e8b59a866a30984ac0ad4393b8264b1cd58c62d44019edf336a02c82adaaca4813ed57f33f22fa03
+DIST linux-6.3.1.tar.sign 987 BLAKE2B c9f60e2f80ac4c672d6d6afa116ca2efa58f3d0bcee88e87a264bff76899ea5e7a5d46df221c8f2d1b134723c80a76cf2ff8920ce2a88ed1f328c98e1b822115 SHA512 e5ab6f6bd1294a2d53b01a67c58d175859fd5dbbadbf96b2a6a89c9e743d11e5a13c9713ccf997c321fbbd6ba17da90bf08998244a48c4be05df075dcf71501a
+DIST linux-6.3.1.tar.xz 136934448 BLAKE2B 91c7ac2fb2bdeed323b6f0812582bd82c78f62ce3754063716a8769b30c41e35ae06b042ef27fb3c59a63ca17ec764313d7971ba2ddf84f8cf9fe5885ffe0644 SHA512 381cea3db6d9e0dc50d7e4b01034593ad948f2e651d01e378559e8def921f3db6860c02e46c15e1bc933795e34dc79b5dd368b5b28b26a6c0b072c4a70cca2e2
 EBUILD vanilla-kernel-5.10.177.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.179.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.9999.ebuild 3295 BLAKE2B 191d46975c539cc082db84ee88fd5a19cbd62fb1062c811e8250baa1175192d0cd1786f6a051cc6f27b41f5e9d5f5348a6ad913f427ca4e13438f408bd7ce1dd SHA512 6a60dc8f452c732628848ba37149e647e3106789b14cce9fa177287dc535c9ebd3a30020d181d9979fc43baa1dc035a1747fd0a3719b11f655ed90f6e5538d2a
@@ -64,4 +70,5 @@ EBUILD vanilla-kernel-6.1.26.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d
 EBUILD vanilla-kernel-6.1.27.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.2.13.ebuild 3894 BLAKE2B 82f8980163a94f5d15e8e9b0602c0801d2388694df96b9406b4e8c14eeece694cf8f1cedfc93e86bf620795c67c3f35314eafc16c52a655b9a4c505b9faf82f9 SHA512 f57b5ad9e4d7016e89356288c725624ccbbdd7d3ebd66950137015f9567c267245b46fc54ec4fb7d882cd23d2b0d0212cd320d2a221f42088c27428962e7e3e7
 EBUILD vanilla-kernel-6.2.14.ebuild 3894 BLAKE2B 82f8980163a94f5d15e8e9b0602c0801d2388694df96b9406b4e8c14eeece694cf8f1cedfc93e86bf620795c67c3f35314eafc16c52a655b9a4c505b9faf82f9 SHA512 f57b5ad9e4d7016e89356288c725624ccbbdd7d3ebd66950137015f9567c267245b46fc54ec4fb7d882cd23d2b0d0212cd320d2a221f42088c27428962e7e3e7
+EBUILD vanilla-kernel-6.3.1.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.1.ebuild
new file mode 100644
index 000000000000..98a956be057f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.3.1-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}