gentoo resync : 18.12.2020

8 files changed, 74 insertions, 6 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 4b261bf1db65..04d34c5a399a 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 73e56c6ed0d8..57fa7e93c2fb 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -2,6 +2,6 @@ DIST ipxe-1.0.0_p20180211-546dd51-bin.tar.xz 1748228 BLAKE2B 5ed2ce71c7dbc41d5cb
 DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d0389534e4efea3209ea0330d66e4d3d429abf81da66639b19488911d85bf2da200ff8cb0d49c5dda438074c4538303335419ea080ef80a16 SHA512 45d7f80f15a1c5ff1daa31b132065d38013a51127795ad81308b468940a455edcb40cde7601475039a7c977d732817203bbc627c642d3d10146a480da603f1dd
 DIST ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz 1839688 BLAKE2B b28772b928690646e1b0cb1c27ef56e2cb1c0637a43c6174dea7c8ca401d8c8819938fa358a0bed5d57b8cf992b8c2060b52e32a970ef813f1cf705fb0805beb SHA512 1e5838b8c530257dc544f6e25f80e6e223480917db393ca3ff8c577f07e60180e18f2eed4e71f7b1965157d6e7001f65e224d3c8b56a98f84739e2504ca38985
 DIST ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 2985776 BLAKE2B 5a85505404978d51f80e30332f6eb0417d6d97eb9b3bc05eec5ad649c446c7d17dc841f8cd34a1b29c31dc6f5cf08baa69191de9c8dd4bcdb098c5d7f13a7824 SHA512 3af0da9058b39966bfd8f9d7dfe518ae7b26e18f58d1a3fa2cba8922ec3c50775b82dd9f23bf51be3ca3f69b705f92bcf80988a1817b30f7ab1826a4b159c5a6
