gentoo auto-resync : 03:02:2023 - 09:09:48

2 files changed, 24 insertions, 5 deletions

diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index 7c08a6fa8133..f4858b5995bd 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -1,7 +1,7 @@
 DIST firmware-nonfree_20190114-1+rpt11.debian.tar.xz 2038892 BLAKE2B a2d66e637cd26928c23855f5369c13b83e25b6b4353c82e9a62cb14b010a8c1fda566f6d200e0e7a706c7fb140238082238b7af80fe1f75fe3f07c815fc0eb6a SHA512 5ba6783dc3f3903f20321571a1fb2e11d7781de6d49689c68e6e1f194dad9cdddec90abc94a32a130323b2c8f9839af387c46aee895caf30ffb2f6dfe6d95b7d
-DIST firmware-nonfree_20210315-3+rpt5.debian.tar.xz 1743300 BLAKE2B 5de090eefc68ba34df43c58a08554891b8e98d1c8ebce37c63275af8ca438b42880d95dcddf902a1491e19007ccab8cec950f74f50c4f84df092c76e6ffb437b SHA512 8a2151b8c96b0ba806eb25fb0eed12c3b3b91d3386f8ed4ab8058dc5c5989ed5eee39c8c24ceaa8f343042a5031a8c4a2cd759b42cb12d76b58209de50c44083
 DIST firmware-nonfree_20210315-3+rpt7.debian.tar.xz 1755320 BLAKE2B d7d5a3a2a1f7fbf6f18c751a92012bb7018aab403091288c291d64dbc7c46b26053f3d8693253625d7603a3df9ef9ec8e5f27c365dd0e0904725f351c54931a7 SHA512 e0ae23a0306d941d0633be19e964dbaf657fe64d97bf767691558e8565814f71dbd4f45dad8219ccc8a8953bc8088f8a98e65a11d389e0d0868bf20349060ded
+DIST firmware-nonfree_20221012-1~bpo11+1+rpt1.debian.tar.xz 1819844 BLAKE2B 3b8bea16b73b67f8467844c282f337ac4784a937a54e05b255d2bb7956a2ee10f6a4cdb619384e7d408df4d637d5a3e9b1a50bb260ac3afd22e23dee8177ed21 SHA512 ba25ea62096bcac853865ff28d0982c05c37a364e10e846984d14c30ae7441cfd0b35a7c6bf4bfeca5aa5b2321e582b8e7553cdf28dd919371227fb8550c541b
 EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
-EBUILD raspberrypi-wifi-ucode-20210315.3_p5-r1.ebuild 2469 BLAKE2B e53483e6971e8a1a71ab50de3011eee09b5df84ed7526617fb7206504b5161860c470db9be1b07c7ccf521c3859cfb12e005443d99b853c0e80f3dc1da4305cd SHA512 8da229dcd2ba62f120abebb9273dcea1d962209082e0fc72d23dc6170d412f42f1f0a8855c69bf961170f6c83669f7ec58cd6ff7a886747da35e1d26cf1e06e1
 EBUILD raspberrypi-wifi-ucode-20210315.3_p7-r2.ebuild 2683 BLAKE2B 62f1479512f5353dd15ace992dcaa17b61393603613307d161e5205c7ff4553bb43b2a880c4578bdba04ad34a4e07396f748fd192caa9ffd8a264be31812c3b2 SHA512 f66ca5ed5eda14fb9d536e6af3ca8936cd3139b39ace2c5586858d9f82dd08f03a33046bec31ec73bc4531187c5d058256378bdf632f0f17676573c90f69b031
+EBUILD raspberrypi-wifi-ucode-20221012.1_p1.ebuild 3205 BLAKE2B 54e9748bfe2fede66a3f23d6d2ddc61ed3270b8217eacf14550a07beb30826b3227b43fd4f217439fcd3bbdb8c9465bc27dfc4cae9da13f2a054f3f738810a1c SHA512 adcb7919f9df598c2f56f0567734089c95d30dc2defc55e7b3a4ac2d7115119986142d9626ec2220b045891e6939206f365cea4238e2f655cc1f01d3157c219c
 MISC metadata.xml 713 BLAKE2B 0440fb00ea20009509c7d0aeb24bb26aa0e982e69457fd7f325aef56f810c448b5776fee4ec4aec58c40e4b895a724e7d0cec605037dea44f19cc487a9b423c3 SHA512 6fbe06d1c2c3913d2d4c40b575b9b0178110184e89be41302a176b15beafa81c7dbc4f755d92fa045210869902b2a37fe5f42bbaae69760c860a63a42d1ab04e
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p5-r1.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20221012.1_p1.ebuild
index ce8516611329..11cfc86d0710 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p5-r1.ebuild
+++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20221012.1_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ 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"
+SRC_URI="https://archive.raspberrypi.org/debian/pool/main/f/${MY_PN}/${MY_PN}_$(ver_cut 1)-$(ver_cut 2)~bpo11+1+rpt$(ver_cut 4).debian.tar.xz"
 S="${WORKDIR}"
 
 LICENSE="Broadcom"
@@ -58,6 +58,25 @@ pkg_pretend() {
 	fi
 }
 
+src_configure() {
+	unlink "${S}"/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin || die
+	ln -rs \
+		"${S}"/debian/config/brcm80211/cypress/cyfmac43455-sdio-standard.bin \
+		"${S}"/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin || die
+
+	ln -frs \
+		"${S}"/debian/config/brcm80211/cypress/cyfmac43455-sdio-standard.bin \
+		"${S}"/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin
+
+	ln -frs \
+		"${S}"/debian/config/brcm80211/cypress/cyfmac43455-sdio-standard.bin \
+		"${S}"/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.bin
+
+	ln -frs \
+		"${S}"/debian/config/brcm80211/cypress/cyfmac43455-sdio-standard.bin \
+		"${S}"/debian/config/brcm80211/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin
+}
+
 src_install() {
 	insinto /lib/firmware/brcm
 	doins debian/config/brcm80211/brcm/*
@@ -65,5 +84,5 @@ src_install() {
 	insinto /lib/firmware/cypress
 	doins debian/config/brcm80211/cypress/*
 
-	dodoc debian/config/brcm80211/LICENSE debian/changelog
+	dodoc debian/changelog
 }