gentoo auto-resync : 11:03:2023 - 00:05:57

2 files changed, 30 insertions, 9 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 98cb6d81617f..88d77eb83243 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,4 +1,3 @@
-DIST linux-firmware-20220310.tar.xz 237571732 BLAKE2B 9246d4fcdca0a9514606eb7b4ea7e18ea072b8d4302f62fd7aea4d85014c9f7da3eadc650e7c678bfe867c6f5ae9278b68b9a27c6074472ec9574ac922df23a5 SHA512 bafd5795d27c871c199e37f1e39f316e3577186283880da3b86cbc690749313342f8297342bf3ddfc6b3da7903ab2d5d24465240dfff1b0be51aa47f90872758
 DIST linux-firmware-20220411.tar.xz 237957584 BLAKE2B 441699abac0a7554c96324e40676218401febe9ea2a11ff9ab9f9ea4945b4c590c10c9a353aa8c5c66325b408ab9ebcb57fa77b520066f1d9995cb5989bc5b75 SHA512 5470701872ed4670962d3ccb4fd046c1f00145d69e942d76b21ccce08077ca4db867bbb31b87668e6298e130f28fc522a6ff4d66927fbfcee44042e1d908f71d
 DIST linux-firmware-20220509.tar.xz 253717320 BLAKE2B 0181e209a05c3acbdcdc175868dca0ae2993effac0b265335f502a03d3a38cc4849366bb229ade87621426e99112f520f4d50444e438572c61cfc2c6d01ed6a6 SHA512 17d48222a0029d0540a7071b541653a42d66676c4dde88b7c148249450cfcb09087318cb4558ca7a0a7583f3bf0b00948d9383073e038c4f76bc4e807c757c2a
 DIST linux-firmware-20220610.tar.xz 252543088 BLAKE2B b3f627fe150f76c9a1c7b70bf691587554808275debd56e9d36fd0eff63b7ab2351ba03dd298066b03db7f2e590d7f130677e158ade587fbfb59a9efd8f83c0c SHA512 76176af2bf1e83d91c88289623364bc5d3e45d96c8586bd5c064535ee245d133283d2176d142492139cfbd41ca6ad195522c662d923b6cc76556c8509638ad0d
@@ -10,7 +9,7 @@ DIST linux-firmware-20221109.tar.xz 296376440 BLAKE2B af06fdee5b3a7ded60ee233e82
 DIST linux-firmware-20221214.tar.xz 297402416 BLAKE2B 6fec70e2aeb2a53fa72e883d8f0bd7168b35024aeb36c989dfa03f904cccffed4aa9927bbdfdaf4074e78117600a8f3b31d90a4f2325de0fc3d01d3c2592c0ac SHA512 99a2e3abef90b0165b753ef2710253e4e97547eb7af5cdd1ad3fbd1a56ecb50ff2dcb9a9c45569fbef92e2bb10d2dc1970376167f99e934adcfc230c8ca2b098
 DIST linux-firmware-20230117.tar.xz 301424540 BLAKE2B 84a1d1f9d745434f6497cb4e8209b377ff26d815de183e068836a6fca560868a933f0af4d3e7089dc2aeb78427d8374eaf626001d5cbedd39dcb2ec6e05f2c9d SHA512 2ec8bacc1596f3049c8e019868f8496b8bb93080da05105787985f42a0423e2b3c2b51577769f44433e85585f1369c84f3c4742524de21eeaac221a06cd607ee
 DIST linux-firmware-20230210.tar.xz 287648576 BLAKE2B d6ccbaa060df7c7752e93014baead7158d99bff05476581c954f6e97d9d97741d3b1a48fcba556c5befa6857ea9151beffbd1e0df6fc5e2cec850d11d411a5e6 SHA512 6356e1b6ee79e2108c994c91b922eb07b8eb69024b2d9fcea0ee6fe4094849465e292147d2e168930eb90f2f054727ab1f343cb76d5b604739262fd1f57e9ee6
