gentoo auto-resync : 14:07:2023 - 10:36:56

8 files changed, 144 insertions, 20 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 0d6ef8d4f8bb..1f76cb350709 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/atmel-firmware/Manifest b/sys-firmware/atmel-firmware/Manifest
index 0e41bc741ed5..1819b535c689 100644
--- a/sys-firmware/atmel-firmware/Manifest
+++ b/sys-firmware/atmel-firmware/Manifest
@@ -1,3 +1,5 @@
+AUX atmel-firmware-1.3-clang-16-build.patch 288 BLAKE2B 11400c39197b756967eab7d5b708652ad5368db5a5eef3bbb3be865a3c2e1702ad36ea001df75531968c6eff096b1a726eb5cb4eb2daac7f9a71e1f7bfe8d36e SHA512 8dfe8c1516ce0d5e248048780be5a926fdf7bbe1fd80605d2ec4738537cac0a4ad2885ed3c35fe20e943418c0df69b4e2847a6feb1c5b40e1e6d7cd87d1c612a
 DIST atmel-firmware-1.3.tar.gz 470254 BLAKE2B 76b90d6bf34db5540ab8c4034a439e8da6e0590ecbca0962c9e65099143b67337c91f7673a2cc33a2191924f42f69f922176a9b91f8592ce649dbf04a17b36ee SHA512 e87767008d3fe08a7e997b629a11589c00f46ca375639dd0b06c48b2de831a7df666c895888026eff03b7ee81a7594349fd550c4943b088ce26fb57f660ce89b
 EBUILD atmel-firmware-1.3-r2.ebuild 1156 BLAKE2B e377ff4ba37e71ee23831fba4c3d18c9da436ed1345c6b29823670bee1a4787e21683cf7a562f36fc16bc7c2c93bfd04422097f68688a582d76901aa700a9e29 SHA512 3b4294034d6ae15ccc3cdde87f500557a364fdd947aaa8b16d4d26c8035674aa0754296c7e75db95e3fb40052b2f97a435107a51357a2c2eb27ddc2a6a34c141
