Added WPA support, and also a block on net-wireless/ipw2100

6 files changed, 123 insertions, 10 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index c81da7507dd7..04799c1015f9 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,15 @@
 # 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.3 2004/08/17 03:31:17 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.4 2004/08/17 04:14:02 jbms Exp $
+
+*ipw2200-0.4-r1 (17 Aug 2004)
+
+  17 Aug 2004; Jeremy Maitin-Shepard <jbms@gentoo.org> ipw2200-0.3.ebuild,
+  +ipw2200-0.4-r1.ebuild, ipw2200-0.4.ebuild:
+  A block on net-wireless/ipw2100 was added to all versions, at the
+  request of latexer, because the ieee80211 module is built by both
+  packages.
+  WPA support is now built, starting with 0.4-r1.
 
   16 Aug 2004; Jeremy Maitin-Shepard <jbms@gentoo.org> ipw2200-0.4.ebuild:
   Added a check for ARC4 cryptographic support in the kernel.
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 5d5c75d4a455..bebbb62354d0 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -1,6 +1,8 @@
-MD5 9f120abc979cfbda9a8595ea7fa6c1a2 ipw2200-0.3.ebuild 2086
-MD5 5c67ac089e17160b58cf2f29cf017a2d ipw2200-0.4.ebuild 2328
-MD5 e70555d19257023247c3f02e9b435f12 ChangeLog 849
+MD5 de516e64385db3ced64f2ec4861cdc38 ipw2200-0.3.ebuild 2129
+MD5 6560f2c5f03b5d00cab56743f3cae61d ipw2200-0.4.ebuild 2525
+MD5 6bf446c6177f9a0e3a88e7450e6bea0e ipw2200-0.4-r1.ebuild 2639
+MD5 7e03fc3f739458d20c77829dd405c9c9 ChangeLog 1200
 MD5 e33c43b256ce937ba82846532879e312 metadata.xml 219
 MD5 13bdb18aad2ee350659575449ba67113 files/digest-ipw2200-0.3 122
 MD5 4bf7fd9d6b68afc2a846b35e57bad566 files/digest-ipw2200-0.4 122
+MD5 4bf7fd9d6b68afc2a846b35e57bad566 files/digest-ipw2200-0.4-r1 122
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.4-r1 b/net-wireless/ipw2200/files/digest-ipw2200-0.4-r1
new file mode 100644
index 000000000000..a92e4e5bd568
--- /dev/null
+++ b/net-wireless/ipw2200/files/digest-ipw2200-0.4-r1
@@ -0,0 +1,2 @@
+MD5 7f33d9a084e24ef913f7bba2828acccd ipw2200-0.4.tgz 88918
+MD5 eb20f3ce94f8b18d5b558b738e410c58 ipw2200-fw-1.2.tgz 133331
diff --git a/net-wireless/ipw2200/ipw2200-0.3.ebuild b/net-wireless/ipw2200/ipw2200-0.3.ebuild
index 910373955e43..a34ce0cb33f9 100644
--- a/net-wireless/ipw2200/ipw2200-0.3.ebuild
+++ b/net-wireless/ipw2200/ipw2200-0.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2004/08/14 22:38:50 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-0.3.ebuild,v 1.2 2004/08/17 04:14:02 jbms Exp $
 
 inherit kernel-mod eutils
 
@@ -17,8 +17,8 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE=""
-DEPEND=""
-RDEPEND=">=sys-apps/hotplug-20030805-r2"
+DEPEND="!net-wireless/ipw2100"
+RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
 
 src_unpack() {
 	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
diff --git a/net-wireless/ipw2200/ipw2200-0.4-r1.ebuild b/net-wireless/ipw2200/ipw2200-0.4-r1.ebuild
new file mode 100644
index 000000000000..a94657d6a847
--- /dev/null
+++ b/net-wireless/ipw2200/ipw2200-0.4-r1.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.4-r1.ebuild,v 1.1 2004/08/17 04:14:02 jbms Exp $
+
+inherit kernel-mod eutils
+
+FW_VERSION="1.2"
+
+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}
+}
diff --git a/net-wireless/ipw2200/ipw2200-0.4.ebuild b/net-wireless/ipw2200/ipw2200-0.4.ebuild
index 1dad43838895..32d6cdba05cd 100644
--- a/net-wireless/ipw2200/ipw2200-0.4.ebuild
+++ b/net-wireless/ipw2200/ipw2200-0.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.2 2004/08/17 03:31:17 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-0.4.ebuild,v 1.3 2004/08/17 04:14:02 jbms Exp $
 
 inherit kernel-mod eutils
 
@@ -17,8 +17,12 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE=""
-DEPEND=""
-RDEPEND=">=sys-apps/hotplug-20030805-r2"
+
+# 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() {