net-wireless/broadcom-sta : revision bump

22 files changed, 8 insertions, 146 deletions

diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r3 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4
index 352766c8..4a232584 100644
--- a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r3
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install
-DEPEND=~sys-kernel/broadcom-sta-dkms-6.30.223.271
+DEPEND=~sys-kernel/bcmwl-dkms-6.30.223.271
 DESCRIPTION=Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
 EAPI=7
 HOMEPAGE=http://www.broadcom.com/support/802.11/
 INHERIT=eutils
 KEYWORDS=amd64 x86
 LICENSE=Broadcom
-RDEPEND=~sys-kernel/broadcom-sta-dkms-6.30.223.271
+RDEPEND=~sys-kernel/bcmwl-dkms-6.30.223.271
 RESTRICT=mirror
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0afd40497cbfd7df3b927a8a85f7e2d8
+_md5_=5c20bc63f2738e6f2f4645ec85921a54
diff --git a/metadata/md5-cache/sys-kernel/bbswitch-dkms-0.8-r2 b/metadata/md5-cache/sys-kernel/bbswitch-dkms-0.8-r2
deleted file mode 100644
index f052b7a2..00000000
--- a/metadata/md5-cache/sys-kernel/bbswitch-dkms-0.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm
-DEPEND=sys-kernel/dkms
-DESCRIPTION=BBswitch sources for linux
-EAPI=7
-HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
-INHERIT=eutils
-KEYWORDS=amd64
-LICENSE=GPL-3+
-RDEPEND=sys-kernel/dkms
-SLOT=0
-SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz -> bbswitch-0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d55fc7c6746a96a23de1f552f5c6a2e1
diff --git a/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r7 b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271
index b0dda2f0..14762382 100644
--- a/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r7
+++ b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz )
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=32d044b2d100c235ef9525d6381f50e0
+_md5_=ae3790894787fb92892dd3d2e4f9e392
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 1de763c7..61405378 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -34,7 +34,7 @@ media-video/guvcview 2.0.6-r10: Simple Qt5 or GTK+3 interface for capturing and
 media-video/mpv 0.34.1-r2: Media player based on MPlayer and mplayer2
 net-libs/libnm-glib 1.18.10-r2: Legacy NetworkManager glib and util libraries
 net-libs/webkit-gtk 2.36.7-r1: Open source web browser engine
-net-wireless/broadcom-sta 6.30.223.271-r3: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
+net-wireless/broadcom-sta 6.30.223.271-r4: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
 sys-apps/baselayout 2.8-r1: Filesystem baselayout and init scripts
 sys-apps/firetools 0.9.46-r1: Graphical user interface of app-emulation/firejail
 sys-apps/lsb-release 3.2-r1: LSB version query program
@@ -55,8 +55,7 @@ sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go
 sys-fs/vhba 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
 sys-fs/zfs 2.1.5: ZFS meta-package (Gentoo compatibility ebuild)
 sys-fs/zfs-utils 2.1.5: Userland utilities for ZFS Linux kernel module
-sys-kernel/bbswitch-dkms 0.8-r2: BBswitch sources for linux
-sys-kernel/broadcom-sta-dkms 6.30.223.271-r7: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
+sys-kernel/bcmwl-dkms 6.30.223.271: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
 sys-kernel/dkms 2.3-r2: Dynamic Kernel Module Support
 sys-kernel/dracut 056-r10: Generic initramfs generation tool
 sys-kernel/linux-headers 5.19: Linux system headers
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r3.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild
index 622667bf..9c278f85 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r3.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 RESTRICT="mirror"
 SLOT="0"
 
