From 3dc4de6331223493015f198dc61854af604da86c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 21 Oct 2024 04:04:33 +0100
Subject: gentoo auto-resync : 21:10:2024 - 04:04:33

---
 sys-kernel/Manifest.gz                             | Bin 5069 -> 5060 bytes
 sys-kernel/git-sources/Manifest                    |   2 +
 sys-kernel/git-sources/git-sources-6.12_rc4.ebuild |  39 ++
 sys-kernel/linux-firmware/Manifest                 |   4 +-
 .../files/linux-firmware-copy-firmware-r5.patch    |  36 --
 .../files/linux-firmware-copy-firmware-r6.patch    |  47 +++
 .../linux-firmware-20241017-r2.ebuild              | 403 +++++++++++++++++++++
 .../linux-firmware/linux-firmware-20241017.ebuild  | 403 ---------------------
 8 files changed, 493 insertions(+), 441 deletions(-)
 create mode 100644 sys-kernel/git-sources/git-sources-6.12_rc4.ebuild
 delete mode 100644 sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r5.patch
 create mode 100644 sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r6.patch
 create mode 100644 sys-kernel/linux-firmware/linux-firmware-20241017-r2.ebuild
 delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20241017.ebuild

(limited to 'sys-kernel')

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 8e4a9fe2f379..7ed0c869a5aa 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 4ee7e03bced4..969d4ddbd065 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -2,7 +2,9 @@ DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf
 DIST patch-6.12-rc1.patch 35514952 BLAKE2B 81d0c3a1231230e8e7fc8bb179df01ee41536033625f01a5a39c1839f3a95eed598c22dd462be37e170969bc7b41f31f84200f2d50750ff9f762abacf54dbff0 SHA512 31a3f1234edd1d2583788df11e1ed13d8572d44d957ad9fd84d9fd608e2c62854d9e84d5f60c8e9a28e63aebd98fc845fe1a25e6a2be5d018810404706314e0c
 DIST patch-6.12-rc2.patch 36093232 BLAKE2B 827554afd814da07ba0e089b06b60ea195f50843cac1d78984d9e42612eaff94635d3295e1091e7396fd76363031b54b0e8d822743e058a8a6395ca822822a43 SHA512 eac7c9ddca5892adc190d62c55e93a53960097b14c550af8e9ff826374fd294c020982d56e34d71202ba77b3c471e553e6ab0c1c4989f7e330b9cef7eaea5b87
 DIST patch-6.12-rc3.patch 37010782 BLAKE2B 932e95c6138efc2228332b3be112b8c2941789b094c00dd536a5cbb0fe39ff85b03ff2916873cf1b2b982db220daa6393d4a9e513179e215da08a5eeb09053d8 SHA512 94a14426d8f00dc1e34f1a9676a5ec45374d21c598827a7ced63a1c85a50fd9873996b954a1f0490ac2b5ead8ebc43dd82421eb056b8063a201a35615130324c
+DIST patch-6.12-rc4.patch 37477805 BLAKE2B b6df018b2c6c38e9ff3975781e3e75f5c0fb40f24f7399e8709c321d7e0a7363e6b777d5f42dded07b3b8602691d0570336df10e43db4213990c33de0c0ffb7c SHA512 317d2d5ba3a161c185442e6a6ac4e893bfbc4099338fbf4f8d465676c8443c66077789860147458b3c35bd53f206da5fdc03e362084d94fe3177ad8ff34b992b
 EBUILD git-sources-6.12_rc1.ebuild 1174 BLAKE2B a84f722735539415ab553b5b9f38024e19cff19c72bbe1e4512944a34d505594f13e94e18f53c3bc92e3de6a40dae426d0df548f257cd7547365fe71024a6f77 SHA512 8b95e16191c6e30d931bc3653c5a6de10e0ac375495e039af6be54328c3c0567e2fd2de72996d1bba2fbdc19c605543f1c582451957a414ba60b87956bafa889
 EBUILD git-sources-6.12_rc2.ebuild 1174 BLAKE2B a84f722735539415ab553b5b9f38024e19cff19c72bbe1e4512944a34d505594f13e94e18f53c3bc92e3de6a40dae426d0df548f257cd7547365fe71024a6f77 SHA512 8b95e16191c6e30d931bc3653c5a6de10e0ac375495e039af6be54328c3c0567e2fd2de72996d1bba2fbdc19c605543f1c582451957a414ba60b87956bafa889
 EBUILD git-sources-6.12_rc3.ebuild 1174 BLAKE2B a84f722735539415ab553b5b9f38024e19cff19c72bbe1e4512944a34d505594f13e94e18f53c3bc92e3de6a40dae426d0df548f257cd7547365fe71024a6f77 SHA512 8b95e16191c6e30d931bc3653c5a6de10e0ac375495e039af6be54328c3c0567e2fd2de72996d1bba2fbdc19c605543f1c582451957a414ba60b87956bafa889
