gentoo auto-resync : 12:08:2022 - 02:20:53

4 files changed, 239 insertions, 2 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 5193e8140c67..d3fc63f821dd 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,5 +1,7 @@
 DIST genpatches-5.10-144.base.tar.xz 3907764 BLAKE2B 41b8ce08ca73879811e11d91f9365ddfbbc15617a4b825ba00144e71feb86e0ef24b3418b77b203a13ad6299237085a2a1c796beb6ac9aa98a5990a39fd1dd02 SHA512 1b946439d9cf6d97df1acadd7b36ef657fac40ff98b31e2237f3cc412e9efd6d4d1d409339af9d48779dbd9d88aac124f67e07afcf99e7760f93afb6d226131c
 DIST genpatches-5.10-144.extras.tar.xz 3868 BLAKE2B 0d956a61fb525b8ce3b14c215a0c0a6ffa46f21fcf87a63884d31418946a64de0c680472a62fc9bc0d83f67b49dfe88ed373e3ff2ba2f369a0909e3947b27c16 SHA512 c870f84b1a4ae7b95518d08ab46fc7e632a47884e43a9c774be34335ebf825388136ed360f5129c8c97567600e79ce2889d64d9b60a1a8bd2a5b4052e74e2973
+DIST genpatches-5.10-145.base.tar.xz 3914420 BLAKE2B 0d6f00cfba2ea5bc70bf44549e82b79d8e7a59b8e34ad7b94dc97c0ab1059ad005b15d09ab51fd9dcf65243dbf0abc0221d26ee06708adacc7dcc7aa18e7939a SHA512 4b2cc1f37d0dee2bb8181be5ea4030b3c9f2035c688cba3e5d512584486158cd7e1d944d089bff7a28d55d1353ea500de6adaaaf282767fadb1f1d206a2682c7
+DIST genpatches-5.10-145.extras.tar.xz 3868 BLAKE2B 1e6d3c0402bd46656c9f524ff9b309f4d8f4ba85be0dcf210774b5975d85d2098301ff8e6b33fe419d1bc70faf0a4d1d7572fa5c70122a5508a66790a2f18c4b SHA512 d51bcafbcd6cfa70b9aefddb416020363720c152944edba3a41ae152c9b3a0ef1ca3fc70252d9a75b0b636c3480890aa8bd727e18b699d789ad5b08fd065cf7a
 DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
 DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
@@ -8,6 +10,8 @@ DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
 DIST genpatches-5.4-214.extras.tar.xz 1812 BLAKE2B f82f9d703ed7fafa1abae01e9ab15db88b318ef84254360d105490bc727244795064fc6b21fbf771626da9adb62aba44a170165518fae58d8adfde7319e1971c SHA512 a3d8f94e4d9b7e5c29be7c1b336273f89ed38bbd4c21e6b34a51421ef71581a6e8ecc15751fe0bd7dbc1c98a754d1491304383f21925c0018b6e57891f76f303
