gentoo auto-resync : 30:05:2023 - 21:21:38

3 files changed, 254 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 8930500e39d8..0237199fba5c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -33,6 +33,8 @@ DIST linux-5.10.179.tar.sign 993 BLAKE2B 1ae0cab95a1030f9491b03565dd215efbbc399a
 DIST linux-5.10.179.tar.xz 120596620 BLAKE2B 556ae6eb4a4490f9c75fa4c1e062af48040c816f4bb0d6eec404f0ae5527270c8745815e6a6cfed2a6bfb43fd65e2bfb38b922f118c2e64721cf5add0c1893ab SHA512 cded7d5f6e116ab2e0caa211a3c075a9ff659495aa320f03a72a5f037baaadecd92ff1a9a8faa337f36a84128a95e24d851da844f2204877af9ed3c9602a1f46
 DIST linux-5.10.180.tar.sign 993 BLAKE2B d96ede6a20d344f8343cfc375df33c2e04ed2ed1c04f789399afcc55590d921dc72bc0539240537465992403a62df52ecbcbe8fa23da34f1e0929e276202b7a4 SHA512 39ba9d9beee87e3b91ad497dce2a4aaf41181a9fc5ab39a2893f88f54f13c4ed4cdcb325e0ec294b55c009a930414c56a49d636294008d1f99a32ba5a26c543c
 DIST linux-5.10.180.tar.xz 120595456 BLAKE2B 78fb5aa8b9a303900fead4d8d157bb88b733721f1d3429a2ac44e378a9ba63437fbd23402066e09aa483c6acae1513c78e61575005c337b3c73b6a8261795bd9 SHA512 5f095270cbfad418f9dbf8d1a1a38062b7ac44958acbc5c8d028eb094a8b3210d8a4f23107dd9c0d3266e813ed8d08d704704ed0fd53a6339c493a59b1ebbb10
+DIST linux-5.10.181.tar.sign 993 BLAKE2B 898b6e10b8f7ea288a847b28032b8d9ec13575b2dfa910d40f1cf893bc70942052c8dd7d3e61f10a9a97528247f52ca189ef16da3f2980842d6e51cc26c9f949 SHA512 15514b3c2a46a5b953b3b1f104a30346af36118e153e5fb4837ad4f14453f70feb09365c369943231c386608c0804591ae07e839b62a49c0962fc9274c30408e
+DIST linux-5.10.181.tar.xz 120619300 BLAKE2B de4963daa6c61ad9fcc11bd620eb39c2073ad13a3a2f96a562d0c94024c4d9ba652682e2744d3b8ec81bf4058037b34fd28d1b7238d56de951c069fdefdae666 SHA512 3362cb8b4b0bd488fec412ce1c96ade22b22cb66fe011fabd0af816276bb13157336dcbaa1551e22d0af14288db1a4b3f9350c1fcdcb7fa638b66904d702ea5d
 DIST linux-5.15.111.tar.sign 993 BLAKE2B e2514bc633ce65d36b8d6b4c9f2e826f0d50284afe1af005c4aaf58786fc5ad5ec8eadfcfd67dd8bcf1a4026417f49d40706d80eeb084c1fb6cde8cabc5b349f SHA512 d6c1cd637540454f5e25312e2418a67f277c1b32dbd34e69728e42d0993cc4d89fc4d9456584100892df2e57f4283d1436e921bbf412d3df81d901142b3d8c09
 DIST linux-5.15.111.tar.xz 126541212 BLAKE2B 329650e5b90275105806b7d6810301775cde7e667afd52fcf0c82357a1bc055a07f651e0f41b9d4f992d239b61c0157cbb6a62e1207c8efdda3d0a7db9c29801 SHA512 b56e6f9fb6f968197d5bd593c4c68c000e2197dbeab748902775e481b075c5e0a54af0f72ec67cd53dbc8ea4c673efc9599c80bd878b0afabf43682532c44fa8
 DIST linux-5.15.112.tar.sign 993 BLAKE2B a4cde229d2e9ca63cc9a6295866d3ba21b1755751b836b190c9583f2273e7dfecd17f5523fb38dddc12c9e27729c2b3dde2b59e9c7831d64f90c6b4f975239db SHA512 4d48b108a3d6c957c690499ddac8010146fe0fc99768d7310605a817aecd7107f7228e9cf9937ebea30f4ae1ffaf62f5e4bbe0e2620e217541d1b285dbb09012
