6 files changed, 43 insertions, 410 deletions
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 7ed43730a3c6..11661c3b93d4 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 4b2ccddc30a8..26f1aa9dd82b 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -5,10 +5,12 @@ DIST patch-6.14-rc3.patch 38939531 BLAKE2B 95968a36993129985c578d7beb4cba417a090
 DIST patch-6.14-rc4.patch 39188198 BLAKE2B 6b24651edbacaabb148063bc1858d337eebbcb00421421097808902a9ccb37568f4fded6ef6b8b8e4d876018f0e2ae7ab825d509300b843a71627269cd27f1a2 SHA512 2a3d3613a95fdc95344a90bf061675385f4fcbe6be50e41b17c18079c81e79356c64ed7efeb4fc866630aeed73818c696e262d0da8eaa18d5139944fed6deb8c
 DIST patch-6.14-rc5.patch 39450650 BLAKE2B efcf298ca299ea177761017e9b4dbe1f8a26519ae9280525ac6d74fb2944c8553ffd324d7997ec7ed0e4985e16a702a92af88438ae71c16f23ac7f178e2a2469 SHA512 68686935d7a85e78cea929dfad33e49941df7e3d3ef0990951af7efdc98c4ac5ddf68cec144f82409a078e8e45fa26c9a1df9cfbd08ccb6fe69772eb3d104e15
 DIST patch-6.14-rc6.patch 39817763 BLAKE2B 422bc365dd70e067c89af31e047bf09962708cc90008cad886de95f8f6aa2101decaf0b6ba08194b54f404b12b4aa7796841da30b03afeef7ea39cd2227c75aa SHA512 660e849508ebbd9ad64189a5d2351c50d68221ad0ccfa2da94040a92c087a58bcc3c5fac54c19993e947d8e2af9045db5ae44e4c9e7c6ae8db3d7d7779080966
+DIST patch-6.14-rc7.patch 40054345 BLAKE2B a752b957872b7ca2d9a000e85b5b28d5840f909db667d52be0ced4ae1e3cd44ccc1c40bfe62151f9e9fa54663866924e3aee0d63392ec36eabe4a5ebb060d4aa SHA512 52187ff34ff2b54a5a24d0a80a4ab65ce79c6c6251bba45f3e2ad366e4b1f470381f5540ae210d7aebbbc15db4c6887f36bc7525d1fe9dfca72004dc2b89feab
 EBUILD git-sources-6.14_rc1.ebuild 1174 BLAKE2B df74e2ff33bb28f2ee65a10182778a8e738765581325d4053515f4f6835abe6c40b9480bb5fd70e497f089fd8377c34d836f9c708393ea0c85ec2a5a6bcf3369 SHA512 80ef26e79dd758d05f32d121f3492002d90afa8f850856e1852beb6b8ef2f4d19011d1548ad97b4643340d7f08e19f6ec0f55b0aba2296fa7547111ce23da703
 EBUILD git-sources-6.14_rc2.ebuild 1174 BLAKE2B df74e2ff33bb28f2ee65a10182778a8e738765581325d4053515f4f6835abe6c40b9480bb5fd70e497f089fd8377c34d836f9c708393ea0c85ec2a5a6bcf3369 SHA512 80ef26e79dd758d05f32d121f3492002d90afa8f850856e1852beb6b8ef2f4d19011d1548ad97b4643340d7f08e19f6ec0f55b0aba2296fa7547111ce23da703
 EBUILD git-sources-6.14_rc3.ebuild 1174 BLAKE2B df74e2ff33bb28f2ee65a10182778a8e738765581325d4053515f4f6835abe6c40b9480bb5fd70e497f089fd8377c34d836f9c708393ea0c85ec2a5a6bcf3369 SHA512 80ef26e79dd758d05f32d121f3492002d90afa8f850856e1852beb6b8ef2f4d19011d1548ad97b4643340d7f08e19f6ec0f55b0aba2296fa7547111ce23da703
 EBUILD git-sources-6.14_rc4.ebuild 1174 BLAKE2B df74e2ff33bb28f2ee65a10182778a8e738765581325d4053515f4f6835abe6c40b9480bb5fd70e497f089fd8377c34d836f9c708393ea0c85ec2a5a6bcf3369 SHA512 80ef26e79dd758d05f32d121f3492002d90afa8f850856e1852beb6b8ef2f4d19011d1548ad97b4643340d7f08e19f6ec0f55b0aba2296fa7547111ce23da703
 EBUILD git-sources-6.14_rc5.ebuild 1174 BLAKE2B df74e2ff33bb28f2ee65a10182778a8e738765581325d4053515f4f6835abe6c40b9480bb5fd70e497f089fd8377c34d836f9c708393ea0c85ec2a5a6bcf3369 SHA512 80ef26e79dd758d05f32d121f3492002d90afa8f850856e1852beb6b8ef2f4d19011d1548ad97b4643340d7f08e19f6ec0f55b0aba2296fa7547111ce23da703
 EBUILD git-sources-6.14_rc6.ebuild 1174 BLAKE2B df74e2ff33bb28f2ee65a10182778a8e738765581325d4053515f4f6835abe6c40b9480bb5fd70e497f089fd8377c34d836f9c708393ea0c85ec2a5a6bcf3369 SHA512 80ef26e79dd758d05f32d121f3492002d90afa8f850856e1852beb6b8ef2f4d19011d1548ad97b4643340d7f08e19f6ec0f55b0aba2296fa7547111ce23da703
