gentoo resync : 20.10.2021

5 files changed, 26 insertions, 96 deletions

diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index 3bf6a488f9b5..cfe481132549 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -1,20 +1,5 @@
-DIST sof-firmware-1.4.2-sof-apl-v1.4.2.ldc 73536 BLAKE2B 48d52c5cd9a65ddacac2c69a5b455fc6073125e504925a35bcd67168ab7d6caef91fd874d7a1b5434b4b9d340746479bc2c87e04287cd04113a959f6b08e8d65 SHA512 9cd9ba944511f708f186c86d66f0a0af64b441b1d204fcbb52c38e0b052f3baeea03a45b069a6c77d22ba2c178df845762b1cbede62b71aa481334b982a93d2d
-DIST sof-firmware-1.4.2-sof-apl-v1.4.2.ri 282624 BLAKE2B b818b9a422fddb6ff46f649fc0fc21a1327745b1b059a74ffa9ab3c5dc82ef83560010fac0ee8dc73b63a6ebc46bb992a0b572c0e844f7a913b3837fe6c77afd SHA512 53ec06f5ac3d0e3aad5e4a4916e228e8aacc030c7e19fdf5f64ea3438bdfc318359164fc9791b27b4b07001e02e41e1f64aae4b00b441b44caadf4f6ef8f0b3b
-DIST sof-firmware-1.4.2-sof-bdw.ldc 61176 BLAKE2B 79ba2b04a76eb1e97962194963d33d2ff927427aff09c019f2e6f9e68e599abef8bcc63e4e218cd4828d2fd3cb1bcde1c5da4b9f94be74fe1e6201d55dfaa6a8 SHA512 b2bda94e8397f6439b14ed581430bb02b735c002f876cda8e25076f80a12d6550123cad5b872c2cdc6c6a9a9a6946c16cd824c3c9ca2ca00e669c97d25e12451
-DIST sof-firmware-1.4.2-sof-bdw.ri 109616 BLAKE2B 6519f0e8d1d4c63abec67ab454bae480c7908267bec70b0edd3b69ae6ff346e10efa5f27236034879b5f3401aa6ba82f0b91502f07411d78164532e946184ed3 SHA512 77a0ab8051f5b2a5021cd398e6f550b68700e98d6f5f8c2f6676d2fc9ba51ca74b6bf48abc49e6619a5b60483d22cd91af7bc989efe989bf759a85aa2f634db7
-DIST sof-firmware-1.4.2-sof-byt.ldc 40976 BLAKE2B 3b43f4da1c30635b044abf781430584e966d35ddac35536bdd4fcaa211f9c637527aeb928569d0149e5ef0a161759a23d424dcb7f75061a84878b5776682fbd8 SHA512 924d2a6bab3dbade14d2d004d690e3bbf334db765a544941dee315b38946ee841f38739613198276a5e41109a5b26b7083dba044d35b93d7da3dce3116cf386a
-DIST sof-firmware-1.4.2-sof-byt.ri 88164 BLAKE2B 425a9615f49aabbc0aec157487b5f1a04f0d45efdbf34bf6ca8882c09512e5a75075399ad7761028f00a763b6fbb6c13905184684ef1b2c7d3be3b17cebf5184 SHA512 70a0674aaa6bb08fe2ed3d089c75532c2228b851d8f026489024f52db2bdbbec0ab68dc70657422336a102d3fe5908a6fa05ab0b670803a4a2cc7b6428f04d17
-DIST sof-firmware-1.4.2-sof-cht.ldc 40976 BLAKE2B 3b43f4da1c30635b044abf781430584e966d35ddac35536bdd4fcaa211f9c637527aeb928569d0149e5ef0a161759a23d424dcb7f75061a84878b5776682fbd8 SHA512 924d2a6bab3dbade14d2d004d690e3bbf334db765a544941dee315b38946ee841f38739613198276a5e41109a5b26b7083dba044d35b93d7da3dce3116cf386a
-DIST sof-firmware-1.4.2-sof-cht.ri 88972 BLAKE2B a0f4eb77c84cb2f20926a501e6333c9d223e2680320a3ee1d279288ff79e699a7b46a9e47e4a864abdf55dc4cd85851134d0582e972b15d03316235d919323e7 SHA512 3e26e74708f677dd3e1b1e75ee1664b8ebff5185af32174771bcedc62189bd2469f03bf168033bc426fa8b6d3f4d42fea7c423d6678977acc9def5ee0c78f58a
-DIST sof-firmware-1.4.2-sof-cnl-v1.4.2.ldc 74704 BLAKE2B d94e91760e02124ed74e27cba74e5fa63ce012562fdcdbb00aec5f29bf9e9ffb890eefbad9c13b13a70f9747f8600441f7511e14fac535aa42dd6ebf331ae3fd SHA512 345336ed952c02c6dd2f442067cc30480398bf2faeb588d6bfda1c0d099cf40bd9c14ecc63ce53facdb9b1c501410238f2f276340af3d90ce3969f604a8885a7
-DIST sof-firmware-1.4.2-sof-cnl-v1.4.2.ri 286720 BLAKE2B d0385ad6d73503cc62e1c284ebf92f08fb7a73115b1889d8054a59a94468f56eef1a47490870d0e58b6e3f0a38d22a26a46aeeeb788a028ee3982cfcfce292b1 SHA512 3b4ba753ce1652f068c1a78d38b6c03b3fa08e9f829ff78a71efa8708ede2a08b0baf9b3f70b91f8efff8d595a64e46eaa8ac43b33c8fcebf96cbde50db0679d
-DIST sof-firmware-1.4.2-sof-icl-v1.4.2.ldc 74240 BLAKE2B f2729a3dd3e4b33c7c0fc7ef9ee11b19d9ad1016e8d94706285420eb0fe3dd9f9e725d4d2f2a61dc2c3d129d336050da784e3e0c027bd19915af329c993d4cce SHA512 e6d520f300079175e9602bc01ab6f91d742ea8afabdf4f0ef49f08d6dfa0ecf791825d8839b0e0f84055cdd09e23faa53ec87aede7a40da6c043da430582a487
-DIST sof-firmware-1.4.2-sof-icl-v1.4.2.ri 286720 BLAKE2B 1acbfb116be92f6934980ac8ac9d28d603ac623337ad9e1156dffa07e803f609982e25cb50cceb1a00f38900053ba2efde9769ec5a4ce57250b3ad278adff9fb SHA512 3f301ec5b532b130889d7973b3a7b21e14857f6b9b355d5e29339148ead94aef3d6646c809fafe3b3e5ea49a363109e4919cfe1ac4025a0ddf23b670702a1ef2
-DIST sof-firmware-1.4.2-sof-imx8.ldc 60848 BLAKE2B a17be83147fa58eb71698e9d7306d918e398097b9935e3a2160056a49b78ef2dcbd01d2984853813b4628e6f2810bf7ab7f5e82b0e5f804c4fd671ed37042b06 SHA512 42c548368de0eee13e95a303ccea051a4909a3e47ee497c4c7ea304778d1518723ccd4ccebdd6588c58990bf3cb18ea310cfa05025e4ba9b9b28faccbff5bb2a
-DIST sof-firmware-1.4.2-sof-imx8.ri 115472 BLAKE2B ffb9fabdb388354b409881489594c411cc3c0fcbabb05688585696ad7b15f4a54a3f2786df811217b81cff210088e7e67ef1ae5e54c3e4e7827c69aa32ca5f87 SHA512 86e267cdd8fe835bdab7e082f0e9c527e8283757759c70069af52d4e23440439565380b10011fb746afed13a3fb2f1aadcaf54e45740b08b40a1f5455b57e05b
-DIST sof-firmware-1.5.1.tar.gz 1611811 BLAKE2B 7408ba12f1375cb3d6c20e1654be225e8ab11e8b1471c54bd0a498ed1fad11954c57f68a7e483223117c5469278507b1d05e077420a1f58efb2eb0d2b4e95078 SHA512 0e3273f681dc3c0ee075bfb10e689e7ae8d8c0604f9d849f5bd991793d272e06ce7664a0b5829a9b93993d0576683824ee0ac5f8d1efe0b94a705a3e7ae34903
 DIST sof-firmware-1.6.1.tar.gz 3033953 BLAKE2B 0c33bd9a5d17c3b889219bf926d3619e3e448ff6b16e39b4caffe19e87c98d1227b303ebe80d185f93480ead29f37de39093f3e76f275df7836d3250ae47c566 SHA512 71acd34662ffd4d93f6111dfd046ed358184fdf24d0e118da43770aeee45bd15105b688bc5a569f2cb7941724ec822d2cfbab8a08e9caee1a77aa5763ac7b48e