-DEPEND="~sys-kernel/${PN}-dkms-${PV}"
+DEPEND="~sys-kernel/bcmwl-dkms-${PV}"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}
diff --git a/sys-kernel/bbswitch-dkms/Manifest b/sys-kernel/bbswitch-dkms/Manifest
deleted file mode 100644
index 59ef57fa..00000000
--- a/sys-kernel/bbswitch-dkms/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bbswitch-0.8.tar.gz 15800 BLAKE2B d9a16d2ca8baebcbc7ad1d8c1daeb9822ed4ea797ff297848e7087d2a0b142b7cd1333d12346fcde85ad06ddb0640e0d6e299d00e0e8e6c7f96d0a409a08d1c6 SHA512 11ab163931feb6c0e202d04c4552b848e999fedea9990390c26b28abdb4a69081ccfb5a22d1e390cc274f1c0cfc9adedc719c5fece14738b17aaa93e28865b7c
diff --git a/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r2.ebuild b/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r2.ebuild
deleted file mode 100644
index 8aeb65dc..00000000
--- a/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-
-inherit eutils
-
-MY_PN="bbswitch"
-DESCRIPTION="BBswitch sources for linux"
-HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
-SRC_URI="https://github.com/Bumblebee-Project/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="amd64"
-IUSE=""
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}"-conf.patch
-)
-
-src_prepare() {
-	default
-	# Fix build failure, bug #513542
-	sed -i 's/^KDIR.*$/KDIR\ \:= \/usr\/src\/linux/g' Makefile
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr/src/${P}
-	insinto /usr/src/${P}
-	doins -r ${S}/*
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/bbswitch-dkms/files/bbswitch-dkms-0.8-conf.patch b/sys-kernel/bbswitch-dkms/files/bbswitch-dkms-0.8-conf.patch
deleted file mode 100644
index 2afeb051..00000000
--- a/sys-kernel/bbswitch-dkms/files/bbswitch-dkms-0.8-conf.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nur a/dkms/dkms.conf b/dkms/dkms.conf
---- a/dkms/dkms.conf	2013-12-04 23:22:06.000000000 +0000
-+++ b/dkms/dkms.conf	1970-01-01 01:00:00.000000000 +0100
-@@ -1,7 +0,0 @@
--PACKAGE_NAME="bbswitch"
--PACKAGE_VERSION="#MODULE_VERSION#"
--MAKE[0]="make KVERSION=$kernelver"
--CLEAN="make clean"
--BUILT_MODULE_NAME[0]="bbswitch"
--DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"
--AUTOINSTALL="yes"
-diff -Nur a/dkms.conf b/dkms.conf
---- a/dkms.conf	1970-01-01 01:00:00.000000000 +0100
-+++ b/dkms.conf	2016-10-23 20:00:47.965369366 +0100
-@@ -0,0 +1,9 @@
-+PACKAGE_NAME="bbswitch"
-+PACKAGE_VERSION="0.8"
-+AUTOINSTALL="yes"
-+
-+MAKE[0]="make KVERSION=$kernelver"
-+CLEAN="make clean"
-+
-+BUILT_MODULE_NAME[0]="bbswitch"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-diff -Nur a/Makefile.dkms b/Makefile.dkms
---- a/Makefile.dkms	2013-12-04 23:22:06.000000000 +0000
-+++ b/Makefile.dkms	1970-01-01 01:00:00.000000000 +0100
-@@ -1,24 +0,0 @@
--modname := bbswitch
--DKMS := dkms
--modver := $(shell awk -F'"' '/define *BBSWITCH_VERSION/{print $$2}' < bbswitch.c)
--
--# directory in which generated files are stored
--DKMS_DEST := /usr/src/$(modname)-$(modver)
--
--all: install
--
--src_install:
--	mkdir -p '$(DKMS_DEST)'
--	cp Makefile bbswitch.c '$(DKMS_DEST)'
--	sed 's/#MODULE_VERSION#/$(modver)/' dkms/dkms.conf > '$(DKMS_DEST)/dkms.conf'
--
--build: src_install
--	$(DKMS) build -m bbswitch -v $(modver)
--
--install: build
--	$(DKMS) install -m bbswitch -v $(modver)
--
--uninstall:
--	$(DKMS) remove -m bbswitch -v $(modver) --all
--
--.PHONY: all src_install build install uninstall
diff --git a/sys-kernel/bbswitch-dkms/files/bbswitch.modprobe b/sys-kernel/bbswitch-dkms/files/bbswitch.modprobe
deleted file mode 100644
index dd6500c7..00000000
--- a/sys-kernel/bbswitch-dkms/files/bbswitch.modprobe
+++ /dev/null
@@ -1 +0,0 @@
-options bbswitch load_state=-1 unload_state=-1
\ No newline at end of file
diff --git a/sys-kernel/broadcom-sta-dkms/Manifest b/sys-kernel/bcmwl-dkms/Manifest
index 4f6f6c9c..4f6f6c9c 100644
--- a/sys-kernel/broadcom-sta-dkms/Manifest
+++ b/sys-kernel/bcmwl-dkms/Manifest
diff --git a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r7.ebuild b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271.ebuild
index ea214e29..32204783 100644
--- a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r7.ebuild
+++ b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271.ebuild
@@ -25,7 +25,6 @@ PATCHES=(
 	"${FILESDIR}"/date-time.patch
 	"${FILESDIR}"/date-time-error.patch
 	"${FILESDIR}"/kernel-4.7-to-kernel-5.10.patch
-	"${FILESDIR}"/kernel-5.17.patch
 	"${FILESDIR}"/kernel-5.18.patch
 	"${FILESDIR}"/kernel-6.0.patch
 )
diff --git a/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-dkms.conf b/sys-kernel/bcmwl-dkms/files/bcmwl-dkms.conf
index 8266df4b..8266df4b 100644
--- a/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-dkms.conf
+++ b/sys-kernel/bcmwl-dkms/files/bcmwl-dkms.conf
diff --git a/sys-kernel/broadcom-sta-dkms/files/date-time-error.patch b/sys-kernel/bcmwl-dkms/files/date-time-error.patch
index c0e57f43..c0e57f43 100644
--- a/sys-kernel/broadcom-sta-dkms/files/date-time-error.patch
+++ b/sys-kernel/bcmwl-dkms/files/date-time-error.patch
diff --git a/sys-kernel/broadcom-sta-dkms/files/date-time.patch b/sys-kernel/bcmwl-dkms/files/date-time.patch
index f93e3f1d..f93e3f1d 100644
--- a/sys-kernel/broadcom-sta-dkms/files/date-time.patch
+++ b/sys-kernel/bcmwl-dkms/files/date-time.patch
diff --git a/sys-kernel/broadcom-sta-dkms/files/dkms.conf b/sys-kernel/bcmwl-dkms/files/dkms.conf
index 362d2a28..3cfa22c6 100644
--- a/sys-kernel/broadcom-sta-dkms/files/dkms.conf
+++ b/sys-kernel/bcmwl-dkms/files/dkms.conf
@@ -1,4 +1,4 @@
-PACKAGE_NAME="broadcom-sta-dkms"
+PACKAGE_NAME="bcmwl-dkms"
 PACKAGE_VERSION="6.30.223.271"
 MAKE[0]="make KVER=$kernelver"
 MAKE[0]="make KV_FULL=$kernelver"
diff --git a/sys-kernel/broadcom-sta-dkms/files/eth-to-wlan.patch b/sys-kernel/bcmwl-dkms/files/eth-to-wlan.patch
index b23914a0..b23914a0 100644
--- a/sys-kernel/broadcom-sta-dkms/files/eth-to-wlan.patch
+++ b/sys-kernel/bcmwl-dkms/files/eth-to-wlan.patch
diff --git a/sys-kernel/broadcom-sta-dkms/files/gcc.patch b/sys-kernel/bcmwl-dkms/files/gcc.patch
index b5d7e858..b5d7e858 100644
--- a/sys-kernel/broadcom-sta-dkms/files/gcc.patch
+++ b/sys-kernel/bcmwl-dkms/files/gcc.patch
diff --git a/sys-kernel/broadcom-sta-dkms/files/kernel-4.7-to-kernel-5.10.patch b/sys-kernel/bcmwl-dkms/files/kernel-4.7-to-kernel-5.10.patch
index 41cdf230..41cdf230 100644
--- a/sys-kernel/broadcom-sta-dkms/files/kernel-4.7-to-kernel-5.10.patch
+++ b/sys-kernel/bcmwl-dkms/files/kernel-4.7-to-kernel-5.10.patch
diff --git a/sys-kernel/broadcom-sta-dkms/files/kernel-5.18.patch b/sys-kernel/bcmwl-dkms/files/kernel-5.18.patch
index d837429a..d837429a 100644
--- a/sys-kernel/broadcom-sta-dkms/files/kernel-5.18.patch
+++ b/sys-kernel/bcmwl-dkms/files/kernel-5.18.patch
diff --git a/sys-kernel/broadcom-sta-dkms/files/kernel-6.0.patch b/sys-kernel/bcmwl-dkms/files/kernel-6.0.patch
index dcb55152..dcb55152 100644
--- a/sys-kernel/broadcom-sta-dkms/files/kernel-6.0.patch
+++ b/sys-kernel/bcmwl-dkms/files/kernel-6.0.patch
diff --git a/sys-kernel/broadcom-sta-dkms/files/makefile.patch b/sys-kernel/bcmwl-dkms/files/makefile.patch
index d5b97fe8..d5b97fe8 100644
--- a/sys-kernel/broadcom-sta-dkms/files/makefile.patch
+++ b/sys-kernel/bcmwl-dkms/files/makefile.patch
diff --git a/sys-kernel/broadcom-sta-dkms/files/kernel-5.17.patch b/sys-kernel/broadcom-sta-dkms/files/kernel-5.17.patch
deleted file mode 100644
index 3407c4ec..00000000
--- a/sys-kernel/broadcom-sta-dkms/files/kernel-5.17.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/wl/sys/wl_linux.c	2015-09-19 00:47:30.000000000 +0200
-+++ b/src/wl/sys/wl_linux.c	2022-03-22 10:39:20.763751076 +0100
-@@ -3244,7 +3244,7 @@
- static ssize_t
- wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp)
- {
--	wl_info_t * wl = PDE_DATA(file_inode(filp));
-+	wl_info_t * wl = pde_data(file_inode(filp));
- #endif
- 	int bcmerror, len;
- 	int to_user = 0;
-@@ -3301,7 +3301,7 @@
- static ssize_t
- wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp)
- {
--	wl_info_t * wl = PDE_DATA(file_inode(filp));
-+	wl_info_t * wl = pde_data(file_inode(filp));
- #endif
- 	int from_user = 0;
- 	int bcmerror;