Cleanup using pcmcia.eclass, mild header date fixes, 2.6 work, etc

8 files changed, 142 insertions, 12 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 5dd1d4b7a789..ec81d4e3fc62 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/hostap-driver
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.5 2004/01/03 00:18:21 wschlich Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.6 2004/02/07 23:08:59 latexer Exp $
+
+*hostap-driver-0.1.2-r2 (07 Feb 2004)
+
+  07 Feb 2004; Peter Johanson <latexer@gentoo.org> metadata.xml,
+  hostap-driver-0.1.2-r2.ebuild:
+  Major cleanup. Uses new pcmcia.eclass and handles 2.6 kernels if you disable
+  sandbox. Added myself to the metadata.xml
 
 *hostap-driver-0.1.2-r1 (03 Jan 2004)
 
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index 0cfabba3faa5..32296fe81f34 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,9 +1,11 @@
+MD5 e49ea72e41adc8548d66d666b2c981ec hostap-driver-0.1.2-r1.ebuild 3804
+MD5 e2e5d0a27d54c5708f7d94653dbdb85d hostap-driver-0.1.2.ebuild 3756
+MD5 c5b1a6e061b94fb0d8d076a52022929c hostap-driver-0.1.2-r2.ebuild 2832
 MD5 0443c8e878e2eaffa9a339fc05a4c4a3 ChangeLog 970
-MD5 15502f469f44d910a0268b287d1d3411 hostap-driver-0.1.1.ebuild 3756
 MD5 027bb2fbaac5d3c8fd4e268a2ddd4682 metadata.xml 721
-MD5 e2e5d0a27d54c5708f7d94653dbdb85d hostap-driver-0.1.2.ebuild 3756
-MD5 e49ea72e41adc8548d66d666b2c981ec hostap-driver-0.1.2-r1.ebuild 3804
+MD5 15502f469f44d910a0268b287d1d3411 hostap-driver-0.1.1.ebuild 3756
+MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2-r1 71
+MD5 7404c72c79e3c743a94815cff4146633 files/digest-hostap-driver-0.1.2-r2 441
 MD5 75dda0e477834ba5a6c5c88cfb402fe7 files/digest-hostap-driver-0.1.1 71
 MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2 71
 MD5 afb604f5408986228ad8cc60236339dc files/hostap-driver-0.1.2.firmware.diff.bz2 590
-MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2-r1 71
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.1.2-r2 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.1.2-r2
new file mode 100644
index 000000000000..80075855c15c
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.1.2-r2
@@ -0,0 +1,6 @@
+MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
+MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
+MD5 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
+MD5 2b2cba3fdd498b001ea3c27d8b2da31b pcmcia-cs-3.2.5-3.2.6.diff.gz 23034
+MD5 f2feda5eb46c1a2b99ae9db274879afc pcmcia-cs-3.2.5-3.2.7.diff.gz 28244
+MD5 48dc3ddd8a8b1d47002b54f7a8fee7da hostap-driver-0.1.2.tar.gz 168410
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild
index 577b8104c879..727d3ea24794 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild,v 1.3 2003/12/16 19:09:38 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild,v 1.4 2004/02/07 23:08:59 latexer Exp $
 
 inherit eutils
 
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild
index 65e09fee0432..1f21cf76c430 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild,v 1.1 2004/01/03 00:18:21 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild,v 1.2 2004/02/07 23:08:59 latexer Exp $
 
 inherit eutils
 
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild
new file mode 100644
index 000000000000..3bf8630663d6
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild,v 1.1 2004/02/07 23:08:59 latexer Exp $
+
+# pcmcia eclass inherits eutils
+inherit pcmcia
+
+DESCRIPTION="HostAP wireless drivers"
+HOMEPAGE="http://hostap.epitest.fi/"
+SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="${IUSE} hostap-nopci hostap-noplx"
+DEPEND=">=net-wireless/wireless-tools-25"
+
+RDEPEND="!net-wireless/hostap"
+
+LIB_PATH="/lib/modules/${KV}"
+
+src_unpack() {
+	check_KV
+	unpack ${A}
+
+	# Unpack the pcmcia-cs sources if needed
+	pcmcia_src_unpack
+
+	cd ${S}
+	epatch "${FILESDIR}/${P}.firmware.diff.bz2"
+
+	## set compiler options
+	sed -i -e "s:gcc:${CC}:" ${S}/Makefile
+	# sed -i -e "s:-O2:${CFLAGS}:" "${S}/Makefile" # improper CFLAGS could cause unresolved symbols in the modules
+
+	## fix for new coreutils (#31801)
+	sed -i -e "s:tail -1:tail -n 1:" ${S}/Makefile
+
+
+	# If we unpacked them, add the path to the Makefile
+	if [ -n "${PCMCIA_SOURCE_DIR}" ]
+	then
+		sed -i -e "s:^PCMCIA_PATH=:PCMCIA_PATH=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	# Configure using pcmcia.eclass
+	pcmcia_configure
+
+	cd ${S}
+	okvminor="${KV#*.}" ; okvminor="${okvminor%%.*}"
+
+	# 2.6 needs just to do "make all"
+	if [ "${okvminor}" -lt 5 ]; then
+		local mydrivers
+
+		use pcmcia && mydrivers="${mydrivers} pccard"
+		use hostap-nopci || mydrivers="${mydrivers} pci"
+		use hostap-noplx || mydrivers="${mydrivers} plx"
+
+		einfo "Building the following drivers: ${mydrivers}"
+		emake EXTRA_CFLAGS="-DPRISM2_DOWNLOAD_SUPPORT" ${mydrivers} || die
+	else
+		unset ARCH
+		emake EXTRA_CFLAGS="-DPRISM2_DOWNLOAD_SUPPORT" all || die
+	fi
+
+}
+
+src_install() {
+	# Magic for different kernel module extensions
+
+	okvminor="${KV#*.}" ; okvminor="${okvminor%%.*}"
+	if [ "${okvminor}" -gt 5 ]; then
+		kobj=ko
+	else
+		kobj=o
+	fi
+
+	dodir ${LIB_PATH}/net
+	cp ${S}/driver/modules/{hostap,hostap_crypt_wep}.${kobj} \
+		${D}${LIB_PATH}/net/
+
+	if use pcmcia >&/dev/null; then
+		dodir ${LIB_PATH}/pcmcia
+		dodir /etc/pcmcia
+		cp ${S}/driver/modules/hostap_cs.${kobj} ${D}/${LIB_PATH}/pcmcia/
+		cp ${S}/driver/etc/hostap_cs.conf ${D}/etc/pcmcia/
+		if [ -r /etc/pcmcia/prism2.conf ]; then
+			einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
+			einfo "This is usually a result of conflicts with the"
+			einfo "linux-wlan-ng drivers."
+		fi
+	fi
+
+	if ! use hostap-nopci >&/dev/null; then
+		cp ${S}/driver/modules/hostap_pci.${kobj} \
+			${D}${LIB_PATH}/net/
+	fi
+
+	if ! use hostap-noplx >&/dev/null; then
+		cp ${S}/driver/modules/hostap_plx.${kobj} \
+			${D}${LIB_PATH}/net/
+	fi
+	dodoc README ChangeLog
+}
+
+pkg_postinst(){
+	depmod -a
+	einfo "Checking kernel module dependancies"
+}
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild
index 84f221e90887..485ded55ed57 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild,v 1.2 2003/12/16 19:09:38 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild,v 1.3 2004/02/07 23:08:59 latexer Exp $
 
 inherit eutils
 
diff --git a/net-wireless/hostap-driver/metadata.xml b/net-wireless/hostap-driver/metadata.xml
index 173482174ab9..f529aa9f9e79 100644
--- a/net-wireless/hostap-driver/metadata.xml
+++ b/net-wireless/hostap-driver/metadata.xml
@@ -6,6 +6,10 @@
     <email>wschlich@gentoo.org</email>
     <name>Wolfram Schlich</name>
   </maintainer>
+  <maintainer>
+    <email>latexer@gentoo.org</email>
+    <name>Peter Johanson</name>
+  </maintainer>
   <longdescription>This is a Linux driver for wireless LAN cards based on
   Intersil's Prism2/2.5/3 chipset. The driver supports a so called Host AP mode,
   i.e., it takes care of IEEE 802.11 management functions in the host computer