@@ -43,6 +45,8 @@ DIST linux-5.4.242.tar.sign 991 BLAKE2B 4dfb18636791da74779de3c55aa8a9491549567e
 DIST linux-5.4.242.tar.xz 113000620 BLAKE2B b3d2ab4c1ac9aeb3d7ab7d34b5fc71097fdaa947317f52ffd8c2630d07314b94db33747bb2046818e086ad5b82fe64566900433c60a7837e15a4f405cd0f44a3 SHA512 7b4b55b696fd134b720ab7d0253c7ffbaa7284e5d6fa89b3af37e8e2a98d927fa508e28bcbae1937acfc3d795be38017f1991898c83d116ea2e9af99e82664ce
 DIST linux-5.4.243.tar.sign 991 BLAKE2B c289f3171230e343848ac748ad345c2082e0ff6e289b83eeedc4ee7a3c510cfc59dd3c8b2afeea60fb1aeaa305e60006ac5526ebf75c4d0d85820e3004891eeb SHA512 ac49bd40f185da3ef1c5ed1e6342603a147664fb5f89ca567a37675d8b3b4b08ff47f01de095e0453424447070338635c8cbff4ae84aab0d30d35d0be294ba16
 DIST linux-5.4.243.tar.xz 113007160 BLAKE2B cf60d5a1a35b245aa1f5cfc72fd4f6155073e060faad0dd86385f704aa2e351d8c87c4effbc2c4aec200a5483fd082ecaeb63ca8e341f9115ae96bbff0b2f101 SHA512 db9a7c9c446ff9685567aa91cfd7c59aff72deaab276a75cccbec81387147b378389b29b89b6d31b3c9ca7badae68ee8cee75cdabe3b68f09ec1e764a53b3d56
+DIST linux-5.4.244.tar.sign 991 BLAKE2B 777eafb4445f043a94936c89bf5da610abbd10a4ba307ff9affdf74344bb5dcec93fd8a0aa8160afdbae67b732af8131740a6e8ecabef0360fc52c475a847ca1 SHA512 85c9b095616bb45705b741f4d0eccabfe50d0571a85362c1c36575f464011c6c5949344e4b170839e603f2dcdc73ab7ca2a47ff695b41b93fcec18bf4a46b2ce
+DIST linux-5.4.244.tar.xz 113008872 BLAKE2B 2837a01c9879fe2975330f051815bd688308cfca91ff29038db899c1749964ed68773ff72e78e2dfa065f3d763401a83c880b386debd90ed6cfce6e30ce79bfc SHA512 eb1b7bee8b29103b3678cb6b3a66401d68c4b2f2c69ea603a8bae920e14655dc41ac21d79fb9593ab479668eb669f0e4a1af8628ff33f5b91db2c820f9f80cc8
 DIST linux-6.1.28.tar.sign 989 BLAKE2B c3ac2b197c826885b5b03eb9e908cb3d4465ed53cb5434af045ba7f184acfb810b5254d16ecb72ea47123efa7fb8ea03d67ca945df4ae3b37858f4829674aa6f SHA512 31ff5857d2055a0c289d049b873e428757b8ddbd2e7978751ba4dd1161466f8a5965062b9e0c0d0186a8cc73399140d272fdf5d78063bd52c355d141b8b76462
 DIST linux-6.1.28.tar.xz 134884320 BLAKE2B f840274d9e1c5af90292bce6afb8b8b1a81b4f8ef82691a1cf28ca2d6cf680913c2668ddb086e1fa4ba4112e9d8118a674231374c14a06a911ddb3d2cf8ac3fb SHA512 7215e62df10847e8bce432880e0756e8a5f56eb8b8abb54f9e1eb8871ce7bd56d765be0f9a40a8dae4d135b2f9a0dab7f6b3d2691d73b0c47f05811194dee8bd
 DIST linux-6.1.29.tar.sign 989 BLAKE2B 05e26bd99c7d5f7a61d83f5b438f342c9a1bb1cb645bc21b014f10eab37cb6cc17f5378358cf99ce6f2bb2d6229595b17e9b3966d763c55391271ce0089d6957 SHA512 8627c6c439cb73b696781de019755e7c0ca795a3573aebf3625ad9ec9df5a9975b797eaa74866d0820bc3d1a9e251f64f0bb00cddac3f330195e2438fb718627
