Version bumped.

14 files changed, 40 insertions, 61 deletions

diff --git a/net-misc/e100/ChangeLog b/net-misc/e100/ChangeLog
index 855f766a5288..1bee928fe6cb 100644
--- a/net-misc/e100/ChangeLog
+++ b/net-misc/e100/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/e100
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/ChangeLog,v 1.14 2004/02/03 12:11:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/ChangeLog,v 1.15 2004/04/13 20:59:19 mholzer Exp $
+
+*e100-2.3.40 (13 Apr 2004)
+
+  13 Apr 2004; Martin Holzer <mholzer@gentoo.org> e100-2.3.40.ebuild:
+  Version bumped.
 
   03 Feb 2004; Martin Holzer <mholzer@gentoo.org> e100-2.3.33.ebuild:
   x86 stable.
diff --git a/net-misc/e100/Manifest b/net-misc/e100/Manifest
index 71290815fc4e..f162d267465e 100644
--- a/net-misc/e100/Manifest
+++ b/net-misc/e100/Manifest
@@ -1,5 +1,7 @@
 MD5 3bdc832a2943957673f31e686e415c4a ChangeLog 1845
+MD5 cb7860da133a29305b2f7f680ab70193 e100-2.3.40.ebuild 1358
 MD5 23a9d9cb3feb4bd319ca5b75554f08d7 e100-2.3.33.ebuild 1357
 MD5 cb7860da133a29305b2f7f680ab70193 e100-2.3.38.ebuild 1358
+MD5 030ad45e9b529643af0e9373951c8585 files/digest-e100-2.3.40 62
 MD5 a5bb20b940cdcbb9e410f055bb462e70 files/digest-e100-2.3.33 62
 MD5 456a2fadd965714c35b513211b9026d4 files/digest-e100-2.3.38 62