+EBUILD git-sources-6.12_rc4.ebuild 1174 BLAKE2B a84f722735539415ab553b5b9f38024e19cff19c72bbe1e4512944a34d505594f13e94e18f53c3bc92e3de6a40dae426d0df548f257cd7547365fe71024a6f77 SHA512 8b95e16191c6e30d931bc3653c5a6de10e0ac375495e039af6be54328c3c0567e2fd2de72996d1bba2fbdc19c605543f1c582451957a414ba60b87956bafa889
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-6.12_rc4.ebuild b/sys-kernel/git-sources/git-sources-6.12_rc4.ebuild
new file mode 100644
index 000000000000..4c32ee9cdd98
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.12_rc4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 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.11"
+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 b003fcde63b3..196225e5e976 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -2,7 +2,7 @@ AUX 35-amd-microcode-systemd.install 1276 BLAKE2B 02931b234a85400824d61e815e6f65
 AUX 35-amd-microcode.install 1321 BLAKE2B 4205a10d0224869245b62707ae830dd290dfd198dacd2db9702ea4a7e48408e18c398940d15066bf9cd88217b4d35fbd2b63578d2354bc138072f17a0b5cfcc9 SHA512 037c10c4be658022cab76fda45a41bcf4e49d31470444c719bf2eba04a73b24d6a3eab7404c5f194f812f136e8503336768090b82f027717df4712e4725f0cf5
 AUX linux-firmware-check-whence.patch 1414 BLAKE2B ba6e076e4ffe529b4b763445145251a99d5ee1e6f85134dbda973e87ef929e558638d7b1a88add77afbeecfabb84686a692dc37809595c9c01a0824812a9d5de SHA512 a118251e934ae3c3f8be30579c66edfa0859b4271832b3776d12d04d128f593296d03b9cf35d28d46683b04c250f78db269f0b4674c0428ce03d402eef657d76
 AUX linux-firmware-copy-firmware-r4.patch 1538 BLAKE2B 65712bb1b6ba0d4c2a04f2e202a4a9ee272aca364813825f568a6544b7b63537fc44a4304269fd323c9299f8dce4744414f8fe859958d5f9b52d57c9822615b4 SHA512 56694eb4ae6ec13093f1e3f86df9f5494109693f6456ed6d3ad2b2041deae0ce36e2919d256025f7442fcf0e966c0954ce4634c717e4e7cb68fc6d34ae5554f3