-EBUILD sof-firmware-1.4.2.ebuild 841 BLAKE2B b172de0cd4c5e24416eb66eab28376d6cbdf27fbcb23aae9df844203f3be7247faf5e3adb77f3b7cc9f66cd8da7f0ba4f040d92335f41350224692676ae2f86d SHA512 53b90e002111c5f0359ac55e505810a06f57a660138a4f5dec3c57e10c6c77415b91779e6de36f60b4e6f9a3307241c671ab13d7ca6b420483e447bf328497c7
-EBUILD sof-firmware-1.5.1.ebuild 678 BLAKE2B fb603fefd24e027b76b47430abb2c84dd25a108447ac3cad7b24cd6ecfd6bddb49a5dd83e33abd73ebf74591a4c1647ede7d2f321c8cff201c190dcbce56058b SHA512 04215ec02969c0f3a7ae84faa8f06a6567b999ca91761720c02d4cb981f0cfd76d338e8e83ae5b3d5988d48e06d92fde8eb33c078af05c72644b0f2a9105d2ba
+DIST sof-firmware-1.9.tar.gz 3470302 BLAKE2B 597467915a658beda5611177c550b51a15720dfde23f1a55ea91217e7e809ff5c6417c6cc449e5d4a1732ffc03f9f817407951410646c9431ec189e8b141f60e SHA512 aee733381edb2150f2132c296e9151b1d6a71246e204b15c2394587c528286f730ceaf02002e1e58ccea0deba5e4ae81cb7a03efb858ac954633b0cfaec81a22
 EBUILD sof-firmware-1.6.1.ebuild 641 BLAKE2B 3ec766a6799d4a6e482522d79c8d985f4927240b31553578b1aa9edd314a8900d11aba8c89cf1a8d2cb49fe01e9c56719768cb6bbfad38e7a865a4f24ee53d7e SHA512 7433f8983f80b1fa8b7af27e50c8036d860ad16149917fd6457521166797e846fcbd2ae54936388bab1d36965dc3ba5570d83f75228e9e9adcc89c7e44b3b642
