From e7c651552294dad4aa0c9ded182764902e7f6190 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 23 Apr 2021 14:12:55 -0400 Subject: [PATCH 2/2] 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 --- .../b43-firmware/b43-firmware-5.100.138.ebuild | 15 ++++++--------- .../b43-firmware/b43-firmware-6.30.163.46.ebuild | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 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..0d185ab776f 100644 --- a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild +++ b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild @@ -1,29 +1,26 @@ -# 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" +RESTRICT="binchecks bindist strip" + LICENSE="Broadcom" SLOT="b43" KEYWORDS="amd64 ~arm64 ppc x86" -IUSE="" -RESTRICT="binchecks strip bindist" -DEPEND=">=net-wireless/b43-fwcutter-015" -RDEPEND="" +BDEPEND=">=net-wireless/b43-fwcutter-015" S="${WORKDIR}/${MY_P}" src_compile() { mkdir ebuild-output - b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || die + b43-fwcutter -w ebuild-output linux/wl_apsta.o || die } src_install() { 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..676a7cfbac7 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,29 +1,26 @@ -# 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" +RESTRICT="binchecks bindist strip" + LICENSE="Broadcom" SLOT="b43" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -RESTRICT="binchecks strip bindist" -DEPEND=">=net-wireless/b43-fwcutter-015" -RDEPEND="" +BDEPEND=">=net-wireless/b43-fwcutter-015" S="${WORKDIR}" src_compile() { mkdir ebuild-output - b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || die + b43-fwcutter -w ebuild-output "${MY_P}.wl_apsta.o" || die } src_install() { -- 2.26.3