+EBUILD atmel-firmware-1.3-r3.ebuild 1217 BLAKE2B e7918684a655cb9e50bafe7fdca3817d64a96a380a92caa8a1a39d9fb0933dce6d5ccc84cb55a08f7e9324c71dbb7bb5067c325f99a3b43127b087a7e79166c0 SHA512 a64e375e93df2350b21074320a33c767751d04358e991641469b7a7fbc29eceb9b4774d1f00c0e67f1f60fa5bf31a37ab56e722d33a06ac1b9581cfd19c41aca
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r3.ebuild b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r3.ebuild
new file mode 100644
index 000000000000..bd7600155a73
--- /dev/null
+++ b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Firmware and config for atmel and atmel_cs wlan drivers included in linux 2.6"
+HOMEPAGE="https://www.thekelleys.org.uk/atmel/"
+SRC_URI="https://www.thekelleys.org.uk/atmel/${P}.tar.gz"
+
+LICENSE="Atmel"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="pcmcia usb"
+
+RDEPEND=">=net-wireless/wireless-tools-26-r1
+	pcmcia? ( sys-apps/pcmciautils )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3-clang-16-build.patch
+)
+
+src_compile() {
+	tc-export CC
+	emake atmel_fwl
+}
+
+src_install() {
+	# atmel_at76c504c-wpa.bin should be renamed to atmel_at76c504-wpa.bin, bug #398803
+	mv images/atmel_at76c504c-wpa.bin images/atmel_at76c504-wpa.bin || die
+
+	insinto /lib/firmware
+	doins images/*.bin
+
+	if use usb; then
+		doins images.usb/*.bin
+	fi
+
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins atmel.conf
+	fi
+
+	dosbin atmel_fwl atmel_fwl.pl
+	doman atmel_fwl.8
+	dodoc README VERSION
+}
+
+pkg_postinst() {
+	if use pcmcia && [ -f /run/cardmgr.pid ]; then
+		kill -HUP `cat /run/cardmgr.pid`
+	fi
+}
+
+pkg_postrm() {
+	if use pcmcia && [ -f /run/cardmgr.pid ]; then
+		kill -HUP `cat /run/cardmgr.pid`
+	fi
+}
diff --git a/sys-firmware/atmel-firmware/files/atmel-firmware-1.3-clang-16-build.patch b/sys-firmware/atmel-firmware/files/atmel-firmware-1.3-clang-16-build.patch
new file mode 100644
index 000000000000..dca3dd03be43
--- /dev/null
+++ b/sys-firmware/atmel-firmware/files/atmel-firmware-1.3-clang-16-build.patch
@@ -0,0 +1,13 @@
+Fix build with clang 16
+Bug: https://bugs.gentoo.org/887113
+--- a/atmel_fwl.c
++++ b/atmel_fwl.c
+@@ -37,7 +37,7 @@ struct atmel_priv_ioctl {
+ 	unsigned short len;    
+ };
+ 
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ 	int i, magic, rc, sock = -1;
+ 	struct ifreq ifr;
diff --git a/sys-firmware/broadcom-bt-firmware/Manifest b/sys-firmware/broadcom-bt-firmware/Manifest
index 3e292ebcb02b..f27f0162f2cb 100644
--- a/sys-firmware/broadcom-bt-firmware/Manifest
+++ b/sys-firmware/broadcom-bt-firmware/Manifest
@@ -1,5 +1,5 @@
 DIST broadcom-bt-firmware-12.0.1.1105_p3.tar.gz 2332072 BLAKE2B 819a95230a19c1f2dcdd0648ae9f29275ddfc133c86c0fcf85657aa1e52baede10e061e5b2a2c0c6b795d83813f86a67ea0378c21b0f2b961439a146241127d8 SHA512 96de9704d392c0d7bbdc4a094d7fbaf3904854af2ac05081cff7c29cfc11690a47e45674af82af33a0a9741a44c68bf6e3801ccdaaa84de8ba0d36039d89f412
 DIST broadcom-bt-firmware-12.0.1.1105_p4.tar.gz 2332067 BLAKE2B cc6c2b7b30ec1d7b3cedb1a836be603db60e48d13b02108e7ce4b72dfddea9997d115a4af25f6192c54d4ad4c0acb259b7079885fadf41e9e2e58cdaabf62dad SHA512 f37017d6ae17ed89199e9c87e2f603ba21e278ba75c5c0a62f9b0ed8f2f9118f42e19486cc73b3e9153db79699909581a4f5154a6ce862343f50905eb43afcfa
 EBUILD broadcom-bt-firmware-12.0.1.1105_p3.ebuild 437 BLAKE2B 94d271570822d53888f4556a830fb6a7bd01ac3901f67e6a95ee773834c49d9c6c29ba9721f8ffcab44d84bb47df0984d2b8420bf9a1f96929ed0b623717f5fa SHA512 c2926c9cd988d1b59bdc38bd4097472029850391719d8c904e7c56ebc5fe083ac647f3f2569d20cfcbd581ad0d2da5e8368c83bcfbcfc6fd49c03c4fe02e6f88
-EBUILD broadcom-bt-firmware-12.0.1.1105_p4.ebuild 459 BLAKE2B 277ccd81ec0632da2e7eca73705c49aa3ed34240fbf7fbe8b259d74efe77275d08adeca97be48fe751444ff96ac382105b755ca8d383753cc2e6753df893169e SHA512 e0b98ec51e540ed99430ee009821bbf9cff51c48d14e3e01d89b498c73db6d092381b5ebd8c1a59d50dc059d1ed2c16d950d68191f9efce1814f66394f724a85
-MISC metadata.xml 504 BLAKE2B fff68a9de9b4df7049332f877de834969b884c7066d54147b2d48c165c888727411480285effb74d1b383afef074f69896d1a8c62566d79bfb8505587c6f377d SHA512 b7e26b67d3838fda692fec85e773e679409f8f0124e9eb134b1b3446be1df02c6dde996c731e78c89870a7b2f958bca1ce28124a2b63ce62d5fcbf5e72d8f632
+EBUILD broadcom-bt-firmware-12.0.1.1105_p4-r1.ebuild 1615 BLAKE2B 23c0230d0166288f0d3e17c48b3f33d7be984f740674fbc76a69564a025f339f1cc426f0797f7abadde6525d8fc0a7699ad81751999d52d319668a7a4018a9a6 SHA512 91bcdbae7f4f5391a3bee5b158c8bb0c9f03bf16823ea08f9f0e152b3982ab99c8f2383d568b5e1b7283f43277160cd48c7b6d95e4db0a2db688adc0d144c7fa
+MISC metadata.xml 739 BLAKE2B da665133a1c8ea34227c2b4c56b29afb030d25bfc2ff4df864cef17ca1aca38e06ffc535b63f2c0257ea5e4dd2d869118dc830ca6a233d55c0b07c738c1bc60d SHA512 7493ee8e24b9cac82100cd3cc62f8b11f7059f4dd8cd3f58f965d5773fd25844fd2f0263aa29515aaf073d2c50e24de6c81080d62792c54f7bfc5c4be6b3a87c
diff --git a/sys-firmware/broadcom-bt-firmware/broadcom-bt-firmware-12.0.1.1105_p4-r1.ebuild b/sys-firmware/broadcom-bt-firmware/broadcom-bt-firmware-12.0.1.1105_p4-r1.ebuild
new file mode 100644
index 000000000000..ad2af756d59c
--- /dev/null
+++ b/sys-firmware/broadcom-bt-firmware/broadcom-bt-firmware-12.0.1.1105_p4-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit linux-info multiprocessing
+
+DESCRIPTION="Broadcom Bluetooth firmware"
+HOMEPAGE="https://github.com/winterheart/broadcom-bt-firmware"
+SRC_URI="https://github.com/winterheart/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="broadcom_bcm20702 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+# Re-use compress-* USE flags from sys-kernel/linux-firmware.
+IUSE="compress-xz compress-zstd"
+REQUIRED_USE="?? ( compress-xz compress-zstd )"
+
+BDEPEND="
+	compress-xz? ( app-arch/xz-utils )
+	compress-zstd? ( app-arch/zstd )
+"
+
+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
+		linux-info_pkg_setup
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r brcm
+
+	if use compress-xz || use compress-zstd; then
+		pushd "${ED}/lib/firmware/brcm" &>/dev/null || die
+		einfo "Compressing firmware ..."
+		local ext
+		local compressor
+
+		if use compress-xz; then
+			ext=xz
+			compressor="xz -T1 -C crc32"
+		elif use compress-zstd; then
+			ext=zst
+			compressor="zstd -15 -T1 -C -q --rm"
+		fi
+		find . -type f -print0 | \
+			xargs -0 -P $(makeopts_jobs) -I'{}' ${compressor} '{}'
+	assert
+		popd &>/dev/null || die
+	fi
+	dodoc DEVICES.md README.md
+}
diff --git a/sys-firmware/broadcom-bt-firmware/broadcom-bt-firmware-12.0.1.1105_p4.ebuild b/sys-firmware/broadcom-bt-firmware/broadcom-bt-firmware-12.0.1.1105_p4.ebuild
deleted file mode 100644
index 42ed325a8013..000000000000
--- a/sys-firmware/broadcom-bt-firmware/broadcom-bt-firmware-12.0.1.1105_p4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Broadcom Bluetooth firmware"
-HOMEPAGE="https://github.com/winterheart/broadcom-bt-firmware"
-SRC_URI="https://github.com/winterheart/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="broadcom_bcm20702 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-src_install() {
-	insinto /lib/firmware
-	doins -r brcm
-	dodoc DEVICES.md README.md
-}
diff --git a/sys-firmware/broadcom-bt-firmware/metadata.xml b/sys-firmware/broadcom-bt-firmware/metadata.xml
index 3a69026d5f46..1d4e71fe4818 100644
--- a/sys-firmware/broadcom-bt-firmware/metadata.xml
+++ b/sys-firmware/broadcom-bt-firmware/metadata.xml
@@ -12,4 +12,8 @@
 	<upstream>
 		<remote-id type="github">winterheart/broadcom-bt-firmware</remote-id>
 	</upstream>
+<use>
+	<flag name="compress-xz">Compress firmware using xz (<pkg>app-arch/xz-utils</pkg>) before installation</flag>
+	<flag name="compress-zstd">Compress firmware using zstd (<pkg>app-arch/zstd</pkg>) before installation</flag>
+</use>
 </pkgmetadata>