From b4896b596eee9d0b91e904a488bf06ee671a74f4 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Wed, 7 Dec 2022 21:36:14 -0500
Subject: [PATCH] remove old broadcom handling stuff

---
 .../broadcom-firmware-downloader/Manifest     |  3 --
 ...broadcom-firmware-downloader-0.1-r2.ebuild | 29 -----------
 .../broadcom-firmware-downloader-0.2.ebuild   | 29 -----------
 .../broadcom-firmware-installer-0.1-r3.ebuild | 51 -------------------
 .../broadcom-firmware-installer-0.2.ebuild    | 51 -------------------
 .../base/package.accept_keywords/net-wireless |  2 -
 6 files changed, 165 deletions(-)
 delete mode 100644 net-wireless/broadcom-firmware-downloader/Manifest
 delete mode 100644 net-wireless/broadcom-firmware-downloader/broadcom-firmware-downloader-0.1-r2.ebuild
 delete mode 100644 net-wireless/broadcom-firmware-downloader/broadcom-firmware-downloader-0.2.ebuild
 delete mode 100644 net-wireless/broadcom-firmware-installer/broadcom-firmware-installer-0.1-r3.ebuild
 delete mode 100644 net-wireless/broadcom-firmware-installer/broadcom-firmware-installer-0.2.ebuild

