Version bump.

4 files changed, 107 insertions, 2 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index 4b3f2e624eca..9f24828321ca 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ipw2200
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.5 2004/09/02 15:40:41 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.6 2004/09/02 21:05:25 jbms Exp $
+
+*ipw2200-0.6 (02 Sep 2004)
+
+  02 Sep 2004; Jeremy Maitin-Shepard <jbms@gentoo.org> +ipw2200-0.6.ebuild:
+  Version bump.  Resolves bug #62653.
 
 *ipw2200-0.5 (02 Sep 2004)
 
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 926048335a1e..3dc8ed368871 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -2,9 +2,11 @@ MD5 de516e64385db3ced64f2ec4861cdc38 ipw2200-0.3.ebuild 2129
 MD5 e63f86f5a39d7f5c6b1f1c08790c9376 ipw2200-0.5.ebuild 2636
 MD5 6560f2c5f03b5d00cab56743f3cae61d ipw2200-0.4.ebuild 2525
 MD5 6bf446c6177f9a0e3a88e7450e6bea0e ipw2200-0.4-r1.ebuild 2639
-MD5 2a02c1954ae04fd26450d3b667b5e53c ChangeLog 1343
+MD5 5a61bb208ed909f35cd0e72a387dade4 ipw2200-0.6.ebuild 2636
+MD5 6cded2dec903c208659b84505732b9da ChangeLog 1486
 MD5 e33c43b256ce937ba82846532879e312 metadata.xml 219
 MD5 13bdb18aad2ee350659575449ba67113 files/digest-ipw2200-0.3 122
 MD5 4bf7fd9d6b68afc2a846b35e57bad566 files/digest-ipw2200-0.4 122
 MD5 a8198c21381ff4f1c065fcfa47e2d4d8 files/digest-ipw2200-0.5 122
+MD5 6cff0de0da9eee2345b4955c5ccf9ab7 files/digest-ipw2200-0.6 122
 MD5 4bf7fd9d6b68afc2a846b35e57bad566 files/digest-ipw2200-0.4-r1 122
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.6 b/net-wireless/ipw2200/files/digest-ipw2200-0.6
new file mode 100644
index 000000000000..03a5e7a9a319
--- /dev/null
+++ b/net-wireless/ipw2200/files/digest-ipw2200-0.6
@@ -0,0 +1,2 @@
+MD5 dd550d08966041667de49bbe7ad957e6 ipw2200-0.6.tgz 97780
+MD5 8bdad731fb923a9fe1921358202f4f0f ipw2200-fw-2.0.tgz 163989
diff --git a/net-wireless/ipw2200/ipw2200-0.6.ebuild b/net-wireless/ipw2200/ipw2200-0.6.ebuild
new file mode 100644
index 000000000000..c29f3d40ab7d
--- /dev/null
+++ b/net-wireless/ipw2200/ipw2200-0.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-0.6.ebuild,v 1.1 2004/09/02 21:05:25 jbms Exp $
+
+inherit kernel-mod eutils
+
+FW_VERSION="2.0"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
+
+HOMEPAGE="http://ipw2200.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
+
+LICENSE="GPL-2 ipw2200-fw"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+
+# net-wireless/ipw2100 builds a possibly incompatible ieee80211
+# module, so it is blocked.  This problem will likely be resolved
+# upstream eventually.
+DEPEND="!net-wireless/ipw2100"
+RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
+
+src_unpack() {
+
+	if ! egrep "^CONFIG_CRYPTO_ARC4=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "This version of ${PN} requires the ARC4 CryptoAPI module from"
+		eerror "the kernel."
+		die "ARC4 Crypto support not detected."
+	fi
+	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "This version 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
+
+	if ! egrep "^CONFIG_CRC32=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "This version of ${PN} requires support for CRC32 in"
+		eerror "your kernel. This can be found in Library Routines in"
+		eerror "kernel configs."
+		die "CRC32 function support not detected."
+	fi
+
+	unpack ${A}
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	unset ARCH
+
+	# Build WPA support
+	emake KSRC=${ROOT}/usr/src/linux all CONFIG_IEEE80211_WPA=y || die
+}
+
+src_install() {
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
+	dodoc ISSUES README.${PN} CHANGES
+
+	insinto /lib/modules/${KV}/net
+	doins ieee80211_crypt.${KV_OBJ} ieee80211_crypt_wep.${KV_OBJ} \
+		ieee80211_crypt_ccmp.${KV_OBJ} ieee80211_crypt_tkip.${KV_OBJ} \
+		ieee80211.${KV_OBJ} ${PN}.${KV_OBJ}
+
+	insinto /usr/lib/hotplug/firmware
+	doins ${WORKDIR}/${PN}_boot.fw
+	doins ${WORKDIR}/${PN}_bss.fw
+	doins ${WORKDIR}/${PN}_ibss.fw
+	doins ${WORKDIR}/${PN}_ucode.fw
+}
+
+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}
+}