version bump, bug #58344

8 files changed, 126 insertions, 139 deletions

diff --git a/net-misc/nforce-net/ChangeLog b/net-misc/nforce-net/ChangeLog
index b1d3b44b41e9..1d401c24d2bc 100644
--- a/net-misc/nforce-net/ChangeLog
+++ b/net-misc/nforce-net/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nforce-net
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nforce-net/ChangeLog,v 1.14 2004/08/26 09:44:47 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nforce-net/ChangeLog,v 1.15 2004/09/25 15:41:32 lanius Exp $
+
+*nforce-net-1.0.0283 (25 Sep 2004)
+
+  25 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  -nforce-net-1.0.0256.ebuild, -nforce-net-1.0.0261-r1.ebuild,
+  +nforce-net-1.0.0283.ebuild:
+  version bump, bug #58344
 
   26 Aug 2004; Heinrich Wendel <lanius@gentoo.org>
   nforce-net-1.0.0261-r2.ebuild:
diff --git a/net-misc/nforce-net/Manifest b/net-misc/nforce-net/Manifest
index db185d16e706..91b21b1aabc8 100644
--- a/net-misc/nforce-net/Manifest
+++ b/net-misc/nforce-net/Manifest
@@ -1,8 +1,6 @@
-MD5 f51529ddd41e1574d77f66e51c7cfb24 nforce-net-1.0.0261-r1.ebuild 2633
-MD5 776bcbf96ad98f582b86417f6324eb20 nforce-net-1.0.0256.ebuild 1407
+MD5 36f1c0945546d07fa8eb4593cd2e5c22 nforce-net-1.0.0283.ebuild 3641
 MD5 619f44b8a0492bcd7b2f66b2c959960c nforce-net-1.0.0261-r2.ebuild 2986
 MD5 e0b3d5d150293a224c9041443da3779c ChangeLog 1861
 MD5 1dacf7c492847765ed9e3c12db33a657 files/nforce-net-1.0.0261-kernel-2.6.patch.gz 1407
-MD5 c94d06d6f883700d21e346d79589b307 files/digest-nforce-net-1.0.0261-r1 73
 MD5 c94d06d6f883700d21e346d79589b307 files/digest-nforce-net-1.0.0261-r2 73