diff --git a/net-wireless/broadcom-firmware-downloader/Manifest b/net-wireless/broadcom-firmware-downloader/Manifest
deleted file mode 100644
index e12171207..000000000
--- a/net-wireless/broadcom-firmware-downloader/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST broadcom-wl-4.150.10.5.tar.bz2 3888794 BLAKE2B b6ec04e4269527d26fccef24cb3c5c165d92f316fdb4a711d5b4ffd7d346e2aa597c12b8208a15079ea8f5a255f6bf5fa5fd15e0931149ef3fce9462925bd489 SHA512 0ada0cd0446fcc7f753945d1a18eb31844ed45a137df679f2acba85f02e2acb1e3e8bde6241ac9ca2bedee1f74a018682de13fe4e185aced603547a6e03f7a3e
-DIST broadcom-wl-5.100.138.tar.bz2 13514651 BLAKE2B 3f29c09f8c58290c1fadd1ab4ceb9c8606e27b828363056d21e48adcdd6e28d3a7326f4ef6ac3fa13353da138f6af5fe7bde88308e21f0fd6754106189cf12da SHA512 02487e76e3eca7fe97ce2ad7dc9c5d39fac82b8d5f7786cce047f9c85e2426f5b7ea085d84c7d4aae43e0fe348d603e3229211bab601726794ef633441d37a8b
-DIST wl_apsta-3.130.20.0.o 652866 BLAKE2B bfe92320ffe506e7ed1fda889ae5bdf2a760dedde152bf97e0434a8577c85df31a5a940fa9c032375c4f7520b254eedc9433b90073402d40cd807a9b1b0b1cfa SHA512 d89ed52045307449bbae79a4d1807cc6cd89ae67c4a22e8e8aa51c1396edbb6ed8b157cd0756faf8b660a537b48b62117c57967f2048245b5b102d9d9bca4bbd
diff --git a/net-wireless/broadcom-firmware-downloader/broadcom-firmware-downloader-0.1-r2.ebuild b/net-wireless/broadcom-firmware-downloader/broadcom-firmware-downloader-0.1-r2.ebuild
deleted file mode 100644
index 703f3a2e1..000000000
--- a/net-wireless/broadcom-firmware-downloader/broadcom-firmware-downloader-0.1-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-DESCRIPTION="Closed Broadcom Commercial Firmware Downloader"
-HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
-SRC_URI="b43? ( http://mirror2.openwrt.org/sources/broadcom-wl-4.150.10.5.tar.bz2 )
-	b43legacy? ( http://downloads.openwrt.org/sources/wl_apsta-3.130.20.0.o )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="+b43 +b43legacy"
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="net-wireless/b43-fwcutter"
-
-src_install() {
-	dodir /lib/firmware/broadcom-unmodified || die "failed to create dir"
-	insinto /lib/firmware/broadcom-unmodified
-	if use b43; then doins "${WORKDIR}"/broadcom-wl-4.150.10.5/driver/wl_apsta_mimo.o || die "failed to install b43 files"; fi;
-	if use b43legacy; then doins "${DISTDIR}"/wl_apsta-3.130.20.0.o || die "failed to install b43legacy files"; fi;
-	einfo "Unmolested Broadcom firmware files have been downloaded from openwrt and stored on the hdd."
-	einfo "No changes to the files have been made, only unmodified files have been distributed."
-	einfo "If the user wishes these firmware in a useful way then emerge broadcom-firmware-installer."
-}
diff --git a/net-wireless/broadcom-firmware-downloader/broadcom-firmware-downloader-0.2.ebuild b/net-wireless/broadcom-firmware-downloader/broadcom-firmware-downloader-0.2.ebuild
deleted file mode 100644
index 3410464a6..000000000
--- a/net-wireless/broadcom-firmware-downloader/broadcom-firmware-downloader-0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-DESCRIPTION="Closed Broadcom Commercial Firmware Downloader"
-HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
-SRC_URI="b43? ( http://www.lwfinger.com/b43-firmware/broadcom-wl-5.100.138.tar.bz2 )
-	b43legacy? ( http://downloads.openwrt.org/sources/wl_apsta-3.130.20.0.o )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="+b43 +b43legacy"
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="net-wireless/b43-fwcutter"
-
-src_install() {
-	dodir /lib/firmware/broadcom-unmodified || die "failed to create dir"
-	insinto /lib/firmware/broadcom-unmodified
-	if use b43; then doins "${WORKDIR}"/broadcom-wl-5.100.138/linux/wl_apsta.o || die "failed to install b43 files"; fi;
-	if use b43legacy; then doins "${DISTDIR}"/wl_apsta-3.130.20.0.o || die "failed to install b43legacy files"; fi;
-	einfo "Unmolested Broadcom firmware files have been downloaded from openwrt and stored on the hdd."
-	einfo "No changes to the files have been made, only unmodified files have been distributed."
-	einfo "If the user wishes these firmware in a useful way then emerge broadcom-firmware-installer."
-}
diff --git a/net-wireless/broadcom-firmware-installer/broadcom-firmware-installer-0.1-r3.ebuild b/net-wireless/broadcom-firmware-installer/broadcom-firmware-installer-0.1-r3.ebuild
deleted file mode 100644
index e87736c71..000000000
--- a/net-wireless/broadcom-firmware-installer/broadcom-firmware-installer-0.1-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-DESCRIPTION="Closed Broadcom Commercial Firmware Installer"
-HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="+b43 +b43legacy +reload"
-
-DEPEND="<net-wireless/broadcom-firmware-downloader-0.2[b43?,b43legacy?]
-	net-wireless/b43-fwcutter"
-RDEPEND=""
-
-#add a check in src_prepare or something to check kernel versions. we don't care, but gentoo will and we like that.
-
-pkg_setup() {
-	ewarn "User action is installing the broadcom commercial firmware."
-	ewarn "Broadcom prohibits the distribution of firmware in a"
-	ewarn "usable form for Linux users."
-	epause 5
-}
-
-src_install() {
-	dodir /lib/firmware || die "failed to create /lib/firmware"
-	FIRMWARE_INSTALL_DIR="${D}/lib/firmware"
-	use b43 && b43-fwcutter -w "${FIRMWARE_INSTALL_DIR}" "${ROOT}"/lib/firmware/broadcom-unmodified/wl_apsta_mimo.o || die "failed to cut xxx firmware"
-	use b43legacy && b43-fwcutter -w "${FIRMWARE_INSTALL_DIR}" "${ROOT}"/lib/firmware/broadcom-unmodified/wl_apsta-3.130.20.0.o || die "failed to cut xxx firmware"
-}
-
-pkg_postinst(){
-	if use reload; then
-		isloaded() {
-			lsmod | grep -q "$1[^_-]"
-		}
-		isloaded b43 && modprobe -r b43 && sleep 2 && modprobe b43
-		isloaded b43legacy && modprobe -r b43legacy && sleep 2 && modprobe b43legacy
-
-		einfo "Your disgusting Broadcom now has its filthy closed source firmware. I hope you are happy."
-	else
-		einfo "You need to reload your b43* modules manually or set the reload use flag"
-	fi
-
-	ewarn "Firmware has been installed and is NOT permitted to be redistributed. Just don't do it."
-	epause 5
-}
diff --git a/net-wireless/broadcom-firmware-installer/broadcom-firmware-installer-0.2.ebuild b/net-wireless/broadcom-firmware-installer/broadcom-firmware-installer-0.2.ebuild
deleted file mode 100644
index d099f282c..000000000
--- a/net-wireless/broadcom-firmware-installer/broadcom-firmware-installer-0.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-DESCRIPTION="Closed Broadcom Commercial Firmware Installer"
-HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="+b43 +b43legacy +reload"
-
-DEPEND=">=net-wireless/broadcom-firmware-downloader-0.2[b43?,b43legacy?]
-	>=net-wireless/b43-fwcutter-015"
-RDEPEND=""
-
-#add a check in src_prepare or something to check kernel versions. we don't care, but gentoo will and we like that.
-
-pkg_setup() {
-	ewarn "User action is installing the broadcom commercial firmware."
-	ewarn "Broadcom prohibits the distribution of firmware in a"
-	ewarn "usable form for Linux users."
-	epause 5
-}
-
-src_install() {
-	dodir /lib/firmware || die "failed to create /lib/firmware"
-	FIRMWARE_INSTALL_DIR="${D}/lib/firmware"
-	use b43 && b43-fwcutter -w "${FIRMWARE_INSTALL_DIR}" "${ROOT}"/lib/firmware/broadcom-unmodified/wl_apsta.o || die "failed to cut xxx firmware"
-	use b43legacy && b43-fwcutter -w "${FIRMWARE_INSTALL_DIR}" "${ROOT}"/lib/firmware/broadcom-unmodified/wl_apsta-3.130.20.0.o || die "failed to cut xxx firmware"
-}
-
-pkg_postinst(){
-	if use reload; then
-		isloaded() {
-			lsmod | grep -q "$1[^_-]"
-		}
-		isloaded b43 && modprobe -r b43 && sleep 2 && modprobe b43
-		isloaded b43legacy && modprobe -r b43legacy && sleep 2 && modprobe b43legacy
-
-		einfo "Your disgusting Broadcom now has its filthy closed source firmware. I hope you are happy."
-	else
-		einfo "You need to reload your b43* modules manually or set the reload use flag"
-	fi
-
-	ewarn "Firmware has been installed and is NOT permitted to be redistributed. Just don't do it."
-	epause 5
-}
diff --git a/profiles/pentoo/base/package.accept_keywords/net-wireless b/profiles/pentoo/base/package.accept_keywords/net-wireless
index 569cedcc7..daa100cf4 100644
--- a/profiles/pentoo/base/package.accept_keywords/net-wireless
+++ b/profiles/pentoo/base/package.accept_keywords/net-wireless
@@ -138,8 +138,6 @@ net-wireless/b43-fwcutter
 net-wireless/bcm43xx-fwcutter
 net-wireless/bluez-firmware
 net-wireless/bluez-hcidump
-net-wireless/broadcom-firmware-downloader
-net-wireless/broadcom-firmware-installer
 net-wireless/bss
 net-wireless/fsam7400
 net-wireless/grimwepa