commit:     4e00265885e64f14d83e1c88bd5e517f6740229d
Author:     Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
AuthorDate: Mon Aug  9 13:19:41 2021 +0000
Commit:     Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
CommitDate: Mon Aug  9 13:19:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4e002658

sys-firmware/pinephone-firmware: Fixed copy error

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Gerben jan Dijkman <gjdijkman <AT> gjdwebserver.nl>

 sys-firmware/pinephone-firmware/Manifest           |  3 +--
 .../pinephone-firmware-20201030.ebuild             | 22 ----------------------
 .../pinephone-firmware-20210809.ebuild             |  8 ++++----
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/sys-firmware/pinephone-firmware/Manifest 
b/sys-firmware/pinephone-firmware/Manifest
index 36610cff4..c72116b62 100644
--- a/sys-firmware/pinephone-firmware/Manifest
+++ b/sys-firmware/pinephone-firmware/Manifest
@@ -1,4 +1,3 @@
 DIST anx7688-fw.bin 220344 BLAKE2B 
ff4f3aa6a01c77c687edc4a8dcef8f32754838354497c5b92ec54564b95ed02e737b411d24d14b79c49b186271536e22b1ef6a65f7eda21ed2b55d4500a3bf6a
 SHA512 
d17155a48ce0916d788f763e5a46e1a3a069970f3ec7d3404bc56a7da89d423682050ba7bf4993b222ace609202bdbddf42a0b4506c4193b03bc324c8cfe1be4
 DIST ov5640_af.bin 30768 BLAKE2B 
cfac7640de622e59cdae83d63ce853805ced6801c007ac124cd23e368fb3a0faae5dec6509b2b3cc6e5fc7fe607a547f1fb68f4c4e33b4f5f8014edd66d25970
 SHA512 
e5d6493c4b9714ec1b96d07efdfcf14b32aecdc1778993d97e71d7d9458c709211d0673788302a336b99a8de7287efe4df5ccd3bf617608efdf3d326d3b16153
-DIST pinephone-firmware-20201030.tar.gz 21318 BLAKE2B 
a74649ec4bce9d9601a6989dd083a9253db5f48aadfe98c17099a1c616a63b46cc60e25218d9eb7915c6d9f9ec69f72639a5ca61cbbc0934cf5bf212b063c773
 SHA512 
a31f7da484961caa47315ef8125f9e49963342b7ee94877bb181c6aa3f704dce46980a1543878a12a635c2b488fe1e1e87c064640ff4a1443757a126809bbb74
-DIST rtl8723cs_xx_fw.bin 169150 BLAKE2B 
9a99b21dca6b49acd90dd54cb7146c501f1a4dfc8246587383d5115d1b9400a271888a4cc3129573abce491a9980b1a0b30cc7f4b7ccccdf6866a399238f4aee
 SHA512 
f77fef9729d9f2971458fda84d44cb7bc2c500eda0155f5f00cca7bc2bc85a17671255abdd000b505f82130fcfa99f3be963539f488b72cc7dd06eca46285878
+DIST rtl8723cs_xx-fw.bin 169150 BLAKE2B 
9a99b21dca6b49acd90dd54cb7146c501f1a4dfc8246587383d5115d1b9400a271888a4cc3129573abce491a9980b1a0b30cc7f4b7ccccdf6866a399238f4aee
 SHA512 
f77fef9729d9f2971458fda84d44cb7bc2c500eda0155f5f00cca7bc2bc85a17671255abdd000b505f82130fcfa99f3be963539f488b72cc7dd06eca46285878

diff --git a/sys-firmware/pinephone-firmware/pinephone-firmware-20201030.ebuild 
b/sys-firmware/pinephone-firmware/pinephone-firmware-20201030.ebuild
deleted file mode 100644
index ed2adeade..000000000
--- a/sys-firmware/pinephone-firmware/pinephone-firmware-20201030.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Firmwares files for PinePhone"
-HOMEPAGE="https://xff.cz/git/linux-firmware";
-SRC_URI="https://github.com/scardracs/gentoo-packages/releases/download/${PV}/${P}.tar.gz";
-
-LICENSE="linux-fw-redistributable no-source-code"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-S="${WORKDIR}"
-
-src_install() {
-       mkdir -p "${D}"/lib/firmware/ || die
-       insinto /lib/firmware/
-       doins anx7688-fw.bin
-       doins ov5640-fw.bin
-       doins rtl8723cs-fw.bin
-}

diff --git a/sys-firmware/pinephone-firmware/pinephone-firmware-20210809.ebuild 
b/sys-firmware/pinephone-firmware/pinephone-firmware-20210809.ebuild
index 22ad346cb..68cc0db1d 100644
--- a/sys-firmware/pinephone-firmware/pinephone-firmware-20210809.ebuild
+++ b/sys-firmware/pinephone-firmware/pinephone-firmware-20210809.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Firmwares files for PinePhone"
 HOMEPAGE="https://xff.cz/git/linux-firmware";
 
SRC_URI="https://xff.cz/git/linux-firmware/tree/ov5640_af.bin?id=4ec2645b007ba4c3f2962e38b50c06f274abbf7c
 -> ov5640_af.bin
 
https://xff.cz/git/linux-firmware/tree/anx7688-fw.bin?id=4ec2645b007ba4c3f2962e38b50c06f274abbf7c
 -> anx7688-fw.bin
-https://xff.cz/git/linux-firmware/tree/rtl_bt/rtl8723cs_xx_fw.bin?id=4ec2645b007ba4c3f2962e38b50c06f274abbf7c
 -> rtl8723cs_xx_fw.bin
+https://xff.cz/git/linux-firmware/tree/rtl_bt/rtl8723cs_xx_fw.bin?id=4ec2645b007ba4c3f2962e38b50c06f274abbf7c
 -> rtl8723cs_xx-fw.bin
 "
 
 LICENSE="linux-fw-redistributable no-source-code"
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 src_install() {
        mkdir -p "${D}"/lib/firmware/ || die
        insinto /lib/firmware/
-       doins anx7688-fw.bin
-       doins ov5640-fw.bin
-       doins rtl8723cs_xx-fw.bin
+       doins "${DISTDIR}"/anx7688-fw.bin
+       doins "${DISTDIR}"/ov5640_af.bin
+       doins "${DISTDIR}"/rtl8723cs_xx-fw.bin
 }

Reply via email to