gentoo auto-resync : 01:10:2023 - 23:44:45

4 files changed, 6 insertions, 41 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 132b5b564e44..93a3bf3b7abd 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index cf2a37171352..3940142697df 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -1,7 +1,5 @@
-DIST sof-firmware-2.2.4.tar.gz 4367865 BLAKE2B cf2896095597ff9a33090307333289d87ea9024f70cd3fd3d1c86232a47ffd95972264754ea6a67c5f57bce33267bb93ab332cd2cd44c96a58c970a176d5fabb SHA512 f631bedbc5cceb0e3a668264c11f4e41f09f140ef909ac2557c4965a0b56deb00fa48ab06987fd2fd06eb97a35bc90342c5d7234d43390257bbd0942a70ce29a
-DIST sof-firmware-2.2.5.tar.gz 4381857 BLAKE2B 681ffbc16d983b795556b00881d59d2a0ba258f89482d6e136ddb61345718802d1b3f7fcc494091337f42f9377a8831d890e2c5de140f083e223f29cc5936742 SHA512 c8a5f846c6ca39b39c1160aaf8c607f301b4e153dadb337b0d3a99c5993a933948a2c2bd80950e6459da4d707c9a5100c11b868d11695bbb7ca56bf86f7fa9db
 DIST sof-firmware-2.2.6.tar.gz 4394096 BLAKE2B 8fa0fb97cfdaa13b30f34f46789bbb1700f4a3be994f11a55226bf617c9ade7ccde931eeb2f263448e355e82f281bbb70c66624a71645062cdfb68bd81a9d3a1 SHA512 33a836fdc9006aead24e14c15703040164b0878d48c6dd32f0a6ae558c99a43c768eb793e308550fd32dfb0e0f93783cff6c42f2618557ebac2a057425115e9e
-EBUILD sof-firmware-2.2.4.ebuild 898 BLAKE2B 3fde21e996f0260ff505da9ff8eda756cb5fe4423e3e7cea97297dda5de1a216a7ec03afeb4023fdb63f70775ebee1cb650f6f42807fb88e979a216e267c2b2c SHA512 8c16acab856a90512b195263796611f98eb4c4c64ef09763a9862b37cd841a438f65ea30d22fbf630f9674d6a07c0ea89f5fdd26677d4d6a5ab93e160a9b1241
-EBUILD sof-firmware-2.2.5.ebuild 898 BLAKE2B 3fde21e996f0260ff505da9ff8eda756cb5fe4423e3e7cea97297dda5de1a216a7ec03afeb4023fdb63f70775ebee1cb650f6f42807fb88e979a216e267c2b2c SHA512 8c16acab856a90512b195263796611f98eb4c4c64ef09763a9862b37cd841a438f65ea30d22fbf630f9674d6a07c0ea89f5fdd26677d4d6a5ab93e160a9b1241
+DIST sof-firmware-2023.09.tar.gz 5451579 BLAKE2B 7535559c6833bd19c15c1f6e6bd88ee5c13ed79f93e0772cdc9df335cf4e89938969bd9babdf8c6cc1321af27e6704477f3a3db3c46295879216fd43358cf5b4 SHA512 7ef81549c76164629400622fa1b512b6061a37b9ba14383d69ac10b2e7dc35c4f35bd6444b15e725c749c23564ec84646960fedcd776b5c2ec11bda3933a633d
 EBUILD sof-firmware-2.2.6.ebuild 898 BLAKE2B 3fde21e996f0260ff505da9ff8eda756cb5fe4423e3e7cea97297dda5de1a216a7ec03afeb4023fdb63f70775ebee1cb650f6f42807fb88e979a216e267c2b2c SHA512 8c16acab856a90512b195263796611f98eb4c4c64ef09763a9862b37cd841a438f65ea30d22fbf630f9674d6a07c0ea89f5fdd26677d4d6a5ab93e160a9b1241
+EBUILD sof-firmware-2023.09.ebuild 890 BLAKE2B 873ac01396737d896766c77952265dee5f7a073a92b431d47c5349acb2d70afd46388027d2ec9c8ed5ee1611e190d6c3103a543995a84ebfd9f5f0a1259a8703 SHA512 bea7af59c2dffa294bb0471fce1b45075f97dee8aea258c2d59e1d8da9e2d80506907ce3feaec18f60923b365a90539fd59ab963f8295f35af738336c48710c1
 MISC metadata.xml 304 BLAKE2B 66a80b69974755eb63ca7f97c3721f87f39f6cd93bdf269cd4ad8f4dd8ce39919ceb2d9ee7fa2963e42d6bee219296f64b79351ac82ef9b11283642fd13c120c SHA512 9cf2218b98365cee88eecba8ae3ff6a61ed724b030accc9f0168fcbf024898c1cd9745223874f80af795c8e7d18230d7d9c4c94cb57928b6c28f7323fbf50af3
diff --git a/sys-firmware/sof-firmware/sof-firmware-2.2.5.ebuild b/sys-firmware/sof-firmware/sof-firmware-2.2.5.ebuild
deleted file mode 100644
index 82f72de46998..000000000000
--- a/sys-firmware/sof-firmware/sof-firmware-2.2.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 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"
-
-# Needed for sof-ctl
-RDEPEND="media-libs/alsa-lib"
-
-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
-}
diff --git a/sys-firmware/sof-firmware/sof-firmware-2.2.4.ebuild b/sys-firmware/sof-firmware/sof-firmware-2023.09.ebuild
index 82f72de46998..ec08a9cf1a8f 100644
--- a/sys-firmware/sof-firmware/sof-firmware-2.2.4.ebuild
+++ b/sys-firmware/sof-firmware/sof-firmware-2023.09.ebuild
@@ -5,12 +5,12 @@ 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}
+SRC_URI="https://github.com/thesofproject/sof-bin/releases/download/v${PV}/sof-bin-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/sof-bin-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 # Needed for sof-ctl
 RDEPEND="media-libs/alsa-lib"
@@ -22,7 +22,7 @@ QA_PREBUILT="usr/bin/sof-ctl
 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
+	FW_DEST="${D}/lib/firmware/intel" TOOLS_DEST="${D}/usr/bin" "${S}/install.sh" || die
 }
 
 pkg_preinst() {