gentoo resync : 28.11.2020

4 files changed, 88 insertions, 0 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 502aeed0ba6f..58b6b9c7e039 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
new file mode 100644
index 000000000000..51ba545d49bd
--- /dev/null
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -0,0 +1,3 @@
+DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d
+EBUILD raspberrypi-wifi-ucode-20190114.1_p9.ebuild 2381 BLAKE2B 8e99dcf1e5a958fd229aacc9521dc33be54fe9b76fc6755273682c7b14dfee9bd96ff87af10ced77a50306a2d85c3b519d6cb90a30b7526d42d9818b55630746 SHA512 aab0d2480fcf9563f6711fb632fb191018b9a2c42ffc10d5134743c9ab30a390d079c5de17c27bca651698c1d175ab08c025cffb6f2d820b9c166fe81627c9bd
+MISC metadata.xml 570 BLAKE2B c16f4a80f7e456a30b352759cb1868ea1d85ec0060d0ed8d89cbc6c090c69390970153bb739b9a8f96e2747d43e26693902bbe6fde2dc5fb8840d1b0a61bca3e SHA512 5a67d2e10cca7b455cbaccb5b76fd165e764472260589c3d52668ad9a1731ade9dc1daf6b8516280cd65145cdea4b9c1437dbbd6dc2aa4d5aff2c2f64ea4f057
diff --git a/sys-firmware/raspberrypi-wifi-ucode/metadata.xml b/sys-firmware/raspberrypi-wifi-ucode/metadata.xml
new file mode 100644
index 000000000000..bbecf8cc3a3e
--- /dev/null
+++ b/sys-firmware/raspberrypi-wifi-ucode/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>crabbedhaloablution@icloud.com</email>
+		<name>Peter Alfredsen</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">RPi-Distro/firmware-nonfree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild
new file mode 100644
index 000000000000..38d2b40eea18
--- /dev/null
+++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 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
+}