commit:     d948ea524e2f2a1bc6aabfe2a789c776830271ec
Author:     David Michael <fedora.dm0 <AT> gmail <DOT> com>
AuthorDate: Sat Apr 24 16:50:58 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 16:50:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d948ea52

sys-firmware/b43-firmware: EAPI 7

Closes: https://bugs.gentoo.org/785271
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../b43-firmware/b43-firmware-5.100.138.ebuild     | 22 +++++++++-------------
 .../b43-firmware/b43-firmware-6.30.163.46.ebuild   | 22 +++++++++-------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild 
b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
index e7c4514e2b3..47c6005c7db 100644
--- a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
+++ b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-: ${B43_FIRMWARE_SRC_OBJ:=wl_apsta.o}
+EAPI=7
 
 MY_P="broadcom-wl-${PV}"
+
 DESCRIPTION="broadcom firmware for b43 LP PHY and >=linux-3.2"
 HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43";
 SRC_URI="http://www.lwfinger.com/b43-firmware/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Broadcom"
 SLOT="b43"
 KEYWORDS="amd64 ~arm64 ppc x86"
-IUSE=""
-RESTRICT="binchecks strip bindist"
+RESTRICT="binchecks bindist strip"
 
-DEPEND=">=net-wireless/b43-fwcutter-015"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
+BDEPEND=">=net-wireless/b43-fwcutter-015"
 
 src_compile() {
-       mkdir ebuild-output
-       b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || 
die
+       mkdir ebuild-output || die
+       b43-fwcutter -w ebuild-output linux/wl_apsta.o || die
 }
 
 src_install() {
        insinto /lib/firmware
-       doins -r ebuild-output/*
+       doins -r ebuild-output/.
 }

diff --git a/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild 
b/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
index 5dc8e46d721..87020a58501 100644
--- a/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
+++ b/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-: ${B43_FIRMWARE_SRC_OBJ:=*wl_apsta.o}
+EAPI=7
 
 MY_P="broadcom-wl-${PV}"
+
 DESCRIPTION="broadcom firmware for b43 LP PHY and >=linux-3.2"
 HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43";
 SRC_URI="http://www.lwfinger.com/b43-firmware/${MY_P}.tar.bz2";
+S="${WORKDIR}"
 
 LICENSE="Broadcom"
 SLOT="b43"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-RESTRICT="binchecks strip bindist"
+RESTRICT="binchecks bindist strip"
 
-DEPEND=">=net-wireless/b43-fwcutter-015"
-RDEPEND=""
-
-S="${WORKDIR}"
+BDEPEND=">=net-wireless/b43-fwcutter-015"
 
 src_compile() {
-       mkdir ebuild-output
-       b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || 
die
+       mkdir ebuild-output || die
+       b43-fwcutter -w ebuild-output ${MY_P}.wl_apsta.o || die
 }
 
 src_install() {
        insinto /lib/firmware
-       doins -r ebuild-output/*
+       doins -r ebuild-output/.
 }

Reply via email to