-MD5 03580a26c5b10797541c68e7473510bf files/digest-nforce-net-1.0.0256 73
+MD5 24f18664ad21bfb8ad3d3efbfc499e23 files/digest-nforce-net-1.0.0283 163
diff --git a/net-misc/nforce-net/files/digest-nforce-net-1.0.0256 b/net-misc/nforce-net/files/digest-nforce-net-1.0.0256
deleted file mode 100644
index d18cd981bcb1..000000000000
--- a/net-misc/nforce-net/files/digest-nforce-net-1.0.0256
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ad2e2371946b7881471e4cadddf108e NVIDIA_nforce-1.0-0256.tar.gz 75752
diff --git a/net-misc/nforce-net/files/digest-nforce-net-1.0.0261-r1 b/net-misc/nforce-net/files/digest-nforce-net-1.0.0261-r1
deleted file mode 100644
index be8c8c18ae9c..000000000000
--- a/net-misc/nforce-net/files/digest-nforce-net-1.0.0261-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19e9c6592e8db6ba55c08d42dc49163f NVIDIA_nforce-1.0-0261.tar.gz 87301
diff --git a/net-misc/nforce-net/files/digest-nforce-net-1.0.0283 b/net-misc/nforce-net/files/digest-nforce-net-1.0.0283
new file mode 100644
index 000000000000..fe7388f3646d
--- /dev/null
+++ b/net-misc/nforce-net/files/digest-nforce-net-1.0.0283
@@ -0,0 +1,2 @@
+MD5 02983ddf7cc26bfeebf957ba645a8f91 NFORCE-Linux-x86-1.0-0283-pkg1.run 5842522
+MD5 31b101440c22a22f5b657d7e49dca80e NFORCE-Linux-x86_64-1.0-0283-pkg1.run 1796168
diff --git a/net-misc/nforce-net/nforce-net-1.0.0256.ebuild b/net-misc/nforce-net/nforce-net-1.0.0256.ebuild
deleted file mode 100644
index 43b4f46e5f2b..000000000000
--- a/net-misc/nforce-net/nforce-net-1.0.0256.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nforce-net/nforce-net-1.0.0256.ebuild,v 1.10 2004/07/15 03:09:35 agriffis Exp $
-
-inherit gcc
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_nforce-${NV_V}"
-S="${WORKDIR}/nforce"
-DESCRIPTION="Linux kernel module for the NVIDIA's nForce network chip"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/nforce/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-# The SLOT needs to be set to $KV to prevent unmerges of modules for other kernels
-LICENSE="NVIDIA"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-IUSE=""
-RESTRICT="nostrip"
-
-DEPEND="virtual/linux-sources"
-
-src_compile() {
-	check_KV
-	cd ${S}/nvnet
-	make KERNSRC="/usr/src/linux" || die
-}
-
-src_install() {
-	# The driver goes into the standard modules location
-	insinto /lib/modules/${KV}/kernel/drivers/net
-	doins nvnet/nvnet.o
-
-	# Docs
-	dodoc ${S}/ReleaseNotes.html
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-	fi
-
-	echo
-	einfo "You need to add \"nvnet\" to your /etc/modules.autoload to load"
-	einfo "this module when the system is started. Alternatively, you can"
-	einfo "use the 'hotplug' package ('emerge hotplug' then 'rc-update add"
-	einfo "hotplug default') to auto-detect and load \"nvnet\" on startup."
-}
diff --git a/net-misc/nforce-net/nforce-net-1.0.0261-r1.ebuild b/net-misc/nforce-net/nforce-net-1.0.0261-r1.ebuild
deleted file mode 100644
index df4f5f285d0e..000000000000
--- a/net-misc/nforce-net/nforce-net-1.0.0261-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nforce-net/nforce-net-1.0.0261-r1.ebuild,v 1.7 2004/07/15 03:09:35 agriffis Exp $
-
-inherit gcc
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_nforce-${NV_V}"
-S="${WORKDIR}/nforce"
-DESCRIPTION="Linux kernel module for the NVIDIA's nForce network chip"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/nforce/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-# The SLOT needs to be set to $KV to prevent unmerges of modules for other kernels
-LICENSE="NVIDIA"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-IUSE=""
-RESTRICT="nostrip"
-
-DEPEND="virtual/linux-sources"
-
-src_compile() {
-	check_KV
-	cd ${S}/nvnet
-	make KERNSRC="/usr/src/linux" || die
-}
-
-src_install() {
-	# The driver goes into the standard modules location
-	insinto /lib/modules/${KV}/kernel/drivers/net
-	doins nvnet/nvnet.o
-
-	# Docs
-	dohtml ${S}/ReleaseNotes.html
-
-	dodir /etc/modules.d
-	cat > ${D}/etc/modules.d/nvnet << EOF
-#  The nForce network driver supports two optimization modes:
-#   optimization=1 ; CPU optimization
-#   optimization=2 ; Throughput optimization
-#  CPU optimization mode ruduces the CPU utilization by using
-#  interrupt moderation. Throughput optimization mode maximizes
-#  the throughput.  This mode has higher CPU consumption.
-#  By default, the driver runs in throughput optimization mode.
-
-#  The "speed" module parameter can be used set the interface
-#  speed of the ethernet controller.  By default the controller
-#  will autosense the interface speed, but also supports the
-#  following values:
-#     speed=0 ; auto
-#     speed=1 ; 10Mbps
-#     speed=2 ; 100Mpbs
-
-#  The "duplex" module parameter can be used to specify the
-#  interface duplex.  By default the controller will autoselect
-#  duplex, but also supports the following values:
-#     duplex=0 ; auto
-#     duplex=1 ; half duplex
-#     duplex=2 ; full duplex
-
-options nvnet optimization="1"  speed="0" duplex="0"
-EOF
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-	fi
-
-	echo
-	einfo "You need to add \"nvnet\" to your /etc/modules.autoload to load"
-	einfo "this module when the system is started. Alternatively, you can"
-	einfo "use the 'hotplug' package ('emerge hotplug' then 'rc-update add"
-	einfo "hotplug default') to auto-detect and load \"nvnet\" on startup."
-	echo
-	einfo "Edit /etc/modules.d/nvnet and run \"update-mmodules\" to configure"
-	einfo "the \"nvnet\" driver for throughput optimization the next time it"
-	einfo "is loaded."
-}
diff --git a/net-misc/nforce-net/nforce-net-1.0.0283.ebuild b/net-misc/nforce-net/nforce-net-1.0.0283.ebuild
new file mode 100644
index 000000000000..5798979280a5
--- /dev/null
+++ b/net-misc/nforce-net/nforce-net-1.0.0283.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nforce-net/nforce-net-1.0.0283.ebuild,v 1.1 2004/09/25 15:41:32 lanius Exp $
+
+inherit gcc kmod eutils
+
+PKG_V="pkg1"
+NV_V="${PV/1.0./1.0-}"
+X86_NV_PACKAGE="NFORCE-Linux-x86-${NV_V}"
+AMD64_NV_PACKAGE="NFORCE-Linux-x86_64-${NV_V}"
+
+DESCRIPTION="Linux kernel module for the NVIDIA's nForce network chip"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? (http://download.nvidia.com/XFree86/nforce/${NV_V}/${X86_NV_PACKAGE}-${PKG_V}.run)
+	amd64? (http://download.nvidia.com/XFree86/nforce/amd64/${NV_V}/${AMD64_NV_PACKAGE}-${PKG_V}.run)"
+
+if use x86; then
+	NV_PACKAGE="${X86_NV_PACKAGE}"
+elif use amd64; then
+	NV_PACKAGE="${AMD64_NV_PACKAGE}"
+fi
+
+S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/nvnet"
+
+# The SLOT needs to be set to $KV to prevent unmerges of modules for other kernels
+LICENSE="NVIDIA"
+SLOT="${KV}"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT="nostrip"
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+
+KMOD_SOURCES="none"
+
+src_unpack() {
+	# Let the kmod eclass set the variables for us
+	kmod_src_unpack
+
+	cd ${WORKDIR}
+	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
+
+	cd ${S}
+	if is_kernel 2 5 || is_kernel 2 6
+	then
+		# The 2.6 kernels support a form of kbuild now we will aswell.
+		rm makefile
+		ln -snf Makefile.kbuild Makefile
+	fi
+}
+
+src_compile() {
+	check_KV
+	env -u ARCH make SYSSRC="${KERNEL_DIR}" clean module || die
+}
+
+src_install() {
+	# The driver goes into the standard modules location
+	insinto /lib/modules/${KV}/kernel/drivers/net
+	doins nvnet.${KV_OBJ}
+
+	# Docs
+	dodoc ${S}/ReleaseNotes.html
+
+	dodir /etc/modules.d
+	cat > ${D}/etc/modules.d/nvnet << EOF
+#  The nForce network driver supports two optimization modes:
+#   optimization=0 ; Throughput optimization
+#   optimization=1 ; CPU optimization
+#  CPU optimization mode ruduces the CPU utilization by using
+#  interrupt moderation. Throughput optimization mode maximizes
+#  the throughput.  This mode has higher CPU consumption.
+#  By default, the driver runs in throughput optimization mode.
+
+#  The "force_speed_duplex" module parameter can be used set the
+#  interface speed and duplex of the ethernet controller.  The
+#  following values are supported:
+#   force_speed_duplex=0 - autonegotiate
+#   force_speed_duplex=1 - 10Mbps half duplex
+#   force_speed_duplex=2 - 10Mbps full duplex
+#   force_speed_duplex=3 - 100Mbps half duplex
+#   force_speed_duplex=4 - 100Mbps full duplex
+#   force_speed_duplex=5 - autonegotiate for 10Mbps half duplex
+#   force_speed_duplex=6 - autonegotiate for 10Mbps full duplex
+#   force_speed_duplex=7 - autonegotiate for 100Mbps half duplex
+#   force_speed_duplex=8 - autonegotiate for 100Mbps full duplex
+#   force_speed_duplex=9 - autonegotiate for 1000Mbps full duplex
+
+options nvnet optimization="1" force_speed_duplex="0"
+EOF
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" ]
+	then
+		# Update module dependency
+		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+	fi
+
+	echo
+	einfo "You need to add \"nvnet\" to your /etc/modules.autoload to load"
+	einfo "this module when the system is started. Alternatively, you can"
+	einfo "use the 'hotplug' package ('emerge hotplug' then 'rc-update add"
+	einfo "hotplug default') to auto-detect and load \"nvnet\" on startup."
+	echo
+	einfo "Edit /etc/modules.d/nvnet and run \"update-modules\" to configure"
+	einfo "the \"nvnet\" driver for throughput optimization the next time it"
+	einfo "is loaded."
+	echo
+	einfo "An open-source network driver (\"forcedeth\") is now included in"
+	einfo "both the 2.4 and 2.6 kernels. It is recommended that you use"
+	einfo "forcedeth as opposed to this driver, as nvidia appear to be"
+	einfo "supporting it now."
+}