-EBUILD linux-firmware-20220310.ebuild 9772 BLAKE2B a17e9481611e1583c243c68f2f5a0909f91fe5c498359bc5403d222810512c678ca73982c0bbe7ca283da7541e558027ced8cbb6458083ab12180c8060e91566 SHA512 cd32ce58613460c26eedde0fa2277bedadad7ab943df72d8f4fe7b0cd7128ef95a2a208b2261bb2dd8065c3b3bed1db5659345d38f62f5c262b15595bf985780
+DIST linux-firmware-20230310.tar.xz 271812128 BLAKE2B 5e2b9db035e48a3da6e07401e0b7687b79b8206a3c54ab35aed39de83eea0ccc7b7a94c3b3b0d9cd418a9bffbc30decb7e6cd68984ecda9483ff82ca326c6865 SHA512 817e99cc4a5fab36314b3f7449796721d524bc1c0f95cf8e78ce65dbb548a75d7ff9d5bee5370be315da73c26c9e6f93dd421b3cda4b2938ff4f2b4a2a629f3e
 EBUILD linux-firmware-20220411.ebuild 9772 BLAKE2B a17e9481611e1583c243c68f2f5a0909f91fe5c498359bc5403d222810512c678ca73982c0bbe7ca283da7541e558027ced8cbb6458083ab12180c8060e91566 SHA512 cd32ce58613460c26eedde0fa2277bedadad7ab943df72d8f4fe7b0cd7128ef95a2a208b2261bb2dd8065c3b3bed1db5659345d38f62f5c262b15595bf985780
 EBUILD linux-firmware-20220509.ebuild 9779 BLAKE2B 680b376ab7bf5e5fdb7acb7bd349f4420deb5135a34437c2fdad8d3afca2cc826a741dda681eca4de3a61212b322f0ce8d3a1b9120bf5ea860a92ade87bdf738 SHA512 5c0d79ede039b22870c46a9e1e1f721d11f7c42b03b4c731505a3173b23fa0dcbc68b494c5306a3d2465b9e77579171dd21963b2132e01929da82434273721da
 EBUILD linux-firmware-20220610.ebuild 9779 BLAKE2B 680b376ab7bf5e5fdb7acb7bd349f4420deb5135a34437c2fdad8d3afca2cc826a741dda681eca4de3a61212b322f0ce8d3a1b9120bf5ea860a92ade87bdf738 SHA512 5c0d79ede039b22870c46a9e1e1f721d11f7c42b03b4c731505a3173b23fa0dcbc68b494c5306a3d2465b9e77579171dd21963b2132e01929da82434273721da
@@ -23,5 +22,6 @@ EBUILD linux-firmware-20221109.ebuild 10360 BLAKE2B 50e00de7440216bdf4e5e7ddfc05
 EBUILD linux-firmware-20221214.ebuild 10360 BLAKE2B 50e00de7440216bdf4e5e7ddfc05a27e00ae52ac7dbdaa95ca400295cf1030fe518367a17df1760595a26158ca3d70d1b454ff4f222c419a104d249f91454d8e SHA512 0f145cd2bc5e1c52dce018ff1fe622ec099b02d4fe8f814ee7a04114c33aff291a6b733cdd995c075b775eeed3859d0efd0b24aeb8e16d4e6d9b44d183065bec
 EBUILD linux-firmware-20230117.ebuild 10360 BLAKE2B 50e00de7440216bdf4e5e7ddfc05a27e00ae52ac7dbdaa95ca400295cf1030fe518367a17df1760595a26158ca3d70d1b454ff4f222c419a104d249f91454d8e SHA512 0f145cd2bc5e1c52dce018ff1fe622ec099b02d4fe8f814ee7a04114c33aff291a6b733cdd995c075b775eeed3859d0efd0b24aeb8e16d4e6d9b44d183065bec
 EBUILD linux-firmware-20230210.ebuild 10360 BLAKE2B 50e00de7440216bdf4e5e7ddfc05a27e00ae52ac7dbdaa95ca400295cf1030fe518367a17df1760595a26158ca3d70d1b454ff4f222c419a104d249f91454d8e SHA512 0f145cd2bc5e1c52dce018ff1fe622ec099b02d4fe8f814ee7a04114c33aff291a6b733cdd995c075b775eeed3859d0efd0b24aeb8e16d4e6d9b44d183065bec
