Bumpage love. Includes fix for ACPI resume and C3 proc state

9 files changed, 214 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index fcbb34099bf0..6e081b59289e 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.9 2004/03/18 22:07:40 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.10 2004/03/25 04:35:39 latexer Exp $
+
+*ipw2100-0.38 (24 Mar 2004)
+
+  24 Mar 2004; Peter Johanson <latexer@gentoo.org> ipw2100-0.37.ebuild,
+  ipw2100-0.38.ebuild, files/ipw2100-0.38-makefile-1.diff,
+  files/ipw2100-0.38-makefile-2.diff, files/ipw2100-0.38-resume.patch:
+  Bump. 0.38 includes a fix for ACPI resume issues. Enjoy.
 
 *ipw2100-0.35 (18 Mar 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index c352eacf2728..d8a6c9ceecfe 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,13 +1,18 @@
+MD5 1915e4f827e5a22c646630bf76505c6a ipw2100-0.37.ebuild 1600
 MD5 bacfed597a8a2393d4cfc6d22148b5a6 ipw2100-0.32.ebuild 1510
 MD5 7ef502a663c0882d7b486521075f54aa ipw2100-0.33-r1.ebuild 1753
 MD5 65a8574886461fb56c246cd0a61c9cb9 ipw2100-0.34.ebuild 1600
 MD5 52cf0394939049fc21b1b5b82d1c9c6f ipw2100-0.31.ebuild 1552
+MD5 563b2c60da4b131360b8062f5a4b8ef7 ipw2100-0.38.ebuild 1864
 MD5 a54d36b57412d5b2477ebe9b11df402c ipw2100-0.29.ebuild 1496
-MD5 b786de084d312d85452c9f5cf1128740 ChangeLog 2430
+MD5 088bc5e676bccbf9a3a101e32b8b099c ChangeLog 2722
 MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
 MD5 976b74c6f7522f55b8d009b72fb43d5b ipw2100-0.35.ebuild 1600
 MD5 c25ca603853e256cd2067a2e13a540b3 ipw2100-0.30.ebuild 1503
+MD5 a8f45ac36d3629f7fd90082355b44d89 files/ipw2100-0.38-resume.patch 717
 MD5 1cf135e6f2a48d58c39f62e3e49ccfd3 files/ipw2100-0.33-acpi-fix.diff 863
+MD5 15db5a26b062068727a810f0b88d2c2c files/ipw2100-0.38-makefile-1.diff 680
+MD5 20408aa8a5494274471367204c5f2caa files/ipw2100-0.38-makefile-2.diff 284
 MD5 1d1276f437b0101f8283429a0c048ec7 files/ipw2100-0.31-sched-fix.diff 1232
 MD5 5f17d2de90a1512f71b1d9285d830215 files/digest-ipw2100-0.33-r1 128
 MD5 b8a2ee5b58b07a06d43eee780062c44f files/digest-ipw2100-0.29 128
@@ -16,4 +21,6 @@ MD5 f161ddf8b6d1e61b46ddfaa5da0d52e9 files/digest-ipw2100-0.31 128
 MD5 a9b360ec5e2fc1b06d28990d4e2665c5 files/digest-ipw2100-0.32 128
 MD5 695174056e40f9162c57fbb578e3d661 files/digest-ipw2100-0.34 128
 MD5 a86cf7317e197c9132f5f43650739e4a files/digest-ipw2100-0.35 128
+MD5 2121348d7f60dbcd4586e7cf9c1087d0 files/digest-ipw2100-0.37 128
+MD5 2cdb3f0d9c33e503d0c304c148cb772d files/digest-ipw2100-0.38 128
 MD5 1939e18b58d29ee8ec02ce6777ebaa4e files/ipw2100-0.33-makefile-fix.diff 2275
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.37 b/net-wireless/ipw2100/files/digest-ipw2100-0.37
new file mode 100644
index 000000000000..c7283a1143fb
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.37
@@ -0,0 +1,2 @@
+MD5 d5a55dfdf4b29519a77c92f1fa0fc619 ipw2100-full-0.37.tgz 731321
+MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.38 b/net-wireless/ipw2100/files/digest-ipw2100-0.38
new file mode 100644
index 000000000000..c568923b7952
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.38
@@ -0,0 +1,2 @@
+MD5 af43ad462477f48c36d15322b88c515e ipw2100-full-0.38.tgz 732563
+MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/ipw2100-0.38-makefile-1.diff b/net-wireless/ipw2100/files/ipw2100-0.38-makefile-1.diff
new file mode 100644
index 000000000000..93dabf676577
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-0.38-makefile-1.diff
@@ -0,0 +1,18 @@
+diff -Naur ipw2100-0.38-orig/Makefile ipw2100-0.38/Makefile
+--- ipw2100-0.38-orig/Makefile	2004-03-24 20:39:31.000000000 +0100
++++ ipw2100-0.38/Makefile	2004-03-25 00:04:51.000000000 +0100
+@@ -130,10 +130,14 @@
+ MODVERDIR=$(TMP)/.tmp_versions
+ 
+ modules:
++ifdef ($(KSRC_OUTPUT)/.tmp_versions)
+ 	mkdir -p $(MODVERDIR)
+ 	-cp $(KSRC_OUTPUT)/.tmp_versions/*.mod $(MODVERDIR)
++endif
+ ifeq ($(KSRC),$(KSRC_OUTPUT)) # We're not outputting elsewhere
++ifdef ($(KSRC)/.tmp_versions)
+ 	-cp $(KSRC)/.tmp_versions/*.mod $(MODVERDIR)
++endif
+ 	make -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(PWD) modules
+ else # We've got a kernel with seperate output, copy the config, and use O=
+ 	mkdir -p $(TMP)
diff --git a/net-wireless/ipw2100/files/ipw2100-0.38-makefile-2.diff b/net-wireless/ipw2100/files/ipw2100-0.38-makefile-2.diff
new file mode 100644
index 000000000000..ebb9601123c9
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-0.38-makefile-2.diff
@@ -0,0 +1,11 @@
+--- ipw2100-0.38-orig/Makefile	2004-03-24 20:39:31.000000000 +0100
++++ ipw2100-0.38/Makefile	2004-03-25 00:28:39.000000000 +0100
+@@ -121,7 +121,7 @@
+ all: modules
+ 
+ clean:
+-	rm -f *.mod.c *.mod *.o *.ko
++	rm -f *.mod.c *.mod *.o *.ko .*.cmd
+ 	rm -rf $(PWD)/tmp
+ 
+ ifeq ($(OLDMAKE),)
diff --git a/net-wireless/ipw2100/files/ipw2100-0.38-resume.patch b/net-wireless/ipw2100/files/ipw2100-0.38-resume.patch
new file mode 100644
index 000000000000..8fde82fa024d
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-0.38-resume.patch
@@ -0,0 +1,22 @@
+diff -u -r1.662 -r1.664
+--- ipw2100_main.c	24 Mar 2004 17:47:34 -0000	1.662
++++ ipw2100_main.c	24 Mar 2004 22:42:51 -0000	1.664
+@@ -5616,10 +5616,18 @@
+ {
+ 	struct net_device *dev = pci_get_drvdata(pdev);
+ 	struct ipw2100_priv *priv = dev->priv;
++	u32 val;
+ 	
+ 	pci_set_power_state(pdev, 0);
+ 	pci_restore_state(pdev, priv->pm_state);
+ 	
++        /* Suspend/Resume resets the PCI configuration space, so we have to
++	 * re-disable the RETRY_TIMEOUT register (0x41) to keep 
++	 * PCI Tx retries from interfering with C3 CPU state */
++	pci_read_config_dword(pdev, 0x40, &val); 
++	if ((val & 0x0000ff00) != 0) 
++		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
++
+ 	if (netif_running(dev))
+ 		ipw2100_up(priv);
+ 	
diff --git a/net-wireless/ipw2100/ipw2100-0.37.ebuild b/net-wireless/ipw2100/ipw2100-0.37.ebuild
new file mode 100644
index 000000000000..c38a2a4cdfad
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.37.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.37.ebuild,v 1.1 2004/03/25 04:35:39 latexer Exp $
+
+inherit kernel-mod eutils
+
+MY_P=${P/ipw2100/ipw2100-full}
+FW_VERSION="1.0"
+
+DESCRIPTION="Driver for the Intel Centrino wireless chipset"
+
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND=""
+RDEPEND=">=sys-apps/hotplug-20030805-r2"
+
+src_unpack() {
+	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "New versions of ${PN} require firmware loader support from"
+		eerror "your kernel. This can be found in Device Drivers --> Generic"
+		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
+		die "Firmware loading support not detected."
+	fi
+
+	unpack ${A}
+	kernel-mod_getversion
+}
+
+src_compile() {
+	unset ARCH
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
+
+	dodoc ISSUES README.ipw2100 DESIGN
+
+	insinto /lib/modules/${KV}/net
+	doins ipw2100.${KV_OBJ}
+	doins av5100.${KV_OBJ}
+
+	insinto /usr/lib/hotplug/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/LICENSE
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependancies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}
diff --git a/net-wireless/ipw2100/ipw2100-0.38.ebuild b/net-wireless/ipw2100/ipw2100-0.38.ebuild
new file mode 100644
index 000000000000..4016592019af
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.38.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.38.ebuild,v 1.1 2004/03/25 04:35:39 latexer Exp $
+
+inherit kernel-mod eutils
+
+MY_P=${P/ipw2100/ipw2100-full}
+FW_VERSION="1.0"
+
+DESCRIPTION="Driver for the Intel Centrino wireless chipset"
+
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND=""
+RDEPEND=">=sys-apps/hotplug-20030805-r2"
+
+src_unpack() {
+	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "New versions of ${PN} require firmware loader support from"
+		eerror "your kernel. This can be found in Device Drivers --> Generic"
+		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
+		die "Firmware loading support not detected."
+	fi
+
+	unpack ${A}
+	kernel-mod_getversion
+
+	cd ${S}
+	EPATCH_SINGLE_MSG="Patching to fix resume crash" \
+		epatch ${FILESDIR}/${P}-resume.patch
+
+	EPATCH_SINGLE_MSG="Makefile fix #1" \
+		epatch ${FILESDIR}/${P}-makefile-1.diff
+	EPATCH_SINGLE_MSG="Makefile fix #2" \
+		epatch ${FILESDIR}/${P}-makefile-2.diff
+}
+
+src_compile() {
+	unset ARCH
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
+
+	dodoc ISSUES README.ipw2100 DESIGN
+
+	insinto /lib/modules/${KV}/net
+	doins ipw2100.${KV_OBJ}
+	doins av5100.${KV_OBJ}
+
+	insinto /usr/lib/hotplug/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/LICENSE
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependancies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}