-MISC metadata.xml 295 BLAKE2B 9a339c92348fdc012a527b688c0b940791d106fe3e3399bda8c202e79180938e7638c8894a017ddff0fa11c946ed381016d3b2191554588f791930f40de381d5 SHA512 c7c4bf9a238eb7a199f21909bb3ce84252900e4f808bcd65fcc657e78c820b2495f67111c4f77b496dd0315eae7ae47e0e401f8e3841f888ce389ef7efb40aaa
+EBUILD sof-firmware-1.9.ebuild 657 BLAKE2B 3f95821a60304502fefe03f615462cc7103283019799634db50953d903dce7faea714a5ee5a53cd005880ce54915b42442db35a9adfcbc504183cefcd62af761 SHA512 c97d3b1d28a8581ab60622f1843bf5168a36697744817d8a9a650114e6a7246941c6727489ba2f8e015c3838c7321b9532ccb95410e2c92554800391b1bea58b
+MISC metadata.xml 218 BLAKE2B b13b149202bf20882c38ce2cfd0e1c4ea9a15f584ff819022fd74261c2f73dc52efe21fe1e621fd84406527ab86bd29147ef34c895ccf9de3596ce58cb59d846 SHA512 068fda6c090090d62a719b26812505efa881b855004ed63dea86b1ee9b698d5d6ccd3210366e7cfa886f886c77e31b90cd69ec015e67286ce0611483304e798f
diff --git a/sys-firmware/sof-firmware/metadata.xml b/sys-firmware/sof-firmware/metadata.xml
index 787640b90d49..437d32a9f916 100644
--- a/sys-firmware/sof-firmware/metadata.xml
+++ b/sys-firmware/sof-firmware/metadata.xml
@@ -4,7 +4,4 @@
 <maintainer type="project">
 <email>alsa-bugs@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
-<email>dilfridge@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/sys-firmware/sof-firmware/sof-firmware-1.4.2.ebuild b/sys-firmware/sof-firmware/sof-firmware-1.4.2.ebuild
deleted file mode 100644
index fc321654b92d..000000000000
--- a/sys-firmware/sof-firmware/sof-firmware-1.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 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"
-
-MY_FILELIST=(
-	sof-apl-v${PV}.ldc
-	sof-apl-v${PV}.ri
-	sof-bdw.ldc
-	sof-bdw.ri
-	sof-byt.ldc
-	sof-byt.ri
-	sof-cht.ldc
-	sof-cht.ri
-	sof-cnl-v${PV}.ldc
-	sof-cnl-v${PV}.ri
-	sof-icl-v${PV}.ldc
-	sof-icl-v${PV}.ri
-	sof-imx8.ldc
-	sof-imx8.ri
-)
-MY_SRC_URI_BASE="https://github.com/thesofproject/sof/releases/download/v${PV}"
-
-for my_file in "${MY_FILELIST[@]}" ; do
-	SRC_URI+="${MY_SRC_URI_BASE}/${my_file} -> ${P}-${my_file}  "
-done
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	insinto /lib/firmware
-	for my_name in ${A} ; do
-		newins "${DISTDIR}/${my_name}" "${my_name#${P}-}"
-	done
-}
diff --git a/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild b/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild
deleted file mode 100644
index b3ae03432846..000000000000
--- a/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 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' \
-		   -e '/^ROOT=/d' \
-		   -e "s/^VERSION=.*/VERSION=v${PV}/" go.sh || die
-}
-
-src_install() {
-	mkdir -p ${D}/lib/firmware || die
-	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-1.9.ebuild
new file mode 100644
index 000000000000..73dbc489b0e4
--- /dev/null
+++ b/sys-firmware/sof-firmware/sof-firmware-1.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S=${WORKDIR}/sof-bin-v${PV}
+
+QA_PREBUILT="/usr/bin/sof-logger"
+
+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
+}