Bump.

5 files changed, 141 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index ae7f5086a73c..8bc15b785577 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.5 2004/03/13 00:06:01 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.6 2004/03/17 03:21:07 latexer Exp $
+
+*ipw2100-0.33 (16 Mar 2004)
+
+  16 Mar 2004; Peter Johanson <latexer@gentoo.org> ipw2100-0.33.ebuild,
+  files/ipw2100-0.33-makefile-fix.diff:
+  Bump. New makefile is almost fully usable.
 
 *ipw2100-0.32 (12 Mar 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index fe528f432b60..abe5063772aa 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,7 +1,8 @@
 MD5 bacfed597a8a2393d4cfc6d22148b5a6 ipw2100-0.32.ebuild 1510
 MD5 52cf0394939049fc21b1b5b82d1c9c6f ipw2100-0.31.ebuild 1552
+MD5 8fe3f7faed305f56b8872a49a9ac8865 ipw2100-0.33.ebuild 1237
 MD5 a54d36b57412d5b2477ebe9b11df402c ipw2100-0.29.ebuild 1496
-MD5 eb1a4809c1831e11dab8daf2397790c8 ChangeLog 1378
+MD5 a8c02c854397c38b21e3a6f3de1fc10a ChangeLog 1565
 MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
 MD5 c25ca603853e256cd2067a2e13a540b3 ipw2100-0.30.ebuild 1503
 MD5 1d1276f437b0101f8283429a0c048ec7 files/ipw2100-0.31-sched-fix.diff 1232
@@ -9,3 +10,5 @@ MD5 b8a2ee5b58b07a06d43eee780062c44f files/digest-ipw2100-0.29 128
 MD5 368679a4039ed10926222fce17e426e9 files/digest-ipw2100-0.30 128
 MD5 f161ddf8b6d1e61b46ddfaa5da0d52e9 files/digest-ipw2100-0.31 128
 MD5 a9b360ec5e2fc1b06d28990d4e2665c5 files/digest-ipw2100-0.32 128
+MD5 5f17d2de90a1512f71b1d9285d830215 files/digest-ipw2100-0.33 128
+MD5 1939e18b58d29ee8ec02ce6777ebaa4e files/ipw2100-0.33-makefile-fix.diff 2275
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.33 b/net-wireless/ipw2100/files/digest-ipw2100-0.33
new file mode 100644
index 000000000000..5dee2d0a9282
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.33
@@ -0,0 +1,2 @@
+MD5 98c8cf2aaf8fb724e490c8e3b6b9542d ipw2100-full-0.33.tgz 718118
+MD5 8e2d31375c0ab22b4558c463bee2cefa ipw2100-fw-1.0.tgz 88843
diff --git a/net-wireless/ipw2100/files/ipw2100-0.33-makefile-fix.diff b/net-wireless/ipw2100/files/ipw2100-0.33-makefile-fix.diff
new file mode 100644
index 000000000000..04e25ffc3c76
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-0.33-makefile-fix.diff
@@ -0,0 +1,69 @@
+diff -aur ipw2100-0.33/Makefile ipw2100-0.33-fixed/Makefile
+--- ipw2100-0.33/Makefile	2004-03-16 16:42:51.000000000 -0500
++++ ipw2100-0.33-fixed/Makefile	2004-03-16 20:54:36.860644056 -0500
+@@ -20,7 +20,7 @@
+ 
+ VERFILE := $(KSRC_OUTPUT)/include/linux/version.h
+ KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \
+-        then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) -I$(KSRC_OUTPUT) $(CFLAGS) -E - | tail -1 | xargs echo; \
++        then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) -I$(KSRC_OUTPUT) $(CFLAGS) -E - | tail -n 1 | xargs echo; \
+         else uname -r; fi)
+ 
+ MODPATH := $(DESTDIR)/lib/modules/$(KERNELRELEASE)
+@@ -41,12 +41,12 @@
+ 	-cp $(KSRC_OUTPUT)/.tmp_versions/*.mod $(MODVERDIR)
+ ifeq ($(KSRC),$(KSRC_OUTPUT)) # We're not outputting elsewhere
+ 	-cp $(KSRC)/.tmp_versions/*.mod $(MODVERDIR)
+-	make -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(PWD) \
++	make -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(PWD) BUILD_DIR=$(PWD)  \
+ 		modules
+ else # We've got a kernel with seperate output, copy the config, and use O=
+ 	mkdir -p $(TMP)
+ 	cp $(KSRC_OUTPUT)/.config $(TMP)
+-	make -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(PWD) \
++	make -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(PWD) BUILD_DIR=$(PWD) \
+ 		O=$(PWD)/tmp modules
+ endif 
+ 
+@@ -58,10 +58,10 @@
+ else # We're on 2.4, and things are slightly different
+ 
+ modules:
+-	make -C $(KSRC) SUBDIRS=$(PWD) modules
++	make -C $(KSRC) SUBDIRS=$(PWD) BUILD_DIR=$(PWD) modules
+ 
+ install: modules
+-	MODULES=`awk -F+=\  '{ if ($2 != "") print $2 }' Makefile.24`
++	MODULES=`awk -F+=\  '{ if ($2 != "") print $2 }' $(PWD)/Makefile.24`
+ 	mkdir -p $(MODPATH)/kernel/drivers/net/wireless/ipw2100
+ 	cp -f $MODULES $(MODPATH)/kernel/drivers/net/wireless/ipw2100/
+ 	depmod -a
+@@ -70,14 +70,26 @@
+ 
+ else # We're acting as a kernel build makefile
+ 
++# If CONFIG_IPW2100 isn't set, we'll assume the user has never configured
++# their kernel to include this module and set up some defaults.
++
++ifndef CONFIG_IPW2100
++CONFIG_IPW2100=m
++CONFIG_IPW2100_AVERATEC_5100P=m
++CONFIG_DEBUG=y
++endif
++
++ifeq ($(BUILD_DIR),)
++	BUILD_DIR=$(obj)
++endif
+ 
+ ifeq ($(PATCHLEVEL),6) # If on a 2.6 kernel
+ 
+-include Makefile.24
++include $(BUILD_DIR)/Makefile.26
+ 
+ else # We're on a 2.4 kernel
+ 
+-include Makefile.26
++include $(BUILD_DIR)/Makefile.24
+ 
+ endif
+ endif
diff --git a/net-wireless/ipw2100/ipw2100-0.33.ebuild b/net-wireless/ipw2100/ipw2100-0.33.ebuild
new file mode 100644
index 000000000000..50eb0861307e
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.33.ebuild
@@ -0,0 +1,59 @@
+# 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.33.ebuild,v 1.1 2004/03/17 03:21:07 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}-makefile-fix.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 /etc/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}
+}