gentoo resync : 12.05.2022

3 files changed, 16 insertions, 33 deletions

diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index 95d4349a9cea..2b90b21f7aa0 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -1,7 +1,5 @@
-DIST sof-firmware-1.6.1.tar.gz 3033953 BLAKE2B 0c33bd9a5d17c3b889219bf926d3619e3e448ff6b16e39b4caffe19e87c98d1227b303ebe80d185f93480ead29f37de39093f3e76f275df7836d3250ae47c566 SHA512 71acd34662ffd4d93f6111dfd046ed358184fdf24d0e118da43770aeee45bd15105b688bc5a569f2cb7941724ec822d2cfbab8a08e9caee1a77aa5763ac7b48e
 DIST sof-firmware-1.9.3.tar.gz 3710193 BLAKE2B d52fe0660c73c8e76fb60c492abe19f9e64b3064441880b84488193aa66710e49ef022c7cd1b8ece69d010aa5e416fbf4307a9c92d823525dbdc734194b0a98f SHA512 0c04bf47ecf65d3352b730e79968cb020211c274f64a3cc21e4c5e49c5a9706ab4d541aaea931e72c1bcc67fcde6387bc6bf952a33691aaab06e6b93aa73a024
-DIST sof-firmware-1.9.tar.gz 3470302 BLAKE2B 597467915a658beda5611177c550b51a15720dfde23f1a55ea91217e7e809ff5c6417c6cc449e5d4a1732ffc03f9f817407951410646c9431ec189e8b141f60e SHA512 aee733381edb2150f2132c296e9151b1d6a71246e204b15c2394587c528286f730ceaf02002e1e58ccea0deba5e4ae81cb7a03efb858ac954633b0cfaec81a22
-EBUILD sof-firmware-1.6.1.ebuild 641 BLAKE2B 3ec766a6799d4a6e482522d79c8d985f4927240b31553578b1aa9edd314a8900d11aba8c89cf1a8d2cb49fe01e9c56719768cb6bbfad38e7a865a4f24ee53d7e SHA512 7433f8983f80b1fa8b7af27e50c8036d860ad16149917fd6457521166797e846fcbd2ae54936388bab1d36965dc3ba5570d83f75228e9e9adcc89c7e44b3b642
+DIST sof-firmware-2.1.1.tar.gz 4056718 BLAKE2B 0246f6240504d3e8b609b402c41ffe6ed9b8350b6a31c6567851069354e5de5b4ca6d803e78fdde77cdaba7be87c8a8923b2d0fdd0544fd3b28d1e332cd59b63 SHA512 77e9562f67014d78b213fe428edef6a08dcc058a9a762da09a486c002c3aa0b907ea7c8ba6d4f88f5ddab5e564de06df9f2ed77206341a0fe2e1aaab1d9740ce
 EBUILD sof-firmware-1.9.3-r1.ebuild 721 BLAKE2B d4621f609e37290410c46fc89a8f9e7f472439b001e6f2e0ac3b2f9197579dea2870efaf75f4912cbc886892bc3d4fa95e32527eefaac1fb48b93600b38f24a0 SHA512 556aefe2f7bd6128de89891689e6843acb7f5b23acd424dc112266b7a6eed1081cd39f3bf47fa0a49269582d09d1237edf24908ff7898b9093c03cc5a4a834b5
-EBUILD sof-firmware-1.9.ebuild 657 BLAKE2B 3f95821a60304502fefe03f615462cc7103283019799634db50953d903dce7faea714a5ee5a53cd005880ce54915b42442db35a9adfcbc504183cefcd62af761 SHA512 c97d3b1d28a8581ab60622f1843bf5168a36697744817d8a9a650114e6a7246941c6727489ba2f8e015c3838c7321b9532ccb95410e2c92554800391b1bea58b
+EBUILD sof-firmware-2.1.1-r1.ebuild 899 BLAKE2B 6510a99bbadde60caad29440742a93c9f31878f65122f428f991efab01e2fbe9c13ffb26dd3e80b19f9b5556536f17e386b58db60d38867846690c7e5bd4f7d2 SHA512 91a698791d36560e74d1bed08fa1bc26f64788985efaa99f9cfd80d9bf6a9c78a29b573ed161d7724a5870e1d55a55150352ade276e4aea2f485d2bff0f0d288
 MISC metadata.xml 218 BLAKE2B b13b149202bf20882c38ce2cfd0e1c4ea9a15f584ff819022fd74261c2f73dc52efe21fe1e621fd84406527ab86bd29147ef34c895ccf9de3596ce58cb59d846 SHA512 068fda6c090090d62a719b26812505efa881b855004ed63dea86b1ee9b698d5d6ccd3210366e7cfa886f886c77e31b90cd69ec015e67286ce0611483304e798f
diff --git a/sys-firmware/sof-firmware/sof-firmware-1.6.1.ebuild b/sys-firmware/sof-firmware/sof-firmware-1.6.1.ebuild
deleted file mode 100644
index d62dacb90048..000000000000
--- a/sys-firmware/sof-firmware/sof-firmware-1.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sound Open Firmware (SOF) binary files"
-
-HOMEPAGE="https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin"
-SRC_URI="https://github.com/thesofproject/sof-bin/archive/stable-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-S=${WORKDIR}/sof-bin-stable-v${PV}
-
-src_compile() {
-	sed -i -e '1i #!/bin/bash\nset -e' go.sh || die
-}
-
-src_install() {
-	mkdir -p "${D}/lib/firmware/intel" || die
-	SOF_VERSION=v${PV} ROOT=${D} ${S}/go.sh || die
-}
diff --git a/sys-firmware/sof-firmware/sof-firmware-1.9.ebuild b/sys-firmware/sof-firmware/sof-firmware-2.1.1-r1.ebuild
index 73dbc489b0e4..b51c9026bd32 100644
--- a/sys-firmware/sof-firmware/sof-firmware-1.9.ebuild
+++ b/sys-firmware/sof-firmware/sof-firmware-2.1.1-r1.ebuild
@@ -1,23 +1,33 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Sound Open Firmware (SOF) binary files"
-
 HOMEPAGE="https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin"
 SRC_URI="https://github.com/thesofproject/sof-bin/releases/download/v${PV}/sof-bin-v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/sof-bin-v${PV}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S=${WORKDIR}/sof-bin-v${PV}
+# Needed for sof-ctl
+RDEPEND="media-libs/alsa-lib"
 
-QA_PREBUILT="/usr/bin/sof-logger"
+QA_PREBUILT="usr/bin/sof-ctl
+	usr/bin/sof-logger
+	usr/bin/sof-probes"
 
 src_install() {
 	dodir /lib/firmware/intel
 	dodir /usr/bin
 	FW_DEST="${D}/lib/firmware/intel" TOOLS_DEST="${D}/usr/bin" "${S}/install.sh" v${PV} || die
 }
+
+pkg_preinst() {
+	local sofpath="${EROOT}/lib/firmware/intel/sof"
+	if [[ ! -L "${sofpath}" && -d "${sofpath}" ]] ; then
+		rm -r "${sofpath}" || die
+	fi
+}