-EBUILD ipxe-1.0.0_p20180211.ebuild 2802 BLAKE2B 9fca4b57d57ff02da7b47ab6d69126ee9ab3a02eb3cb3d4c0dca407916436a797dd730cdfef64d14fa255fa6b6021dad4e1d3547be1e433f41d1535118cb99a8 SHA512 999f589e9a37315a7e785ad6bd7b64ff321da46d153a8cfc7704fb2a017e34c3748d0fe778ad59c276c5662f40bba3e577fcedcfb9ada2bcd3b2b736d98358fc
-EBUILD ipxe-1.0.0_p20190728.ebuild 2800 BLAKE2B fcdfd31fab4641dc67950c0ad5ea4c6f68c0af1baa0269ed4c4b211d0ca38a197f973e93d87e89dcab0227c2809ffb4e0f05912118c8f4a164190a48937ca718 SHA512 99b9c365abc41edc9735fb26a91835f0265a3ec94e16906c76a0ba591208557d860c8f237c49016c47ad05e8c5cc530ddffc7883cb878856913940282a82de57
+EBUILD ipxe-1.0.0_p20180211.ebuild 2802 BLAKE2B 62f4cfbb97b7e249af31f93eece95d2bc792a2d07d9cb6ef28ca37369a82efb0712d3f347ac1cfe1d68efa4ff8ef620671eab07c7a108afaeae0da1870e21c70 SHA512 2f52f6270ab11e2cabcba498956a4713beadf2ddc1a0fa79713872ba848dccca25eb96280226c5e0ac49e9020d37a2ac5e9e016c37f67231aca7bd2f19b28936
+EBUILD ipxe-1.0.0_p20190728.ebuild 2800 BLAKE2B 0013c8b512cc2419e8b53279245ff1f83130d4d737ec7e422591103e88130f6c320f146c24c5528713f4dddd346abf129e66373cc2d5ecf50130ffad8f760c80 SHA512 971c1c69d3aee0f0b6996ec355e42db3e7dd9eb52a2ce2221a09acbb41cc542ae9ca08e4bf187323f245d9ad632cb041d7b7f10ed975543592a71fb7602ea193
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
index 34c3700b7860..e896449d6c5e 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
@@ -25,8 +25,8 @@ SOURCE_DEPEND="app-arch/xz-utils
 	dev-lang/perl
 	sys-libs/zlib
 	iso? (
+		app-cdr/cdrtools
 		sys-boot/syslinux
-		virtual/cdrtools
 	)"
 DEPEND="
 	!binary? (
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index 7216cd520792..a173db1969e0 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
@@ -25,8 +25,8 @@ SOURCE_DEPEND="app-arch/xz-utils
 	dev-lang/perl
 	sys-libs/zlib
 	iso? (
+		app-cdr/cdrtools
 		sys-boot/syslinux
-		virtual/cdrtools
 	)"
 DEPEND="
 	!binary? (
diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index 053a071c72ba..23a5793e575b 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -1,3 +1,5 @@
+DIST firmware-nonfree_20190114-1+rpt10.debian.tar.xz 2034132 BLAKE2B f6bdfbedc261acdcef976c02fb96f312a7c16c1c06c9419de73559c6ba59cf7d558b28c0dbf720bef3942a57c512fe8b5066bbb574b8286f9184ab029af9c20d SHA512 cf8eb4ad1947dc9f692fcf6540174a186bb054ea8cfdcd458c98452fa90125fc5079ac1cdfcf4171b6ee97023bc1d0a2a180d4b6ef6829c7c84a84922ee336f6
 DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d
+EBUILD raspberrypi-wifi-ucode-20190114.1_p10.ebuild 2381 BLAKE2B 8e99dcf1e5a958fd229aacc9521dc33be54fe9b76fc6755273682c7b14dfee9bd96ff87af10ced77a50306a2d85c3b519d6cb90a30b7526d42d9818b55630746 SHA512 aab0d2480fcf9563f6711fb632fb191018b9a2c42ffc10d5134743c9ab30a390d079c5de17c27bca651698c1d175ab08c025cffb6f2d820b9c166fe81627c9bd
 EBUILD raspberrypi-wifi-ucode-20190114.1_p9.ebuild 2379 BLAKE2B 272d3fabba5110c39f661ad346e9cc9e9b8e174eaa369d4494b90cff6d5e7e5e527ac9f7011108bd35d9659b4a708da87d75240f3146533272c6dc95a1b7d081 SHA512 990db7c7fa97de251b566f8b05aa369c0ae0b9538468870c328c5eb06b1860e94a98b2ffd3a93f462963c75544cf96a7355dbe94514c65ba40d1e1f2d9c8dced
 MISC metadata.xml 570 BLAKE2B c16f4a80f7e456a30b352759cb1868ea1d85ec0060d0ed8d89cbc6c090c69390970153bb739b9a8f96e2747d43e26693902bbe6fde2dc5fb8840d1b0a61bca3e SHA512 5a67d2e10cca7b455cbaccb5b76fd165e764472260589c3d52668ad9a1731ade9dc1daf6b8516280cd65145cdea4b9c1437dbbd6dc2aa4d5aff2c2f64ea4f057
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild
new file mode 100644
index 000000000000..38d2b40eea18
--- /dev/null
+++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.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
+}
diff --git a/sys-firmware/tt-s2-6400-firmware/Manifest b/sys-firmware/tt-s2-6400-firmware/Manifest
index 6e5a867b6c3e..dbed6a55c700 100644
--- a/sys-firmware/tt-s2-6400-firmware/Manifest
+++ b/sys-firmware/tt-s2-6400-firmware/Manifest
@@ -3,5 +3,5 @@ DIST dvb-ttpremium-loader-01_v1_03.zip 9841 BLAKE2B 2b1f1b52953f02668b15bcd6d330
 DIST dvb-ttpremium-st7109-01_v0_5_0.zip 2074807 BLAKE2B 39a4565450a4377c43cad0a8d7bf4610d2aea0f3eb0e4e939dfc1c61016e496cb56d593c3e0ebdc7e0ffcf799b66a31fb7f937e3ca090b18258d7f4f5da0e9ae SHA512 c8aeb5a61deb1f66d65ca69512edaa78d0222765d60f780b7c6f9240823def66bd326a21bb1c3bf0a4206dc0b1766522fc8d7ead800a6b49682bcc75be109d59
 DIST dvb-ttpremium-st7109-01_v0_5_1.zip 2075442 BLAKE2B e5695e1550b94ee89023a72b1fbb43c7a0c01e0705fa86129886e4bf8cd658f2094b5c5b890d25cae46c8a71ba9c93b0c5dd83352dae555317b8fd5e003d1d94 SHA512 8d209793201065914f4314dd4f3978ab100d93ce6abe589411b6e9bd3dc064702d3835696834e192c2aa432213d4d4be6ccbde9140faa10d7e8a16ca4909feb9
 EBUILD tt-s2-6400-firmware-0.5.0.ebuild 709 BLAKE2B 0137bd3dab08ab3d7d16c8aa071194dc6032e485016e13372bf45b6f42928e1d29c43352bf0cb01e1697a005f251c027fbb3dd6b0f8a053952237b309cc181b0 SHA512 67fbcd29ffa7ef05a2385c8d06e3806c336346daee27c3dd79a6c13374e3b8d97ff9baab2ad4de1409ac5eb0c1c964fd7233159cf09b3a91d75d585899b58b0a
-EBUILD tt-s2-6400-firmware-0.5.1.ebuild 707 BLAKE2B ee9123e4b2c8700c20a0930bf0df6bc6b9dc4f4d5a29d5db299dff0111756e977a067d0a35780d213a96ac0aa8ccbc27bdb087f5d3977d1262cff129c44c94cc SHA512 c0ace72bb885236775cc8340390387f979dcd34d40c0fd710514e61b7c094e1d3b2b0fc0c8b7e5123f30dcddc280bb15825a46d9dff61ab2007b0036981b8be3
+EBUILD tt-s2-6400-firmware-0.5.1.ebuild 706 BLAKE2B 08003cddeb8ceea8025c892b9ba33f6e230d32ff9118ba7566a6750a1c9fad9f3a51d088a94ff7be556ce16fd86a8626413d47cc5f3ae274f360f6c30aa8a94e SHA512 075620eb243762afdd3e3161294a7d90e3676320b8464ac0f86522351e7732b04cf67f808f061074b3343ce9d0e3b874e6503a19abc66aadc24a4de8dd4cb39e
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild
index 8b1b3216317e..3f114357cafe 100644
--- a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild
+++ b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.aregel.de/file_download/28/dvb-ttpremium-st7109-01_v0_5_1.zi
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"