-AUX linux-firmware-copy-firmware-r5.patch 1533 BLAKE2B a1f0d7dbfbf2fcdebc8eb9d3b1796fd4cc97b1c55ca5630d3921ef82978e7d97becbbd50de35c3f74888fa95612e1c9898e588ac58e8b9a6a38d5144573e58e5 SHA512 22922b6893c73c774a506cf5b65f7bad007750ca6c17e5acde7467805b99528d27f47d0e9fb1d9f35836d7e91e182fd13ea363892f4a8e350583da26937f8b7a
+AUX linux-firmware-copy-firmware-r6.patch 1843 BLAKE2B 8d848533a3f6b60e3053eb2b7761b87f1a11467c8300e54124442c368b7e83592137537108aab59f2951ca3e316052ee431f685c6549674abba4145eed948dd2 SHA512 b18f6aa4006526ff7b2d0d3d47491aa0f275cca257d491ebfb631b7f7c8869844e5a44f66874d07602d00be2927a01a0e25c1757c8c8af982fed09834d589578
 AUX linux-firmware-make-amd-ucode-img.bash 2911 BLAKE2B 94586ef124310da2314655ebb517c71e3ac73ca636df3c534d4bd5de4ab175b5aa3d40bffe5c126e292a08cff677542df276660380d3b1f474326c9e456b2ee1 SHA512 21465fe141d5c58bb9a50653788f1084833b0a698aaca4b2dc589bd9129c9f3ee87f179791ef5dd8fda4182a48e378e0f83abbb452422b3462b8e81b57ca43a0
 DIST linux-firmware-20240709.tar.xz 376713860 BLAKE2B 33ea1ca0ffafa37b72604386954f05d9eab09dba29c7d28a8b34dabd2c3133b6d4727998b5dad27a8e629877fc63555ee96359a84eb1d133603c3098bac49e72 SHA512 705d092b0ec5002300a91b679e806137e92bf3d4e1edd998e885e8da88297d8791048ee8ad9727546b13fa08aeadab54254eaed8f6f5a9663429eb54746dfb63
 DIST linux-firmware-20240811.tar.xz 379287388 BLAKE2B abcd5eff8e7bd7200079a691e4c09dcc7f349e09eb35c3eae594a7b27eef714767f0eaa92e259b32f4d347f7b6a2ee710332b728546305a01558d732dd947ac6 SHA512 4ea6c24f4bf60eb7ae4cd2993ce4e9dadb03ca7e92f8ccb4778fcebd5c32e16ba8c6095e74b9ed6a111f1b44b983177b52f35a9ad8be7d1dfec2de29a296b8d1
@@ -11,6 +11,6 @@ DIST linux-firmware-20241017.tar.xz 397400292 BLAKE2B b158855a61324e3194274b0d6d
 EBUILD linux-firmware-20240709-r2.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240811-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240909-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