+EBUILD git-sources-6.14_rc7.ebuild 1174 BLAKE2B df74e2ff33bb28f2ee65a10182778a8e738765581325d4053515f4f6835abe6c40b9480bb5fd70e497f089fd8377c34d836f9c708393ea0c85ec2a5a6bcf3369 SHA512 80ef26e79dd758d05f32d121f3492002d90afa8f850856e1852beb6b8ef2f4d19011d1548ad97b4643340d7f08e19f6ec0f55b0aba2296fa7547111ce23da703
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-6.14_rc7.ebuild b/sys-kernel/git-sources/git-sources-6.14_rc7.ebuild
new file mode 100644
index 000000000000..4d00faf04ad2
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.14_rc7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="6.13"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.6-r5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 5a4d7b4c5b69..13374ed2cda2 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -3,13 +3,11 @@ AUX 35-amd-microcode.install 1321 BLAKE2B 4205a10d0224869245b62707ae830dd290dfd1
 AUX linux-firmware-copy-firmware-r7.patch 2218 BLAKE2B a06ccc834d5142da9fda5392c6fcf6872c4d9e915f08705652a319ffe3527a6219d2f0d120353c9f93c4ff2054aa917096ddd34c1824a23d560bd1f8abeed16c SHA512 934da2cc51cfa8769954d3a531ae70c87ebe0e8d817f404bc3fac93bc6fec28f062110895e76dbada061706219b7def6d014eee9a5a3d4fe342c41d124a7086f
 AUX linux-firmware-copy-firmware-r8.patch 2175 BLAKE2B 78851b00d6655c98f2ac63215aa270858a00b34fd2705a40b864aee9f36cf123cc94a3dc5048e59d098429dfd29ca1d5e48821b02c4bbd1894ade37d99c740d7 SHA512 f173fa8d58c4195bf82163e6b9025fed86e7c8800b6a9947a9319142c5f331cdd3e3b26eed51a17ea1355ad1ed02e9c8bb43a4f061a5d4728b7c3e63b8c94657
 AUX linux-firmware-make-amd-ucode-img.bash 2911 BLAKE2B 94586ef124310da2314655ebb517c71e3ac73ca636df3c534d4bd5de4ab175b5aa3d40bffe5c126e292a08cff677542df276660380d3b1f474326c9e456b2ee1 SHA512 21465fe141d5c58bb9a50653788f1084833b0a698aaca4b2dc589bd9129c9f3ee87f179791ef5dd8fda4182a48e378e0f83abbb452422b3462b8e81b57ca43a0
-DIST linux-firmware-20241210.tar.xz 411440732 BLAKE2B 64e02e1c61bddb154f1434c4ee52de3f990730ad7125620f042b9706d1a721feb950b66a0f8d71606d5cba3c0e665c43b8c29e05e84227b7fdaba62b405ec59c SHA512 852e63a936fb324033d819ff14084787a1ac9af8682487cddea889e85e69b3297e262ebc9a1fe029c2ece4e010bfc067b3c8f7f87cd440b6334975f0d81d1226
 DIST linux-firmware-20250109.tar.xz 411464912 BLAKE2B c23ed6d5e0b8ff80666e2c7f3727b991a51dae251778e9ee6e2ab23f45996fbc75d724fbe148d39a180d50384034a01f538daa2abb4f4f5939a7e9773a684240 SHA512 d7bc9d19e1c03ec75d62903f3c6e79947a10aea61aec8958dfea44cfbeb6fec73f2db41e750cf007a7e937380c5956ed919ae24b8a0a92df87b1d4c57464809d
 DIST linux-firmware-20250211.tar.xz 431514160 BLAKE2B 65531857e4225dca6f8acbc84f539b2f44c8aac3f0949ee1c6b54596c1232738ee0a98ca5025e0b6fe60862fe2d7d20b708854f917d2da9b708a7a5d6f41ab6b SHA512 84c49837ef50d3b43fa0b5c9835c115dfa17dca62706d0e81bf17d640a26a42abfa2e5575683191474042be22d7613fb3f7f1710e72bea340a49d6cc2fc4892a
 DIST linux-firmware-20250311.tar.xz 434375512 BLAKE2B a12d42dcea9ec2b7e220ab4da6592cabf77095b41f2b0138626e71c62fa7e311da6efca24e3616a811b3489c23e21fe13684a2b93c0ff746f67e50b097f3f42e SHA512 4686c398a712e4f3fb61e07791fafc9950ed0da71f1db78ebe8ac2dc0b031d19ad64a7e98b8b643c20ef99f195db5a3ca337b762b43c631b99b599fb90892a48
