Fix compiling with kernel 2.6.12, thanks to Philip Kovacs <kovacsp3@comcast.net> in bug 96559

Package-Manager: portage-1.589-cvs

5 files changed, 63 insertions, 2 deletions

diff --git a/net-misc/bcm4400/ChangeLog b/net-misc/bcm4400/ChangeLog
index 4fa46c1633bb..3bddbf4933c7 100644
--- a/net-misc/bcm4400/ChangeLog
+++ b/net-misc/bcm4400/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/bcm4400
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/ChangeLog,v 1.11 2005/01/31 18:49:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/ChangeLog,v 1.12 2005/06/20 11:58:38 genstef Exp $
+
+*bcm4400-3.0.8-r1 (20 Jun 2005)
+
+  20 Jun 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/bcm4400-3.0.8-pci_name.patch, +bcm4400-3.0.8-r1.ebuild:
+  Fix compiling with kernel 2.6.12, thanks to Philip Kovacs
+  <kovacsp3@comcast.net> in bug 96559
 
   31 Jan 2005; Stefan Schweizer <genstef@gentoo.org> -bcm4400-3.0.7.ebuild,
   bcm4400-3.0.8.ebuild:
diff --git a/net-misc/bcm4400/Manifest b/net-misc/bcm4400/Manifest
index a9be61e16fd8..879b79a67577 100644
--- a/net-misc/bcm4400/Manifest
+++ b/net-misc/bcm4400/Manifest
@@ -1,4 +1,7 @@
+MD5 092eb3e60967fc904ea19d4be928b18b bcm4400-3.0.8-r1.ebuild 1110
 MD5 10ff612188803f5f72355a773d23102a bcm4400-3.0.8.ebuild 873
-MD5 e9f5e1cb7d7821537d631b9818952a6f ChangeLog 1550
+MD5 6d1d1cd77db2edf7f58e76181b2e5235 ChangeLog 1800
 MD5 6d924ebdbe12162835ab1c1ea584636e metadata.xml 161
+MD5 273fd9c421c93d6658ceab1c40080579 files/digest-bcm4400-3.0.8-r1 60
 MD5 273fd9c421c93d6658ceab1c40080579 files/digest-bcm4400-3.0.8 60
+MD5 288fbafdd2ac71876274fa149b542857 files/bcm4400-3.0.8-pci_name.patch 415
diff --git a/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild b/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild
new file mode 100644
index 000000000000..bdda9278f574
--- /dev/null
+++ b/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild,v 1.1 2005/06/20 11:58:38 genstef Exp $
+
+inherit eutils linux-mod
+
+SRC_URI="http://www.broadcom.com/docs/driver_download/440x/linux-${PV}.zip"
+DESCRIPTION="Driver for the bcm4400 10/100 network card (in the form of kernel modules)."
+HOMEPAGE="http://www.broadcom.com"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+S=${WORKDIR}/linux/${P}/src
+
+MODULE_NAMES="bcm4400(net:)"
+BUILD_TARGETS="default"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="BCM_KVER=${KV_MAJOR}.${KV_MINOR} LINUX=${KV_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}/linux
+	tar xzpf ${P}.tar.gz
+	convert_to_m ${S}/Makefile
+
+	# patch to convert obsolete pdev->slot_name references to pci_name(pdev)
+	# it's for changes in 2.6.12 pci.h, but should work in earlier kernels
+	epatch ${FILESDIR}/${P}-pci_name.patch
+}
+
+src_install() {
+	linux-mod_src_install
+	doman bcm4400.4
+	dodoc ../DISTRIB.TXT ../LICENSE ../README.TXT ../RELEASE.TXT
+}
diff --git a/net-misc/bcm4400/files/bcm4400-3.0.8-pci_name.patch b/net-misc/bcm4400/files/bcm4400-3.0.8-pci_name.patch
new file mode 100644
index 000000000000..d5cfedba5e77
--- /dev/null
+++ b/net-misc/bcm4400/files/bcm4400-3.0.8-pci_name.patch
@@ -0,0 +1,11 @@
+--- bcm4400-3.0.8-orig/src/b44um.c	2004-08-05 14:09:44.000000000 -0400
++++ bcm4400-3.0.8/src/b44um.c	2005-06-19 15:14:16.503325928 -0400
+@@ -1040,7 +1040,7 @@
+ 
+ 		strcpy(info.driver,  bcm4400_driver);
+ 		strcpy(info.version, bcm4400_version);
+-		strcpy(info.bus_info, pUmDevice->pdev->slot_name);
++		strcpy(info.bus_info, pci_name(pUmDevice->pdev));
+ #ifdef ETHTOOL_GSTATS
+ 		info.n_stats = ETH_NUM_STATS;
+ #endif
diff --git a/net-misc/bcm4400/files/digest-bcm4400-3.0.8-r1 b/net-misc/bcm4400/files/digest-bcm4400-3.0.8-r1
new file mode 100644
index 000000000000..867936b011e7
--- /dev/null
+++ b/net-misc/bcm4400/files/digest-bcm4400-3.0.8-r1
@@ -0,0 +1 @@
+MD5 26d69ebc7294715644cf2e7e5da1630b linux-3.0.8.zip 122157