diff --git a/net-misc/e100/e100-2.3.38.ebuild b/net-misc/e100/e100-2.3.38.ebuild
index 045a6951a518..e35674b4e022 100644
--- a/net-misc/e100/e100-2.3.38.ebuild
+++ b/net-misc/e100/e100-2.3.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-2.3.38.ebuild,v 1.1 2004/02/03 12:09:26 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-2.3.38.ebuild,v 1.2 2004/04/13 20:59:19 mholzer Exp $
 
 DESCRIPTION="Linux base driver for the Intel(R) PRO/100 family of adapters"
 HOMEPAGE="http://support.intel.com/support/network/adapter/index.htm"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/e1000/${P}.tar.gz"
 RESTRICT="nomirror"
 S="${WORKDIR}/${P}"
 SLOT="${KV}"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 src_compile() {
 	check_KV
diff --git a/net-misc/e100/e100-2.3.33.ebuild b/net-misc/e100/e100-2.3.40.ebuild
index e215d01a81e6..91051c87287e 100644
--- a/net-misc/e100/e100-2.3.33.ebuild
+++ b/net-misc/e100/e100-2.3.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-2.3.33.ebuild,v 1.3 2004/02/03 12:11:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-2.3.40.ebuild,v 1.1 2004/04/13 20:59:19 mholzer Exp $
 
 DESCRIPTION="Linux base driver for the Intel(R) PRO/100 family of adapters"
 HOMEPAGE="http://support.intel.com/support/network/adapter/index.htm"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/e1000/${P}.tar.gz"
 RESTRICT="nomirror"
 S="${WORKDIR}/${P}"
 SLOT="${KV}"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 src_compile() {
 	check_KV
diff --git a/net-misc/e100/files/digest-e100-2.3.33 b/net-misc/e100/files/digest-e100-2.3.33
deleted file mode 100644
index cfd568ec0e8f..000000000000
--- a/net-misc/e100/files/digest-e100-2.3.33
+++ /dev/null
@@ -1 +0,0 @@
-MD5 847918a08443aac122205c122d5c3f98 e100-2.3.33.tar.gz 90323
diff --git a/net-misc/e100/files/digest-e100-2.3.40 b/net-misc/e100/files/digest-e100-2.3.40
new file mode 100644
index 000000000000..b8324a46a657
--- /dev/null
+++ b/net-misc/e100/files/digest-e100-2.3.40
@@ -0,0 +1 @@
+MD5 7cfe19af99003104501ea8ad656764f1 e100-2.3.40.tar.gz 91044
diff --git a/net-misc/e1000/ChangeLog b/net-misc/e1000/ChangeLog
index ff61617ebcdf..f004ed97238c 100644
--- a/net-misc/e1000/ChangeLog
+++ b/net-misc/e1000/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/e1000
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/ChangeLog,v 1.14 2004/03/01 07:42:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/ChangeLog,v 1.15 2004/04/13 21:02:49 mholzer Exp $
+
+*e1000-5.2.39 (13 Apr 2004)
+
+  13 Apr 2004; Martin Holzer <mholzer@gentoo.org> e1000-5.2.39.ebuild,
+  Version bumped.
+
 
   01 Mar 2004; Martin Holzer <mholzer@gentoo.org> e1000-5.2.30.1.ebuild,
   files/README.Gentoo:
diff --git a/net-misc/e1000/Manifest b/net-misc/e1000/Manifest
index 1dd1c6b193b6..ac3de98ab0f1 100644
--- a/net-misc/e1000/Manifest
+++ b/net-misc/e1000/Manifest
@@ -1,8 +1,6 @@
-MD5 685cab07fee48c1ac7c2a6ede5ffa32e e1000-5.2.22.ebuild 1067
-MD5 c2788433f30fe41e4c834856cc469e93 e1000-5.2.20.ebuild 1066
-MD5 8360054a21c364fd832a05fc21949145 e1000-5.2.30.1.ebuild 1464
 MD5 1b187fb99d7d97ff232631cdb842bd0b ChangeLog 1907
+MD5 033eebc5de3cce4a1cd22541670ec3da e1000-5.2.30.1.ebuild 1463
+MD5 8360054a21c364fd832a05fc21949145 e1000-5.2.39.ebuild 1464
+MD5 d7dddb8c37956959f088a675676950c1 files/digest-e1000-5.2.39 64
 MD5 77270d006917b099ca5e4684c80abf0f files/digest-e1000-5.2.30.1 66
 MD5 0b6de6b5497b7f4ed7f2469565a3e28e files/README.Gentoo 1002
-MD5 5a0d0eea9a3155b09fb3177c6f646d8b files/digest-e1000-5.2.20 64
-MD5 48bc3d8e4999566aa077df43475f4854 files/digest-e1000-5.2.22 64
diff --git a/net-misc/e1000/e1000-5.2.20.ebuild b/net-misc/e1000/e1000-5.2.20.ebuild
deleted file mode 100644
index d5c3cccf43e7..000000000000
--- a/net-misc/e1000/e1000-5.2.20.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/e1000-5.2.20.ebuild,v 1.3 2003/12/04 18:04:27 mholzer Exp $
-
-DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
-HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
-LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-SLOT="${KV}"
-KEYWORDS="x86"
-S="${WORKDIR}/${P}"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	# rem out the DEPVER line, since it would cause a sandbox violation and
-	# since it is only needed by RPM ;-)
-	sed -i "/^DEPVER :=/ d" Makefile
-}
-
-
-src_compile() {
-	check_KV
-	cd "${S}/src"
-	make KSRC=/usr/src/linux clean e1000.o
-}
-
-
-src_install() {
-	insinto "/lib/modules/${KV}/kernel/drivers/net"
-	doins "${S}/src/e1000.o"
-	doman e1000.7
-	dodoc LICENSE README SUMS e1000.spec ldistrib.txt
-	einfo ""
-	einfo "In case you have problems, loading the module, try to run depmod -A"
-	einfo ""
-}
diff --git a/net-misc/e1000/e1000-5.2.30.1.ebuild b/net-misc/e1000/e1000-5.2.30.1.ebuild
index b035dd32767a..917d41498a2a 100644
--- a/net-misc/e1000/e1000-5.2.30.1.ebuild
+++ b/net-misc/e1000/e1000-5.2.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/e1000-5.2.30.1.ebuild,v 1.2 2004/03/01 07:42:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/e1000-5.2.30.1.ebuild,v 1.3 2004/04/13 21:02:49 mholzer Exp $
 
 DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
 HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
@@ -10,7 +10,7 @@ DEPEND="virtual/linux-sources"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
 SLOT="${KV}"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 S="${WORKDIR}/${P}"
 
 
diff --git a/net-misc/e1000/e1000-5.2.22.ebuild b/net-misc/e1000/e1000-5.2.39.ebuild
index d931057900a1..baf5d5256756 100644
--- a/net-misc/e1000/e1000-5.2.22.ebuild
+++ b/net-misc/e1000/e1000-5.2.39.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/e1000-5.2.22.ebuild,v 1.1 2003/12/04 18:04:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/e1000-5.2.39.ebuild,v 1.1 2004/04/13 21:02:49 mholzer Exp $
 
 DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
 HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
@@ -26,7 +26,14 @@ src_unpack() {
 src_compile() {
 	check_KV
 	cd "${S}/src"
-	make KSRC=/usr/src/linux clean e1000.o
+
+	# workaround needed for some ethernet controllers to work with low end switches
+	if [[ ${USE_INCOMPATIBLE_SWITCH} ]]
+		then CFLAGS_EXTRA="CFLAGS_EXTRA=-DE_1000_MASTER_SLAVE=1"
+		else CFLAGS_EXTRA=""
+	fi
+
+	make ${CFLAGS_EXTRA} KSRC=/usr/src/linux clean e1000.o
 }
 
 
@@ -34,8 +41,11 @@ src_install() {
 	insinto "/lib/modules/${KV}/kernel/drivers/net"
 	doins "${S}/src/e1000.o"
 	doman e1000.7
-	dodoc LICENSE README SUMS e1000.spec ldistrib.txt
+	dodoc LICENSE README SUMS e1000.spec ldistrib.txt ${FILESDIR}/README.Gentoo
 	einfo ""
 	einfo "In case you have problems, loading the module, try to run depmod -A"
 	einfo ""
+	einfo "If you experience problems with low-end switches, read"
+	einfo "/usr/share/doc/${PF}/README.Gentoo.gz for a possible workaround"
+	einfo ""
 }
diff --git a/net-misc/e1000/files/digest-e1000-5.2.20 b/net-misc/e1000/files/digest-e1000-5.2.20
deleted file mode 100644
index fb894f16cc2d..000000000000
--- a/net-misc/e1000/files/digest-e1000-5.2.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52a65f13fda89257edbc4507958c6e3a e1000-5.2.20.tar.gz 119403
diff --git a/net-misc/e1000/files/digest-e1000-5.2.22 b/net-misc/e1000/files/digest-e1000-5.2.22
deleted file mode 100644
index a4157bc777f3..000000000000
--- a/net-misc/e1000/files/digest-e1000-5.2.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e8ffe07741aa30a59dab59d1be0dcec e1000-5.2.22.tar.gz 120573
diff --git a/net-misc/e1000/files/digest-e1000-5.2.39 b/net-misc/e1000/files/digest-e1000-5.2.39
new file mode 100644
index 000000000000..780af1f603bc
--- /dev/null
+++ b/net-misc/e1000/files/digest-e1000-5.2.39
@@ -0,0 +1 @@
+MD5 73a3e6497c2a5bfc79c2e2978d2f002a e1000-5.2.39.tar.gz 122232