-EBUILD linux-firmware-20241210-r1.ebuild 11077 BLAKE2B dac8be61b83ee4e028600b60d4b6c241481f00f8b32d5919869dac3fc329a6dda4c8b867596e88ccde682d5edeeff6cb6b140b62a06d3e89a1c4ee97426fdbd6 SHA512 c9fd4ef98ee266cb5ad5f1dfccc6fafd956b9c49bf98d3139d96b7284cb45010b7b2662a976940de33dc99bbba7ea077740b920da6ef8821d49228288857a25a
 EBUILD linux-firmware-20250109-r1.ebuild 11083 BLAKE2B f7848a70f11faf6b336e6ce49fef9940225f9ecfe8f8a323172107a64a80c303babe45001976c25404cd13afb9cfcc24fb3cc82c3d0f900c4636e05359f18327 SHA512 9b4f46cb5cfe05935a3d48a48bd559b24c2a10e2807b25be3a486b802d221cfbfcd71a33f47d4152b3e9ce6daca2e029f0d022a50a00e7a3bbe37e9db905c4c8
 EBUILD linux-firmware-20250211.ebuild 11021 BLAKE2B b3bc9a3544e732b12ed47d062fecd176469f75c3018500fc0c4e6543b18c08b50ebe44b2798335e6c664a9dc3582c149945be68c34065bd211b2cf8336c94d59 SHA512 3b97eceb1e0d906c53bcea0d6d79b504866d6c9e9510f6006869b2d0df30efdce878a95ac47dd9afda846c37b834e141eaae119126223780a8eed4308428b9b0
