gentoo resync : 24.06.2021

3 files changed, 68 insertions, 0 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 48d5feeedb9c..b6c3d42ed5ab 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index cc1095ce1549..18c9c02e1884 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -1,5 +1,7 @@
 DIST firmware-nonfree_20190114-1+rpt10.debian.tar.xz 2034132 BLAKE2B f6bdfbedc261acdcef976c02fb96f312a7c16c1c06c9419de73559c6ba59cf7d558b28c0dbf720bef3942a57c512fe8b5066bbb574b8286f9184ab029af9c20d SHA512 cf8eb4ad1947dc9f692fcf6540174a186bb054ea8cfdcd458c98452fa90125fc5079ac1cdfcf4171b6ee97023bc1d0a2a180d4b6ef6829c7c84a84922ee336f6
+DIST firmware-nonfree_20190114-1+rpt11.debian.tar.xz 2038892 BLAKE2B a2d66e637cd26928c23855f5369c13b83e25b6b4353c82e9a62cb14b010a8c1fda566f6d200e0e7a706c7fb140238082238b7af80fe1f75fe3f07c815fc0eb6a SHA512 5ba6783dc3f3903f20321571a1fb2e11d7781de6d49689c68e6e1f194dad9cdddec90abc94a32a130323b2c8f9839af387c46aee895caf30ffb2f6dfe6d95b7d
 DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d
 EBUILD raspberrypi-wifi-ucode-20190114.1_p10.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
+EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2381 BLAKE2B 02a0d76eb634906bc63c6a0fd9b673a2e509d09ae5989f72737c894ac2fa0f93aee9eb061b1284722ed10d6e3961c3c41d7780979ec39c043b0028acbc3f5bcf SHA512 db66def2c415a89e58fd6c2a28e79abe51ce1589978399aa8874fa1d36ec2869cf466edbcc79de2a07c3f77c9c0e96626015b13fc5f4f2c0befaa1e871a7ddac
 EBUILD raspberrypi-wifi-ucode-20190114.1_p9.ebuild 2379 BLAKE2B 272d3fabba5110c39f661ad346e9cc9e9b8e174eaa369d4494b90cff6d5e7e5e527ac9f7011108bd35d9659b4a708da87d75240f3146533272c6dc95a1b7d081 SHA512 990db7c7fa97de251b566f8b05aa369c0ae0b9538468870c328c5eb06b1860e94a98b2ffd3a93f462963c75544cf96a7355dbe94514c65ba40d1e1f2d9c8dced
 MISC metadata.xml 600 BLAKE2B 6edfa59a0f432fd7465ae74f08ce7b9441c2fafce1c59e31f012a9a1728c052378c56430d2ab67886ea84a9ffb9c98cc6addfd58e90a1ee0f77b44018ad94f37 SHA512 9bee61c8dda246b541b27a61fc97555e06cb0190a30d4d911054fbceb3d7c8f4821eeb4fb7c1f26c445df518df6e3b907b0881c89cadf57007140b80811e73f5
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
new file mode 100644
index 000000000000..cb9800e8cd64
--- /dev/null
+++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs"
+HOMEPAGE="https://github.com/RPi-Distro/firmware-nonfree
+	https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree"
+MY_PN=firmware-nonfree
+SRC_URI="https://archive.raspberrypi.org/debian/pool/main/f/${MY_PN}/${MY_PN}_$(ver_cut 1)-$(ver_cut 2)+rpt$(ver_cut 4).debian.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="Broadcom"
+SLOT="0"
+KEYWORDS="~arm ~arm64"
+
+RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
+
+pkg_pretend() {
+	local -a BADFILES=()
+	local txt file
+	# /lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt
+	# The above pattern works because the files we want to hit
+	# have names of the form:
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+	# While the files installed by raspberrypi-wifi-ucode have names
+	# of the form:
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.txt
+	# * /lib/firmware/brcm/brcmfmac43436-sdio.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.txt
+	# * /lib/firmware/brcm/brcmfmac43456-sdio.txt
+	# So no overlap is assured.
+	for txt in "${EPREFIX}"/lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt; do
+		[[ -e "${txt}" ]] && BADFILES+=( "${txt}" )
+	done
+
+	if [[ "${#BADFILES[@]}" -gt 1 ]]; then
+		eerror "The following files should be excluded from the savedconfig of"
+		eerror "linux-firmware and linux-firmware should be re-emerged. Even"
+		eerror "though they do not collide with files from ${PN},"
+		eerror "they may be loaded preferentially to the files included in"
+		eerror "${PN}, leading to undefined behaviour."
+		eerror "List of files:"
+		for file in "${BADFILES[@]}"; do
+			eerror "${file}"
+		done
+	fi
+}
+
+src_prepare() {
+	default
+	eapply -p1 debian/patches/sdio-txt-files.patch
+}
+
+src_install() {
+	insinto /lib/firmware/brcm
+	doins brcm/*
+	dodoc debian/changelog
+}