-EBUILD linux-firmware-20241017.ebuild 11056 BLAKE2B 1265c40e4e8a2cacd9618dd1a1b3bdc1cc60cd628c2f1b295e6c159bd72bf511fd0d9bed49768d9348643dab3224e17ccdeb1f3fec20fcd4a61e69e50b1f90ad SHA512 847498d9f90b0b329bf4ea9256168175666d5620d6d73dca4f5951ea1c809c17e1b53e516ff171c9b9e0b9f60a7c48787cc0cae6d1fd0a76f094a82954a4c955
+EBUILD linux-firmware-20241017-r2.ebuild 11056 BLAKE2B 875e7dc450cc4c9aec854268a19b8de7a769a867e805f59a9a00e52d92cc5e46170012d144c93f41ecd1cd0df6ae15edb913a80fa68dc8ea0b71d97b87e36a33 SHA512 81ad913d35652ae6f564944de1d47fd25f6796099023922ebe7abad65e9498bf43fad33cc756aedaabe4710901bf404fb6756b38838b6ee0d78aa15198382da7
 EBUILD linux-firmware-99999999.ebuild 11375 BLAKE2B aa565e1987a561216363d1166c7d41a3a25d714472c82a0d38c95c44db5d6d4deef3d50a45abd38915aa895fc071b54becd178d09dd23a7f2d80b2ed7d3a80e5 SHA512 829fc5efe1107e7090c1d7fc58248886f672a24c15b4e02944a97b6f948bcc69c4defebbaa42a82b283639b7bf942ee5c45315aa3b1190f582ec1ed75726b937
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r5.patch b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r5.patch
deleted file mode 100644
index 15e6ba0ebeb6..000000000000
--- a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r5.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/copy-firmware.sh	2024-10-18 06:39:44.742506779 -0400
-+++ b/copy-firmware.sh	2024-10-18 06:42:04.853498628 -0400
-@@ -46,6 +46,17 @@ while test $# -gt 0; do
-             shift
-             ;;
- 
-+        --firmware-list)
-+            if [ -n "$2" ]; then
-+                FIRMWARE_LIST=`cat $2`
-+                shift 2
-+            else
-+                echo "ERROR: '--firmware-list' requires a non-empty option argument of firmware files to install"
-+                exit 1
-+            fi
-+            ;;
-+
-+
-         *)
-             if test -n "$destdir"; then
-                 err "unknown command-line options: $*"
-@@ -70,6 +81,7 @@ $verbose "Checking that WHENCE file is f
- 
- # shellcheck disable=SC2162 # file/folder name can include escaped symbols
- grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do
-+    [ -n "${FIRMWARE_LIST}" ]  && if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi
-     install -d "$destdir/$(dirname "$f")"
-     $verbose "copying/compressing file $f$compext"
-     if test "$compress" != "cat" && test "$k" = "RawFile"; then
-@@ -82,6 +94,7 @@ done
- 
- # shellcheck disable=SC2162 # file/folder name can include escaped symbols
- grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read l t; do
-+    [ -n "${FIRMWARE_LIST}" ]  && if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi
-     directory="$destdir/$(dirname "$l")"
-     install -d "$directory"
-     target="$(cd "$directory" && realpath -m -s "$t")"
diff --git a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r6.patch b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r6.patch
new file mode 100644
index 000000000000..58d77d4b090d
--- /dev/null
+++ b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r6.patch
@@ -0,0 +1,47 @@
+--- a/copy-firmware.sh	2024-10-19 13:21:08.888499335 -0000
++++ b/copy-firmware.sh	2024-10-19 13:23:16.775386475 -0000
+@@ -46,6 +46,17 @@ while test $# -gt 0; do
+             shift
+             ;;
+ 
++        --firmware-list)
++            if [ -n "$2" ]; then
++                FIRMWARE_LIST=`cat $2`
++                shift 2
++            else
++                echo "ERROR: '--firmware-list' requires a non-empty option argument of firmware files to install"
++                exit 1
++            fi
++            ;;
++
++
+         *)
+             if test -n "$destdir"; then
+                 err "unknown command-line options: $*"
+@@ -70,6 +81,7 @@ $verbose "Checking that WHENCE file is f
+ 
+ # shellcheck disable=SC2162 # file/folder name can include escaped symbols
+ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do
++    [ -n "${FIRMWARE_LIST}" ]  && if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi
+     install -d "$destdir/$(dirname "$f")"
+     $verbose "copying/compressing file $f$compext"
+     if test "$compress" != "cat" && test "$k" = "RawFile"; then
+@@ -82,6 +94,7 @@ done
+ 
+ # shellcheck disable=SC2162 # file/folder name can include escaped symbols
+ grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read l t; do
++    [ -n "${FIRMWARE_LIST}" ]  && if ! echo "${FIRMWARE_LIST}" | grep -q "${t}"; then continue; fi
+     directory="$destdir/$(dirname "$l")"
+     install -d "$directory"
+     target="$(cd "$directory" && realpath -m -s "$t")"
+@@ -96,7 +109,9 @@ done
+ 
+ # Verify no broken symlinks
+ if test "$(find "$destdir" -xtype l | wc -l)" -ne 0 ; then
+-    err "Broken symlinks found:\\n$(find "$destdir" -xtype l)"
++    if  [ -z "${FIRMWARE_LIST}" ]; then
++        err "Broken symlinks found:\\n$(find "$destdir" -xtype l)"
++    fi
+ fi
+ 
+ exit 0
diff --git a/sys-kernel/linux-firmware/linux-firmware-20241017-r2.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241017-r2.ebuild
new file mode 100644
index 000000000000..04e0082e6dbe
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20241017-r2.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2024 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-r6.patch
+	"${FILESDIR}"/${PN}-check-whence.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.
+			[[ -z ${ROOT} ]] && 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=(
+		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
+			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		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-20241017.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241017.ebuild
deleted file mode 100644
index 4164fda300c8..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20241017.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2024 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-r5.patch
-	"${FILESDIR}"/${PN}-check-whence.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.
-			[[ -z ${ROOT} ]] && 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=(
-		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
-			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-		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
-}
-- 
cgit v1.2.3