-EBUILD linux-firmware-20250311.ebuild 11017 BLAKE2B 00989b33cc3308c8d01cd649fd2066b3d654114d4cdc01e8adf4cf3bdb2a9bae97021916f9da0daa906dc13398671caeebaeec791d246aefaccfd8af530f61e6 SHA512 69e20ea71eea3a02a3fdc38f76bde1e732378c2c248e619a2e34533c04c1841c2c717504a1737fe824440e39344218d1a047a38b2496c24f9b9194a0babe0fa8
+EBUILD linux-firmware-20250311.ebuild 11009 BLAKE2B ee7f7d0670b190181f93165fe2bcb1ce415608bc68ae7fb94c063e9d1b3798cd7df4710369da62f3da9ca1131eadd9cb3b5a42e9e6648a6d4d1fa82ce35f8266 SHA512 12e85da5330e792ffb851ac29840cbda7d9f48796575875ef3ab50b33ae6243c52c3e96e17d2c64ab4997061e2d76bdb832c64255c5414210f1d071b9abb21ea
 EBUILD linux-firmware-99999999.ebuild 10817 BLAKE2B ae0f75333e5665611fa15b2c79d504b3ddf4ceecf21b0f717d4de38d60ec56f02b29750dc4f9f5583bce8405ccbcc61ab9ef1a2bf65e4d361368e4c0d5745c19 SHA512 1d1d790f1cca12a19de59f3f99af7bbeac975e0361075424a9fa161813a3afd956a44cc2b51901bd7de9916abba6ab946e515737a09c57ac2a5c000fc9d6d983
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild
deleted file mode 100644
index ef45dde25fce..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
-inherit dist-kernel-utils linux-info mount-boot python-any-r1 savedconfig
-
-# In case this is a real snapshot, fill in commit below.
-# For normal, tagged releases, leave blank
-MY_COMMIT=""
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	if [[ -n "${MY_COMMIT}" ]]; then
-		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${MY_COMMIT}"
-	else
-		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
-	fi
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license"
-REQUIRED_USE="initramfs? ( redistributable )
-	?? ( compress-xz compress-zstd )
-	savedconfig? ( !deduplicate )"
-
-RESTRICT="binchecks strip test
-	!bindist? ( bindist )
-	unknown-license? ( bindist )"
-
-BDEPEND="initramfs? ( app-alternatives/cpio )
-	compress-xz? ( app-arch/xz-utils )
-	compress-zstd? ( app-arch/zstd )
-	deduplicate? ( app-misc/rdfind )
-	${PYTHON_DEPS}"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!sys-block/qla-fc-firmware
-			!sys-firmware/raspberrypi-wifi-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)
-	dist-kernel? (
-		virtual/dist-kernel
-		initramfs? (
-			app-alternatives/cpio
-		)
-	)
-"
-IDEPEND="
-	dist-kernel? (
-		initramfs? ( sys-kernel/installkernel )
-	)
-"
-
-QA_PREBUILT="*"
-PATCHES=(
-	"${FILESDIR}"/${PN}-copy-firmware-r7.patch
-)
-
-pkg_pretend() {
-	if use initramfs; then
-		if use dist-kernel; then
-			# Check, but don't die because we can fix the problem and then
-			# emerge --config ... to re-run installation.
-			nonfatal mount-boot_check_status
-		else
-			mount-boot_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use compress-xz || use compress-zstd ; then
-		local CONFIG_CHECK
-
-		if kernel_is -ge 5 19; then
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
-			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
-		else
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
-			if use compress-zstd; then
-				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
-			fi
-		fi
-	fi
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
-			mv ${PN}-*/ ${P} || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
-	chmod +x "${T}/make-amd-ucode-img" || die
-
-	if use initramfs && ! use dist-kernel; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			"${T}/make-amd-ucode-img" "${S}" "${S}/amd-ucode" || die
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	# whitelist of misc files
-	local misc_files=(
-		build_packages.py
-		carl9170fw/autogen.sh
-		carl9170fw/genapi.sh
-		contrib/process_linux_firmware.py
-		copy-firmware.sh
-		check_whence.py
-		dedup-firmware.sh
-		LICEN[CS]E.*
-		README.md
-		WHENCE
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	if use !unknown-license; then
-		einfo "Removing files with unknown license ..."
-		rm -v "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		einfo "Removing non-redistributable files ..."
-		local OLDIFS="${IFS}"
-		local IFS=$'\n'
-		set -o pipefail
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' --no-run-if-empty rm -v
-
-		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
-
-		IFS="${OLDIFS}"
-	fi
-
-	restore_config ${PN}.conf
-}
-
-src_install() {
-
-	local FW_OPTIONS=( "-v" )
-	local files_to_keep=
-
-	if use savedconfig; then
-		if [[ -s "${S}/${PN}.conf" ]]; then
-			files_to_keep="${T}/files_to_keep.lst"
-			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
-			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
-			FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" )
-		fi
-	fi
-
-	if use compress-xz; then
-		FW_OPTIONS+=( "--xz" )
-	elif use compress-zstd; then
-		FW_OPTIONS+=( "--zstd" )
-	fi
-	FW_OPTIONS+=( "${ED}/lib/firmware" )
-	./copy-firmware.sh "${FW_OPTIONS[@]}" || die
-	use deduplicate && { ./dedup-firmware.sh "${ED}/lib/firmware" || die; }
-
-	pushd "${ED}/lib/firmware" &>/dev/null || die
-
-	# especially use !redistributable will cause some broken symlinks
-	einfo "Removing broken symlinks ..."
-	find * -xtype l -print -delete || die
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-
-	# sanity check
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	# create config file
-	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
-	find * ! -type d >> "${S}"/${PN}.conf || die
-	save_config "${S}"/${PN}.conf
-
-	popd &>/dev/null || die
-
-	# Instruct Dracut on whether or not we want the microcode in initramfs
-	(
-		insinto /usr/lib/dracut/dracut.conf.d
-		newins - 10-${PN}.conf <<<"early_microcode=$(usex initramfs)"
-	)
-	if use initramfs; then
-		# Install installkernel/kernel-install hooks for non-dracut initramfs
-		# generators that don't bundled the microcode
-		dobin "${T}/make-amd-ucode-img"
-		(
-			exeinto /usr/lib/kernel/preinst.d
-			doexe "${FILESDIR}/35-amd-microcode.install"
-			exeinto /usr/lib/kernel/install.d
-			doexe "${FILESDIR}/35-amd-microcode-systemd.install"
-		)
-	fi
-
-	if use initramfs && ! use dist-kernel; then
-		insinto /boot
-		doins "${S}"/amd-uc.img
-	fi
-
-	dodoc README.md
-	# some licenses require copyright and permission notice to be included
-	use bindist && dodoc WHENCE LICEN[CS]E.*
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Fix 'symlink is blocked by a directory' Bug #871315
-	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
-		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	if use initramfs; then
-		if use dist-kernel; then
-			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" --all
-		else
-			# Don't forget to umount /boot if it was previously mounted by us.
-			mount-boot_pkg_postinst
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20250311.ebuild b/sys-kernel/linux-firmware/linux-firmware-20250311.ebuild
index 18e482b5089b..626d2a88f5f0 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20250311.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20250311.ebuild
@@ -20,7 +20,7 @@ else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"