Revision bump to use the new 0.46_3 which fixes some oopses.

4 files changed, 101 insertions, 2 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 7f5b13a4e9bd..96ca0ed8fa3c 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2004/06/07 23:01:24 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.18 2004/06/08 01:15:31 latexer Exp $
+
+*ipw2100-0.46-r1 (07 Jun 2004)
+
+  07 Jun 2004; Peter Johanson,,, <peter@gentoo.org> ipw2100-0.46-r1.ebuild:
+  Revision bump to use the new 0.46_3 which fixes some oopses.
 
 *ipw2100-0.46 (07 Jun 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 23cbbdc01820..1b4c3e8ce2c2 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,7 +1,8 @@
 MD5 c1c46382d36dfa148d5f65f35a790f45 ipw2100-0.46.ebuild 2315
 MD5 d011a6d2ead424ccb64f49f9aa0e9194 ipw2100-0.41.ebuild 2229
 MD5 9b001769ed251b43ae798d7c90e8353d ipw2100-0.45.ebuild 2314
-MD5 8ebbc5ac0f6836889f3584d606da7bf0 ChangeLog 4043
+MD5 ca2ec9355d9f2829c990c92bf3b0dbbb ipw2100-0.46-r1.ebuild 2341
+MD5 f239b0835edc33e9da27dfd0c197e83f ChangeLog 4215
 MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
 MD5 c06a987ea3e36a649714fb41973ccd0a ipw2100-0.44.ebuild 2313
 MD5 a8f45ac36d3629f7fd90082355b44d89 files/ipw2100-0.38-resume.patch 717
@@ -9,6 +10,7 @@ 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 bc734236706a08cefb81aeb4965455ff files/digest-ipw2100-0.46-r1 126
 MD5 f9a4a4e4aacd5c115776d3ccc8333cab files/digest-ipw2100-0.41 123
 MD5 5ccd21f930c68d8fd53afe3a87bcd56e files/digest-ipw2100-0.44 124
 MD5 3d2b283cc098381a32b94d472e5b11dc files/digest-ipw2100-0.45 124
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.46-r1 b/net-wireless/ipw2100/files/digest-ipw2100-0.46-r1
new file mode 100644
index 000000000000..3b8b77357eb3
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.46-r1
@@ -0,0 +1,2 @@
+MD5 7f633f0f8fbd03d92e8ec3934f93a0b4 ipw2100-0.46_3.tgz 110985
+MD5 959df2696321b12ceed230397584ec4b ipw2100-fw-1.1.tgz 247766
diff --git a/net-wireless/ipw2100/ipw2100-0.46-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.46-r1.ebuild
new file mode 100644
index 000000000000..5cbe51feda4e
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.46-r1.ebuild
@@ -0,0 +1,90 @@
+# 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.46-r1.ebuild,v 1.1 2004/06/08 01:15:31 latexer Exp $
+
+inherit kernel-mod eutils
+
+FW_VERSION="1.1"
+
+DESCRIPTION="Driver for the Intel Centrino wireless chipset"
+
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}_3.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND=""
+RDEPEND=">=sys-apps/hotplug-20030805-r2
+	 >=net-wireless/hostap-driver-0.1.3"
+
+S="${WORKDIR}/${P}_3"
+
+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}
+	mkdir -p hostap-driver-0.1.3/driver/modules
+	cp ${FILESDIR}/hostap_crypt.h hostap-driver-0.1.3/driver/modules
+}
+
+src_compile() {
+	unset ARCH
+	emake KSRC=${ROOT}/usr/src/linux HOSTAP=hostap-driver-0.1.3 all || die
+}
+
+src_install() {
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
+	dodoc ISSUES README.ipw2100 CHANGES
+
+	insinto /lib/modules/${KV}/net
+	doins ipw2100.${KV_OBJ} av5100.${KV_OBJ} pbe5.${KV_OBJ}
+
+	insinto /usr/lib/hotplug/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-p.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-i.fw
+	doins ${WORKDIR}/LICENSE
+}
+
+pkg_postinst() {
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
+	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}
+
+	if [ ! -f ${ROOT}/lib/modules/${KV}/net/hostap_crypt_wep.${KV_OBJ} ]
+	then
+		eerror ""
+		eerror "Modules for hostap-driver not found!"
+		eerror "For WEP to work, you need the hostap-driver modules available for your kernel"
+		eerror "If you upgrade kernels, you need to re-emerge BOTH ipw2100 and hostap-driver"
+		eerror "to ensure that all the needed kernel modules are present!"
+		eerror ""
+	fi
+}