+DIST genpatches-5.4-215.base.tar.xz 4945872 BLAKE2B 7a0e2098f86258afe07e27a460aa8602f62fe646c918668d0f1bc03307e009ea275de198445c19a5e0727c459bdd00379c1bf86eab44265eb73a072e295b82ce SHA512 dcd26f17ecbda5b2918e98f5cec369ff9e98fa323ae39f0172bf771cdb2125312d93bbc2f1d5f46cb9ba381ff9d0fd339ecc0eac8000db90c8c2b0e07016c313
+DIST genpatches-5.4-215.extras.tar.xz 1812 BLAKE2B 26646412d59a947f1ed77792269296818ed1189aad3f30748e877e947119bd87a6a916f3ecb61a6effaa7346a31e1844eba123144e5055e5567e0be315578225 SHA512 bb45c3f3c617c9446390c15296e02ff0d01d67d96ff8e941fe14a1658e2e6845f2918f2c716cf7739dc5a0bf2dcfabb19f55bb77f51ee8a7b34c5ed2b263a959
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa SHA512 d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
@@ -31,8 +35,10 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-5.10.135.ebuild 3596 BLAKE2B 82ed2819c4a7fa9ec1359008005fe9522180ce5b7ee433c7e523d3849c6df4939735b01e6044cd8ac1e280216f9ab796915a63915abcff1e4b530ba2c602ee81 SHA512 a9da72910325ec2096ecf4e392c9cf8cea810e4ec3ef02621cfcdaff20ffce474f76119b95c2c7cd98295ee4c8714d37688a4c4040474873f1417feed38f1d04
+EBUILD gentoo-kernel-5.10.136.ebuild 3602 BLAKE2B 352e6cbc7b4c3dd628368308fcd01ecf133d36603a284f0c20d8e65da3e87ef29a7097a5f03c62b8d3aa6db1b5725a079b491abae7d8e0847695ec0dd0218776 SHA512 b5f058e544388a1c99337cd517479ec508f580ac5f107d8a6c39f5e3ee2c19d6953896c7fd654bf7a726a1ac974e8eb7872e4c4a1cf884277a5818cc438647c5
 EBUILD gentoo-kernel-5.15.59.ebuild 3593 BLAKE2B 0854919a718f192cc5422a4dd2d551fbb39c6ccd2b9bad56c86896c85ebded885639f80327c8f1806b5750112293848652f664acc7b0984457a378d6b4d2e0b3 SHA512 17878f909948b0de1255cecbcdbb04fd5223a212c2a6cc441e60f09bc28effda02183e2b7a8a9d597fe1bb5ad419cfe5acfc66d97503ec09f48b3eddac97d899
 EBUILD gentoo-kernel-5.18.16.ebuild 3857 BLAKE2B 92dd8fcfc85ea17399bbc5e9a15783647711d5e6ab1132100790236c6c7115377a58427cafdc404a4a03ba79189b2c9689acc7200294373976088d5d1c667c86 SHA512 ccb5878cc0881e9c3cc557c603e28633a18d7e6ecc277c68d9e94b6c1ce9f36d3e6509e45d8f3db166cf191811c4c2c542c3fab872c08a56ba24c97530604d51
 EBUILD gentoo-kernel-5.4.203.ebuild 2799 BLAKE2B 207cd00b51009fec32423c53d9c669b1b33ecdbf344ee4f963899370322bb5ecd24e8c12ee82913fa1d0459bcfa0efc85ef219a455ee0930c06e88b9d444c4a0 SHA512 e087902f31cabcedf79fbb741f323857f9627e5060441caf0700325a6d1f1a279611bef5e5fef75db8ff418ec33c3a5a2487b1f4c6eeea5d5edf4ae47f949c38
-EBUILD gentoo-kernel-5.4.209.ebuild 2801 BLAKE2B 202d1a1f4146cbb0ec32807038513359805168375c0088a4e44d4c0cf93a1e6404aeb6392e2df465f283065b20df1d47edee1334b577fac8c46f2b2e4edbf5c2 SHA512 d14e9d0b0a83901ef5fb3b3580a01f8667355bc3b67a0b8b4a5a1df928099bbc60572731aff3f1b61922117c4bd1b6b5cebcb44976fc825c3151e57d64bb1cd8
+EBUILD gentoo-kernel-5.4.209.ebuild 2800 BLAKE2B 9b3b2fc7905e8f8fcbefb63710da30a6144dafaadcc24a153ed813c2313995660db6bf1f1c3bdcaa2fb7992d0a20628bec5c32957f09ec38af152325b276d1b8 SHA512 2b9cf2fb9792099b15ca7c0da311e37d259c48e48733985158ab5726176215919a5a28c93402d4e4bdfa0cd4ee4c8903c7fafbebfd44eecd11c768de59eb4fe3
+EBUILD gentoo-kernel-5.4.210.ebuild 2803 BLAKE2B a56ad91f6edabf8645ec65291587ec72114eea6a5ee23b0f068d49aa16ad5d79faa46bba5447fb3a351826c7bb576233d7a1beece9843256ab789ef6afb696a8 SHA512 6f1a85386010497e19047e42eaa8caab33dc40089926732d5d01c826bcf91555fdb01414aaa505a1d33ca5228d903ee32c412c5b93a494815f744d68846c9ab9
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136.ebuild
new file mode 100644
index 000000000000..8cc3f5803876
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136.ebuild
@@ -0,0 +1,131 @@
+# 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##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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
+"
+
+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-5.4.209.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild
index e5b1dfba488d..015005407a4b 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210.ebuild
new file mode 100644
index 000000000000..ffd40f039fd9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+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.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 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	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="-gentoo-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[@]}"
+}