Bump, includes fix for 2.4 compilation

5 files changed, 129 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 1ed5094382cc..4aed664830be 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,12 @@
 # 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.3 2004/03/11 22:28:36 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.4 2004/03/12 21:48:21 latexer Exp $
+
+*ipw2100-0.31 (12 Mar 2004)
+
+  12 Mar 2004; Peter Johanson <latexer@gentoo.org> ipw2100-0.31.ebuild,
+  files/ipw2100-0.31-sched-fix.diff:
+  Bump, includes fix for scheduler stuff to fix compilation of 2.4 kernels.
 
   11 Mar 2004; Peter Johanson <latexer@gentoo.org> ipw2100-0.29.ebuild,
   ipw2100-0.30.ebuild:
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 87bb2f1c55e2..9ad08f849de3 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,6 +1,9 @@
+MD5 52cf0394939049fc21b1b5b82d1c9c6f ipw2100-0.31.ebuild 1552
 MD5 a54d36b57412d5b2477ebe9b11df402c ipw2100-0.29.ebuild 1496
-MD5 37cd594e694bb0e83afc9fa551538790 ChangeLog 992
+MD5 9c94c7886d00683f5ede02566b1624f0 ChangeLog 1207
 MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
 MD5 c25ca603853e256cd2067a2e13a540b3 ipw2100-0.30.ebuild 1503
+MD5 1d1276f437b0101f8283429a0c048ec7 files/ipw2100-0.31-sched-fix.diff 1232
 MD5 b8a2ee5b58b07a06d43eee780062c44f files/digest-ipw2100-0.29 128
 MD5 368679a4039ed10926222fce17e426e9 files/digest-ipw2100-0.30 128
+MD5 f161ddf8b6d1e61b46ddfaa5da0d52e9 files/digest-ipw2100-0.31 128
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.31 b/net-wireless/ipw2100/files/digest-ipw2100-0.31
new file mode 100644
index 000000000000..229fe95ce565
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.31
@@ -0,0 +1,2 @@
+MD5 c4108da74bdbe3af6d613be1551795c9 ipw2100-full-0.31.tgz 714126
+MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/ipw2100-0.31-sched-fix.diff b/net-wireless/ipw2100/files/ipw2100-0.31-sched-fix.diff
new file mode 100644
index 000000000000..9fa086ac330b
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-0.31-sched-fix.diff
@@ -0,0 +1,42 @@
+diff -aur ipw2100-0.31-orig/ipw2100.h ipw2100-0.31/ipw2100.h
+--- ipw2100-0.31-orig/ipw2100.h	2004-03-12 14:59:07.000000000 -0500
++++ ipw2100-0.31/ipw2100.h	2004-03-12 16:22:44.368536512 -0500
+@@ -42,6 +42,12 @@
+ #include <linux/wireless.h>
+ #include <linux/version.h>
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++#define work_struct tq_struct
++#define schedule_work schedule_task
++#define INIT_WORK INIT_TQUEUE
++#endif
++
+ struct ipw2100_priv;
+ struct ipw2100_hw_packet;
+ 
+@@ -496,13 +502,9 @@
+ 	struct net_device_stats stats;
+ 	struct iw_statistics wstats;
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+-	struct tasklet_struct irq_tasklet;
+-#else
+ 	struct work_struct irq_work;
+ 	struct work_struct reset_work;
+ 	struct work_struct tx_work;
+-#endif
+ 
+ 	struct defrag_info *defrag_pool;
+ 	struct list_head defrag_list;
+diff -aur ipw2100-0.31-orig/ipw2100_main.c ipw2100-0.31/ipw2100_main.c
+--- ipw2100-0.31-orig/ipw2100_main.c	2004-03-12 14:59:07.000000000 -0500
++++ ipw2100-0.31/ipw2100_main.c	2004-03-12 16:19:36.485099136 -0500
+@@ -163,8 +163,6 @@
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ #include <linux/sched.h>
+-#define work_struct tq_struct
+-#define schedule_work schedule_task
+ #endif
+ 
+ #ifndef IRQ_NONE
diff --git a/net-wireless/ipw2100/ipw2100-0.31.ebuild b/net-wireless/ipw2100/ipw2100-0.31.ebuild
new file mode 100644
index 000000000000..5a7f696f6dfa
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.31.ebuild
@@ -0,0 +1,74 @@
+# 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.31.ebuild,v 1.1 2004/03/12 21:48:21 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=""
+
+src_unpack() {
+	unpack ${A}
+	kernel-mod_getversion
+
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-sched-fix.diff
+
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		ln -sf Makefile.26 Makefile
+	else
+		ln -sf Makefile.24 Makefile
+	fi
+
+	# Sed our makefile to have targets be obj-m instead of obj-$(CONFIG_VAR)
+	sed -i -e "s:\$(CONFIG_IPW2100_AVERATEC_5100P):m:" \
+		-e "s:\$(CONFIG_IPW2100):m:" \
+		Makefile
+}
+src_compile() {
+	cd ${S}
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		unset ARCH
+		mkdir ${S}/tmp
+		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
+			MODVERDIR=${S}/tmp modules || die "Module compilation failed"
+	else
+		make -C ${ROOT}/usr/src/linux SUBDIRS=${S} \
+			modules || die "Module compilation failed"
+	fi
+}
+
+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 /etc/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/LICENSE
+}