@@ -55,6 +59,7 @@ DIST linux-6.3.4.tar.sign 987 BLAKE2B b61e9860c2fdd710bfec1b71a4d6bf96fd905ab52d
 DIST linux-6.3.4.tar.xz 136914364 BLAKE2B 7e287378e007ce83092c2630d87d5e2b77e1615386a275013f04a190c6cab129e5ddc3abf8213ae521c8722d41cb8d203bb5cc5ae84d9bcd20aebbbc2db1d8a3 SHA512 f9d07b728e66c5da3ef0deec9432e2ca1e56d1fb5d98d2e1cb7cf23744fbf837f41fe918de7842410eab0d89ecf213f0b76db925e4c5bfb265e263eeea24436d
 EBUILD vanilla-kernel-5.10.179.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.180.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
+EBUILD vanilla-kernel-5.10.181.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.9999.ebuild 3295 BLAKE2B 191d46975c539cc082db84ee88fd5a19cbd62fb1062c811e8250baa1175192d0cd1786f6a051cc6f27b41f5e9d5f5348a6ad913f427ca4e13438f408bd7ce1dd SHA512 6a60dc8f452c732628848ba37149e647e3106789b14cce9fa177287dc535c9ebd3a30020d181d9979fc43baa1dc035a1747fd0a3719b11f655ed90f6e5538d2a
 EBUILD vanilla-kernel-5.15.111.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
 EBUILD vanilla-kernel-5.15.112.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
@@ -62,6 +67,7 @@ EBUILD vanilla-kernel-5.15.113.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf310614
 EBUILD vanilla-kernel-5.19.9999.ebuild 3415 BLAKE2B fccd59b033a2c78ed80927aef1fb8c2e56ac60ae94cdc29569ab038af25d7d4a3234e978eb5ceb63f4527a2ec65682ea1a7fec076a3f63ababab520f3ccd1889 SHA512 7e7d154e927d8617e9fac062242388cd5372632cc9d7fb9183315d5ab2e0e116ce3531cc9965ed132b911a72bd956969ab9bfc39f999805b82a96a3320d3d7d4
 EBUILD vanilla-kernel-5.4.242.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
 EBUILD vanilla-kernel-5.4.243.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
+EBUILD vanilla-kernel-5.4.244.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
 EBUILD vanilla-kernel-5.4.9999.ebuild 2635 BLAKE2B 16aaff3ea21368478a85a6bb93cf79a1074e68a7510101586cf6d06d11884c99d474cb19fb47e46fa64b34397528e32719667e2895e01c946a5da3a842f2d7ea SHA512 dd115a18e6005ab5a7d22fde68c5866118e26cb3151dba2ceb8c96cd843a7992fad0edfab8adef57d58653871c6b59ad7fbc0371396ff5cc56ade469626d3019
 EBUILD vanilla-kernel-6.1.28.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.29.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.181.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.181.ebuild
new file mode 100644
index 000000000000..3d406f474e2f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.181.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
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.244.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.244.ebuild
new file mode 100644
index 000000000000..e60639c72379
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.244.ebuild
@@ -0,0 +1,111 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}