version bump, ebuild fixes/changes

4 files changed, 121 insertions, 2 deletions

diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index 8253e465ad36..1aa8f34a1fcb 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,10 +1,10 @@
-MD5 abef4d65bf9c2d07eb6648c920e9f342 ChangeLog 1432
+MD5 7e2f99ad8bc2bacb3338b7c91b8fb4f9 ChangeLog 1433
 MD5 41225d235e8abd95eba1e4a22ea19c8e hostap-driver-0.1.1.ebuild 3755
 MD5 e4c2a5b184138acc2d5252edc1be21bc metadata.xml 822
 MD5 0ac5a74bc8b06d2950a7e0497fe984e1 hostap-driver-0.1.2.ebuild 3755
 MD5 68b919c9464b78cd554d6ee520c17bfe hostap-driver-0.1.2-r1.ebuild 3803
 MD5 97b8c9b682ca0bc37730f8aa2cc9862b hostap-driver-0.1.2-r2.ebuild 2831
-MD5 33cb271d45dcbb1455fae815e6f7f861 hostap-driver-0.1.3.ebuild 2940
+MD5 377cd9ff624e4fa969621cbeafdf1dee hostap-driver-0.1.3.ebuild 2938
 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
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.1.3 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.1.3
new file mode 100644
index 000000000000..61b45fe5eef6
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.1.3
@@ -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 f729811b572f9c9ffd39b7b9e6c63892 hostap-driver-0.1.3.tar.gz 169700
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.1.3.firmware.diff.bz2 b/net-wireless/hostap-driver/files/hostap-driver-0.1.3.firmware.diff.bz2
new file mode 100644
index 000000000000..37f530b9b161
--- /dev/null
+++ b/net-wireless/hostap-driver/files/hostap-driver-0.1.3.firmware.diff.bz2
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.3.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.3.ebuild
new file mode 100644
index 000000000000..c61b3c33462d
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.3.ebuild
@@ -0,0 +1,113 @@
+# 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.3.ebuild,v 1.1 2004/02/09 00:25:42 wschlich 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="${KV}"
+KEYWORDS="~x86"
+IUSE="${IUSE} hostap-nopci hostap-noplx"
+DEPEND=">=net-wireless/wireless-tools-25"
+RDEPEND="!net-wireless/hostap"
+
+KMOD_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
+
+	## set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
+	if [ -n "${PCMCIA_VERSION}" ]; then
+		sed -i -e "s:^PCMCIA_PATH=:PCMCIA_PATH=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	## configure pcmcia
+	pcmcia_configure
+
+	cd ${S}
+
+	einfo "Building hostap-driver for kernel version: ${KV}"
+	case ${KV} in
+		2.[34].*)
+			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 "make failed"
+			;;
+		2.[56].*)
+			unset ARCH
+			emake EXTRA_CFLAGS="-DPRISM2_DOWNLOAD_SUPPORT" all || die "make failed"
+			;;
+		*)
+			eerror "Unsupported kernel version: ${KV}"
+			die
+			;;
+	esac
+}
+
+src_install() {
+	## kernel 2.6 has a different module file name suffix
+	case ${KV} in
+		2.[34].*)
+			kobj=o
+			;;
+		2.[56].*)
+			kobj=ko
+	esac
+
+	dodir ${KMOD_PATH}/net
+	cp ${S}/driver/modules/{hostap,hostap_crypt_wep}.${kobj} \
+		${D}${KMOD_PATH}/net/
+
+	if use pcmcia >&/dev/null; then
+		dodir ${KMOD_PATH}/pcmcia
+		dodir /etc/pcmcia
+		cp ${S}/driver/modules/hostap_cs.${kobj} ${D}/${KMOD_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}${KMOD_PATH}/net/
+	fi
+
+	if ! use hostap-noplx >&/dev/null; then
+		cp ${S}/driver/modules/hostap_plx.${kobj} \
+			${D}${KMOD_PATH}/net/
+	fi
+	dodoc README ChangeLog
+}
+
+pkg_postinst(){
+	einfo "Checking kernel module dependancies"
+	cd /usr/src/linux && make _modinst_post ## depmod
+}