gentoo auto-resync : 13:12:2023 - 05:39:04

2 files changed, 12 insertions, 8 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 769772cf048d..cfae3b610773 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,12 +1,12 @@
 AUX linux-firmware-remove-rdfind-dep-and-use.patch 1279 BLAKE2B 620ebc93ecf8e411525f59844ae475077decfe441cc3ef12b5db338b0606c7dcc232cdf4d9f14c2790dd8c9c3cab94d7ef41980dfe857b4af489b37068a3c549 SHA512 7d717ab95dc31ee93de992eb4da02f1feb03e5c5eaae669f0c4105d8eb0985b42689b9b7f94b19b5d4d890619e3d54a75d59bcf6c418c78f96bab42ac774564d
-DIST linux-firmware-20230804.tar.xz 295170972 BLAKE2B 48eca78ab97ef5ac335dd2bfd043cf3e67c52c68cb8b3eb152725e04838a7662dafa9745add6fc786bf87d275809b51a07496fbdaf4607a89e2787388fe1d1cd SHA512 b7fdffd49530223394a0896608a746395cbe9d1a3ca7e4e744bc8381e937845e085f08e2b56854a233426164072f4c365b281db2f0dbb47192a97a94ada8fae6
 DIST linux-firmware-20230919.tar.xz 314110436 BLAKE2B 053142b7b534905e53b59149c20ff88ce52373dc56dd6d283ea8dc93a96891efe74a64b3a5e5b69f6e0fba90c20a03fe1a5d8450e73650201fbc26eeb52fa5e8 SHA512 e91dc432affd55f3b1337cd46eaf6c83054c3a700996e2324399ee160ec91fd0cdfcee3be35c4456c35f0b54d1d22d326d2f62d53b17d8bfa5495b7dcd73a332
 DIST linux-firmware-20231030.tar.xz 317290700 BLAKE2B 3f2f7cd177adabba683d98f048d0fb24f6872168e0a7a43b4521fd43970428af881e54093cc247cf394f714a845db2c0d85387d93305dd1b2c08b359c1f0abb8 SHA512 0a747df0ac6fe1577578021d394b94a5db517b368b17d14a3a580bb361f5112b293ee2f9c56f51b0471118fcc3983c037afea702028370b95715bc9d06672191
 DIST linux-firmware-20231111.tar.xz 356057052 BLAKE2B f594a14e9d7d824f2d7b3c85dd760ecab2f9a72f67e3904774d6bf99906695d2ca48c17cf4c44ebd0d9adbb98c3353ddb5e39cd48f93499539d02b8fb54b2db4 SHA512 dd8eb7e8a51fe14479e2f4e1081a8a31f13d041ddd6180eaae6fe865dbad303c89aaaed2b9df237923f74f1cf9fe8c2e5492b4de5fce991ddb02bb091c95dc58
-EBUILD linux-firmware-20230804.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
+DIST linux-firmware-20231211.tar.xz 358100480 BLAKE2B 91b9ef2d244d465e8d62d2c529f3481b1e28a9c30a143ef7d9f2fb3a2a0f9d7e96b64f09f09fcf73c93ffae693774e03134ce97575610b5c728794ff55224265 SHA512 571eb540d7994eec1a94b7eede8dd225a3ad2a7209018e32086b47d5758c9ce5ff751b15c843176a9b50ae6455445a18871c736e291ae745b402c0254a4f63a7
 EBUILD linux-firmware-20230919.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
 EBUILD linux-firmware-20231030.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
 EBUILD linux-firmware-20231111-r1.ebuild 11380 BLAKE2B 5e62125ecf776b28d2b8f97353cca3bf3a5420e2187b75dd787dcfe0578ae00818933f574e71fc9429449d495bace2d3e947e9721b603ad8bcd5b7d216171da1 SHA512 11c3ae1f7a68853eb089adf70fa98c482c5bc173f3b95e791f02ac9387479cd76dcc849a11e7e472816ccac0a0e929acbce7f50c63bc77fe5684bb57b848d6cf
 EBUILD linux-firmware-20231111.ebuild 11165 BLAKE2B fa34d1b351bfc96f2208b1c261e33b8f56ec320494ca56f2d986ba942a2916dc581cd2414f13efe0ecc957d40a201a860dcf90baecb8a10f02efffffc2c06eb2 SHA512 62b3f6033da0e3454f0cb121acd1aa7affd22df332030e68b802de757f8dbab2a5e9b843f56e7cc4c6ef80bec11f3b8c589f8f4caa56c0edf437083e86c690b1
+EBUILD linux-firmware-20231211.ebuild 11363 BLAKE2B a19e1ccae06db32211eb4f2582a508111d456914a4ae2c56deba90c8464bdc7554496020f23ada44130293483cb49aa94b762097c7eb3cf5b52bb41b6d6461c6 SHA512 96ae79c4a69812ce3432e4f5d9abc86be036a33318b97e4dba042855398067a3c742957a60ac1799b00e6eb8b84bd5f518b74832283a273e75af76320993e090
 EBUILD linux-firmware-99999999.ebuild 11239 BLAKE2B 4956e5dad571f87f23ab18563f7b3578abd81a1dc23266421e0b0d832f786cba813afccf88a17dd548331840348d8851ab7ecc534c4b8af74fdce84c91066c56 SHA512 e2f0d3ad4e1e00a5bcca2dce36789e13d056f0d05212b0cac949c0603799d965cc61076b8495a545d956f453bfa4efa62caa1045ed89d9cb059032939de74641
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-20230804.ebuild b/sys-kernel/linux-firmware/linux-firmware-20231211.ebuild
index c7bc4aeff108..19abc1986730 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20230804.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20231211.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit linux-info mount-boot savedconfig multiprocessing
 
 # In case this is a real snapshot, fill in commit below.
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux firmware files"
@@ -29,16 +29,18 @@ 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="compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license"
+IUSE="compress-xz compress-zstd deduplicate initramfs +redistributable savedconfig unknown-license"
 REQUIRED_USE="initramfs? ( redistributable )
-	?? ( compress-xz compress-zstd )"
+	?? ( compress-xz compress-zstd )
+	savedconfig? ( !deduplicate )"
 
 RESTRICT="binchecks strip test
 	unknown-license? ( bindist )"
 
 BDEPEND="initramfs? ( app-arch/cpio )
 	compress-xz? ( app-arch/xz-utils )
-	compress-zstd? ( app-arch/zstd )"
+	compress-zstd? ( app-arch/zstd )
+	deduplicate? ( app-misc/rdfind )"
 
 #add anything else that collides to this
 RDEPEND="!savedconfig? (
@@ -97,6 +99,7 @@ src_unpack() {
 }
 
 src_prepare() {
+
 	default
 
 	find . -type f -not -perm 0644 -print0 \
@@ -275,7 +278,8 @@ src_prepare() {
 }
 
 src_install() {
-	./copy-firmware.sh -v "${ED}/lib/firmware" || die
+	! use deduplicate && LINUX_FIRMWARE_DEDUPE_ARG="--ignore-duplicates"
+	./copy-firmware.sh -v "${LINUX_FIRMWARE_DEDUPE_ARG}" "${ED}/lib/firmware" || die
 
 	pushd "${ED}/lib/firmware" &>/dev/null || die