+EBUILD linux-firmware-20230310.ebuild 10368 BLAKE2B 0e13109bdcb3554a3ca34c56f9ac5aa3ce7628c01db4f49b6d865512b003011b728d2d398efc64ab447a2ef9626849f0ca73bf3af5cbbc3d4d56d16c672d26aa SHA512 bd5e91e98d085d55696be27ec13fc3f9f99c8ea8a3ca929bcb925bea0257d0109e048a313c24aaf1b3f1fcc21df950ffd736c2e13fdb5e25298a489990f59fac
 EBUILD linux-firmware-99999999.ebuild 10368 BLAKE2B 0e13109bdcb3554a3ca34c56f9ac5aa3ce7628c01db4f49b6d865512b003011b728d2d398efc64ab447a2ef9626849f0ca73bf3af5cbbc3d4d56d16c672d26aa SHA512 bd5e91e98d085d55696be27ec13fc3f9f99c8ea8a3ca929bcb925bea0257d0109e048a313c24aaf1b3f1fcc21df950ffd736c2e13fdb5e25298a489990f59fac
 MISC metadata.xml 1078 BLAKE2B aa7843ce53c1cea1068a0dccef91a9c0e27887b3d2b3d1e440045808e9347b473b1cc3421f6237d934bf98168da4edf773ca0ed553e758f72cc102ac3ec754d2 SHA512 547ec53a88d603254b162e38ea6f9ab1c0179a12427417141d4cf1d62aaf9ad07823ce12a78fc49bca3a933f29f1b75cb9c0f056637ce3c533061935ce87deed
diff --git a/sys-kernel/linux-firmware/linux-firmware-20220310.ebuild b/sys-kernel/linux-firmware/linux-firmware-20230310.ebuild
index 88fd355c6055..6eb5ade58607 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220310.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20230310.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit mount-boot savedconfig
+inherit linux-info mount-boot savedconfig multiprocessing
 
 # In case this is a real snapshot, fill in commit below.
 # For normal, tagged releases, leave blank
@@ -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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux firmware files"
@@ -29,7 +29,7 @@ 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="initramfs +redistributable savedconfig unknown-license"
+IUSE="compress initramfs +redistributable savedconfig unknown-license"
 REQUIRED_USE="initramfs? ( redistributable )"
 
 RESTRICT="binchecks strip test
@@ -60,6 +60,15 @@ RDEPEND="!savedconfig? (
 
 QA_PREBUILT="*"
 
+pkg_setup() {
+	if ! use compress ; then
+		return
+	fi
+
+	local CONFIG_CHECK="~FW_LOADER_COMPRESS"
+	linux-info_pkg_setup
+}
+
 pkg_pretend() {
 	use initramfs && mount-boot_pkg_pretend
 }
@@ -186,14 +195,12 @@ src_prepare() {
 
 	# blacklist of images with unknown license
 	local unknown_license=(
-		atmsar11.fw
 		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
-		tr_smctr.bin
 		ttusb-budget/dspbootcode.bin
 		emi62/bitstream.fw
 		emi62/loader.fw
@@ -205,7 +212,6 @@ src_prepare() {
 		mts_mt9234zba.fw
 		whiteheat.fw
 		whiteheat_loader.fw
-		intelliport2.bin
 		cpia2/stv0672_vp4.bin
 		vicam/firmware.fw
 		edgeport/boot.fw
@@ -225,7 +231,6 @@ src_prepare() {
 		adaptec/starfire_tx.bin
 		yam/1200.bin
 		yam/9600.bin
-		3com/3C359.bin
 		ositech/Xilinx7OD.bin
 		qlogic/isp1000.bin
 		myricom/lanai.bin
@@ -305,6 +310,17 @@ src_install() {
 	find * ! -type d >> "${S}"/${PN}.conf || die
 	save_config "${S}"/${PN}.conf
 
+	if use compress ; then
+		while IFS= read -r -d '' f; do
+			target=$(readlink "${f}")
+			ln -sf "${target}".xz "${f}" || die
+			mv "${f}" "${f}".xz || die
+		done < <(find . -type l -print0) || die
+
+		find . -type f ! -path "./amd-ucode/*" -print0 | \
+			xargs -0 -P $(makeopts_jobs) -I'{}' xz -T1 -C crc32 '{}' || die
+	fi
+
 	popd &>/dev/null || die
 
 	if use initramfs ; then
@@ -318,6 +334,11 @@ pkg_preinst() {
 		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 && mount-boot_pkg_preinst
 }