Conversion to linux-mod, /usr/src/linux as kernel for building, thanks to Marko Djukic <marko@oblo.com>, Zachary J. Medico <zmedico@yahoo.com> and Markus Wagner <mwagner@wagner-wds.de> in bug 60465

Package-Manager: portage-2.0.51-r14

4 files changed, 31 insertions, 41 deletions

diff --git a/net-misc/bcm570x/ChangeLog b/net-misc/bcm570x/ChangeLog
index a98d3decda1c..735bf24c81af 100644
--- a/net-misc/bcm570x/ChangeLog
+++ b/net-misc/bcm570x/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/bcm570x
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/ChangeLog,v 1.3 2004/09/29 20:28:57 kanaka Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/ChangeLog,v 1.4 2005/01/21 18:40:50 genstef Exp $
+
+*bcm570x-7.3.5 (21 Jan 2005)
+
+  21 Jan 2005; Stefan Schweizer <genstef@gentoo.org> bcm570x-7.3.5.ebuild:
+  Conversion to linux-mod, /usr/src/linux as kernel for building, thanks to
+  Marko Djukic <marko@oblo.com>, Zachary J. Medico <zmedico@yahoo.com> and
+  Markus Wagner <mwagner@wagner-wds.de> in bug 60465
 
   29 Sep 2004; Joel Martin <kanaka@gentoo.org> :
   Added version 7.3.5 and fixed to work with kernel 2.6. Removed fetch
diff --git a/net-misc/bcm570x/Manifest b/net-misc/bcm570x/Manifest
index fa1dbe26767d..ae85ce106116 100644
--- a/net-misc/bcm570x/Manifest
+++ b/net-misc/bcm570x/Manifest
@@ -1,6 +1,6 @@
-MD5 e529b059a6d544a2796721834f2e0c68 ChangeLog 484
-MD5 0c3b8d3e611a5ed4d65fa93885e3e97e bcm570x-7.3.5.ebuild 1654
+MD5 e87041ed4428abc340840dd9f988cab0 bcm570x-7.3.5.ebuild 1076
+MD5 3c53a6cf844bd82aad7b3aac079e3716 bcm570x-7.1.22.ebuild 1213
+MD5 548203f132b83c87c84cb3743265ba7e ChangeLog 795
 MD5 e31850eaea026d25a876d92edad633c5 metadata.xml 432
-MD5 9fc38cfe83ed01e0b502465f0a774aad bcm570x-7.1.22.ebuild 1214
-MD5 e6eee42d87d02c24aaf191bb75376589 files/digest-bcm570x-7.1.22 66
 MD5 44885101781a4107275d223357034d59 files/digest-bcm570x-7.3.5 60
+MD5 e6eee42d87d02c24aaf191bb75376589 files/digest-bcm570x-7.1.22 66
diff --git a/net-misc/bcm570x/bcm570x-7.1.22.ebuild b/net-misc/bcm570x/bcm570x-7.1.22.ebuild
index 7fe2019004ea..f27e6eddf644 100644
--- a/net-misc/bcm570x/bcm570x-7.1.22.ebuild
+++ b/net-misc/bcm570x/bcm570x-7.1.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/bcm570x-7.1.22.ebuild,v 1.3 2004/07/15 02:40:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/bcm570x-7.1.22.ebuild,v 1.4 2005/01/21 18:40:50 genstef Exp $
 
 MY_P=${P/570x/5700}
 SRC_URI="http://www.broadcom.com/docs/driver_download/570x/${MY_P}.tar.gz"
diff --git a/net-misc/bcm570x/bcm570x-7.3.5.ebuild b/net-misc/bcm570x/bcm570x-7.3.5.ebuild
index 30a933b1dbb9..011d11a25dc0 100644
--- a/net-misc/bcm570x/bcm570x-7.3.5.ebuild
+++ b/net-misc/bcm570x/bcm570x-7.3.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/bcm570x-7.3.5.ebuild,v 1.1 2004/09/29 20:28:57 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/bcm570x-7.3.5.ebuild,v 1.2 2005/01/21 18:40:50 genstef Exp $
+
+inherit linux-mod
 
 MY_P=${P/570x/5700}
 SRC_URI="http://www.broadcom.com/docs/driver_download/570x/linux-${PV}.zip"
@@ -8,53 +10,34 @@ DESCRIPTION="Driver for the Broadcom 570x-based gigabit cards (found on many mai
 HOMEPAGE="http://www.broadcom.com/docs/driver-sla.php?driver=570x-Linux"
 LICENSE="GPL-2"
 
-SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
-DEPEND="app-arch/unzip
-	virtual/linux-sources"
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${MY_P}
 
+MODULE_NAMES="bcm5700(net:${S}/src)"
+BUILD_TARGETS="default"
+BUILD_PARAMS="LINUX=${KV_DIR}"
+
 src_unpack() {
 	unpack ${A}
-	tar -xvzpf ${WORKDIR}/Server/Linux/Driver/${MY_P}.tar.gz &> /dev/null ||
+	tar xzpf ${WORKDIR}/Server/Linux/Driver/${MY_P}.tar.gz || \
 		die "could not extract second level archive"
 }
 
-src_compile() {
-	check_KV
-
-	cd ${S}/src
-	if [[ ARCH=x86 ]]; then
-		my_arch=i386
-	elif [[ ARCH=amd64 ]]; then
-		my_arch=x86_64
-	fi
-	make ARCH=${my_arch} LINUX=/usr/src/linux-${KV} || die "compile failed"
-}
-
 src_install() {
-	cd ${S}/src
-	make ARCH=${my_arch} PREFIX=${D} install || die
+	linux-mod_src_install
 
-	doman bcm5700.4.gz
-	cd ${S}
 	dodoc DISTRIB.TXT LICENSE README.TXT RELEASE.TXT
+
+	cd ${S}/src
+	doman bcm5700.4
 }
 
 pkg_postinst() {
-	echo ">>> Updating module dependencies..."
-	[ -x /sbin/update-modules ] && /sbin/update-modules
-	einfo ""
-	einfo "${P}.tar.gz also contains a kernel-patch to integrate this driver directly."
-	einfo ""
-	einfo "To load the module at boot up, add bcm5700 to /etc/modules.autoload.d/KERN_VERSION"
-	einfo ""
-	einfo "To load the module now without rebooting, use the following command:"
-	einfo "modprobe bcm5700"
-	einfo ""
+	linux-mod_pkg_postinst
+
 	einfo "For more detailed information about this driver:"
 	einfo "man 4 bcm5700"
-	einfo ""
 }