New development snapshot.

32 files changed, 474 insertions, 47 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 6fa5b4675f32..82699e9c7795 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostap-driver
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.26 2004/12/26 21:30:46 brix Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.27 2005/01/03 11:04:49 brix Exp $
+
+*hostap-driver-0.3.3 (03 Jan 2005)
+
+  03 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/hostap-driver-0.3.3-firmware.patch, +hostap-driver-0.3.3.ebuild:
+  New development snapshot.
 
 *hostap-driver-0.2.6 (26 Dec 2004)
 
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index 2e949933bf54..1ba6acb48910 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,6 +1,7 @@
 MD5 c477c184eacaf3f581d69829a158bcb3 hostap-driver-0.3.2.ebuild 3621
 MD5 fd51fd2724c112219c920a864c8e20f0 hostap-driver-0.2.6.ebuild 3621
 MD5 08b001ac4fb3ad3de51ef019a8833f6c hostap-driver-0.2.5.ebuild 3201
+MD5 36a3bafdf87b5e481c665c891a750ed2 hostap-driver-0.3.3.ebuild 3485
 MD5 b57d0a31b3dfcc88c5828e116cf20994 hostap-driver-0.2.5-r1.ebuild 3614
 MD5 a7a1a62076c4baa3e507e2a7340af162 hostap-driver-0.3.0.ebuild 3621
 MD5 292b96528ef99421e12892b47fd10b9e ChangeLog 4834
@@ -14,5 +15,7 @@ MD5 702e5e315551f06833fde599816fd65a files/digest-hostap-driver-0.2.5 441
 MD5 2867dcc26d843b380c5c6be06a89a9af files/digest-hostap-driver-0.2.6 441
 MD5 31eba7db39a7678ae7619995f6d96370 files/digest-hostap-driver-0.3.0 441
 MD5 b86779810351ad030a68fabc4dda44f8 files/digest-hostap-driver-0.3.2 441
+MD5 d9b1b7ab5bfa090d1eca4d8865f5465c files/digest-hostap-driver-0.3.3 441
 MD5 d76aa90f71a4ef13a49ccca8863b66ba files/hostap-driver-0.2.6-firmware.patch 739
 MD5 9451f65d0b1724a60a07b9310d9ebc52 files/hostap-driver-0.2.5.firmware.diff.bz2 472
+MD5 479a81eda3a37282cf5954f589eb3017 files/hostap-driver-0.3.3-firmware.patch 739
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.3 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.3
new file mode 100644
index 000000000000..1b13d3e0e360
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.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 5a3d50df56cad3151339b05eacabeea0 hostap-driver-0.3.3.tar.gz 200123
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.3.3-firmware.patch b/net-wireless/hostap-driver/files/hostap-driver-0.3.3-firmware.patch
new file mode 100644
index 000000000000..67f863b83cb0
--- /dev/null
+++ b/net-wireless/hostap-driver/files/hostap-driver-0.3.3-firmware.patch
@@ -0,0 +1,12 @@
+diff -urp hostap-driver-0.3.3/driver/modules/hostap_config.h hostap-driver-0.3.3-firmware/driver/modules/hostap_config.h
+--- hostap-driver-0.3.3/driver/modules/hostap_config.h	2005-01-03 04:07:24.000000000 +0100
++++ hostap-driver-0.3.3-firmware/driver/modules/hostap_config.h	2005-01-03 11:35:10.859216776 +0100
+@@ -59,7 +59,7 @@
+  * In addition, please note that it is possible to kill your card with
+  * non-volatile download if you are using incorrect image. This feature has not
+  * been fully tested, so please be careful with it. */
+-/* #define PRISM2_NON_VOLATILE_DOWNLOAD */
++#define PRISM2_NON_VOLATILE_DOWNLOAD
+ #endif /* PRISM2_DOWNLOAD_SUPPORT */
+ 
+ /* Include wireless extensions sub-ioctl support even if wireless extensions
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild
index 1c382f9ea001..7605c7119ecc 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild,v 1.2 2004/11/01 11:49:36 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild,v 1.3 2005/01/03 11:04:49 brix Exp $
 
 inherit toolchain-funcs pcmcia kernel-mod
 
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild
index 8489f78dd8a4..c009a3ea3d54 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild,v 1.4 2004/12/11 22:42:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild,v 1.5 2005/01/03 11:04:49 brix Exp $
 
 inherit toolchain-funcs pcmcia kernel-mod eutils
 
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild
index 66b70012d012..231b2c4ff1b7 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild,v 1.3 2004/11/01 11:49:36 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild,v 1.4 2005/01/03 11:04:49 brix Exp $
 
 inherit toolchain-funcs pcmcia kernel-mod eutils
 
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild
index 571c3f56e3cf..084287afac3a 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild,v 1.1 2004/12/26 21:30:46 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild,v 1.2 2005/01/03 11:04:49 brix Exp $
 
 inherit toolchain-funcs pcmcia kernel-mod eutils
 
diff --git a/net-wireless/hostap-driver/hostap-driver-0.3.0.ebuild b/net-wireless/hostap-driver/hostap-driver-0.3.0.ebuild
index c884fe29117d..3e6e7c2fc992 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.3.0.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.0.ebuild,v 1.1 2004/12/12 11:32:43 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.0.ebuild,v 1.2 2005/01/03 11:04:49 brix Exp $
 
 inherit toolchain-funcs pcmcia kernel-mod eutils
 
diff --git a/net-wireless/hostap-driver/hostap-driver-0.3.2.ebuild b/net-wireless/hostap-driver/hostap-driver-0.3.2.ebuild
index 2b2be48d71c9..f0af2d869201 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.3.2.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.2.ebuild,v 1.1 2004/12/20 09:09:12 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.2.ebuild,v 1.2 2005/01/03 11:04:49 brix Exp $
 
 inherit toolchain-funcs pcmcia kernel-mod eutils
 
diff --git a/net-wireless/hostap-driver/hostap-driver-0.3.3.ebuild b/net-wireless/hostap-driver/hostap-driver-0.3.3.ebuild
new file mode 100644
index 000000000000..adaca595961e
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.3.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.3.3.ebuild,v 1.1 2005/01/03 11:04:49 brix Exp $
+
+inherit toolchain-funcs pcmcia kernel-mod eutils
+
+DESCRIPTION="HostAP wireless drivers"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+SLOT="0"
+
+DEPEND="virtual/linux-sources
+		sys-apps/sed"
+RDEPEND=">=net-wireless/wireless-tools-25"
+
+pkg_setup() {
+	if ! kernel-mod_configoption_present NET_RADIO
+	then
+		eerror ""
+		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
+		eerror ""
+		die "CONFIG_NET_RADIO support not detected."
+	fi
+
+	kernel-mod_check_modules_supported
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# set compiler
+	sed -i -e "s:gcc:$(tc-getCC):" ${S}/Makefile
+
+	# unpack the pcmcia-cs sources if needed
+	pcmcia_src_unpack
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-firmware.patch
+
+	# fix for new coreutils (#31801)
+	sed -i "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 "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+	fi
+
+	# install to /lib/modules/${KV}/net
+	sed -i "s:\$(MODPATH)/kernel/drivers/net/wireless:\$(MODPATH)/net:g" ${S}/Makefile
+	sed -i "s:MODPATH_CS \:= \$(MODPATH)/pcmcia:MODPATH_CS \:= \$(MODPATH)/net:" ${S}/Makefile
+
+	# let pkg_postinst() handle depmod
+	sed -i "s:/sbin/depmod -ae; \\\:\\\:" ${S}/Makefile
+	sed -i "s:/sbin/depmod -ae::" ${S}/Makefile
+
+	if ! use pcmcia &> /dev/null
+	then
+		# remove install_pccard dependency from install_2.4 target
+		sed -i "s#^\(install_2.4:.*\)install_pccard#\1#" ${S}/Makefile
+	fi
+
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i "s:SUBDIRS=:M=:" ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	pcmcia_configure
+
+	set_arch_to_kernel
+	emake all || die "emake failed"
+	set_arch_to_portage
+}
+
+src_install() {
+	# Makefile relies on existing /lib/modules/${KV}
+	dodir /lib/modules/${KV}
+
+	if use pcmcia &> /dev/null
+	then
+		# pcmcia configuration file is only installed if /etc/pcmcia exist
+		dodir /etc/pcmcia
+	else
+		# make sure we do not install the hostap_cs module
+		rm -rf ${S}/driver/modules/hostap_cs.*o
+	fi
+
+	set_arch_to_kernel
+	emake DESTDIR=${D} install || die "emake install failed"
+	set_arch_to_portage
+
+	dodoc README ChangeLog
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+
+	if [ -e /etc/pcmcia/prism2.conf ]
+	then
+		einfo ""
+		einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
+		einfo "This is usually a result of conflicts with the"
+		einfo "net-wireless/linux-wlan-ng drivers."
+		einfo ""
+	fi
+
+	einfo ""
+	einfo "Please notice that all ${PN} modules are now installed to"
+	einfo "/lib/modules/${KV}/net/."
+	einfo ""
+	einfo "You may have to manually delete the old modules if upgrading from from"
+	einfo "<=net-wireless/${PN}-0.2.4."
+	einfo ""
+
+	ewarn ""
+	ewarn "Please note that this installation of HostAP contains support"
+	ewarn "for downloading binary firmware images into the non-volatile"
+	ewarn "(permanent) flash memory of wireless LAN cards."
+	ewarn ""
+	ewarn "Albeit being a great feature, this can lead to A DEAD CARD"
+	ewarn "when inappropriately used (e.g. wrong firmware)."
+	ewarn ""
+
+}
diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 98b98ebdee6c..259a8fb57fb7 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/hostapd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.15 2004/12/26 21:34:04 brix Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.16 2005/01/03 11:06:53 brix Exp $
+
+*hostapd-0.3.3 (03 Jan 2005)
+
+  03 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.3.ebuild:
+  New development snapshot.
 
 *hostapd-0.2.6 (26 Dec 2004)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index bc3de943ba9f..4722f819dede 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,15 +1,17 @@
-MD5 2474cf4180f7290f9e5e8a47f1702e7a hostapd-0.2.5.ebuild 1072
-MD5 7416e361c8dc181f353a4bd936d7844c hostapd-0.3.0.ebuild 1735
-MD5 73fcafdf3db141b6061f35c727a9e5db hostapd-0.2.4.ebuild 1075
-MD5 93c577fac5d8854660907e87d3ba5297 hostapd-0.3.2.ebuild 1932
-MD5 ecd57f735af8734bc919f9662804d394 hostapd-0.2.6.ebuild 1067
-MD5 3b02adc69aecf7e6c785da507575e9c3 ChangeLog 2143
+MD5 91bce24f72e665a2dd532af82efc02b7 hostapd-0.2.5.ebuild 1072
+MD5 7189e85fddc85ebf32cb67ddc34efe7a hostapd-0.3.3.ebuild 2056
+MD5 f8b1eea9688ae8e611bc3231356af481 hostapd-0.3.0.ebuild 1735
+MD5 750447c7f5bf2ae2087fa0823dd2cba6 hostapd-0.2.4.ebuild 1075
+MD5 2b03da60da37a00046f03125cbc44cb0 hostapd-0.3.2.ebuild 1932
+MD5 7078db61453631354f6999bd8671e817 hostapd-0.2.6.ebuild 1067
+MD5 cd85f3821d2c19dd16d805c3fc9e983d ChangeLog 2279
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
-MD5 addac32c6bc78b481ff2a74864eb1e8d hostapd-0.3.1.ebuild 1777
+MD5 872e89d940d5dabcc8975f47728eae0e hostapd-0.3.1.ebuild 1777
 MD5 44285ed8dadd7473eb41d3b67f318120 files/digest-hostapd-0.2.4 65
 MD5 ba14f3282c1fe345b2b9bc3233bc2f6d files/digest-hostapd-0.2.5 65
 MD5 9cbbd29bd90ddbddaa1abe1e726e2fd1 files/digest-hostapd-0.2.6 65
 MD5 1ba76b2b1bb9b838b8b72d9d99348f46 files/digest-hostapd-0.3.0 149
 MD5 3545835b787224800fe3423a60f29808 files/digest-hostapd-0.3.1 149
 MD5 30d8ea24bfd552e0638487411450495e files/digest-hostapd-0.3.2 149
+MD5 f713d9fe7806353e0d9a06dd39d389c4 files/digest-hostapd-0.3.3 149
 MD5 cf287b50f0ccd832a08fb3031281cd4f files/hostapd.init.d 858
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.3.3 b/net-wireless/hostapd/files/digest-hostapd-0.3.3
new file mode 100644
index 000000000000..dec26507a2b4
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.3.3
@@ -0,0 +1,2 @@
+MD5 da642ecb761a6dc7685cb666a228b33a hostapd-0.3.3.tar.gz 242925
+MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/hostapd/hostapd-0.2.4.ebuild b/net-wireless/hostapd/hostapd-0.2.4.ebuild
index 0be07e9087fd..f1a1ce502cdb 100644
--- a/net-wireless/hostapd/hostapd-0.2.4.ebuild
+++ b/net-wireless/hostapd/hostapd-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.2.4.ebuild,v 1.2 2004/11/01 11:53:57 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.2.4.ebuild,v 1.3 2005/01/03 11:06:53 brix Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/net-wireless/hostapd/hostapd-0.2.5.ebuild b/net-wireless/hostapd/hostapd-0.2.5.ebuild
index 2d98df26cea4..5983aa57fc9c 100644
--- a/net-wireless/hostapd/hostapd-0.2.5.ebuild
+++ b/net-wireless/hostapd/hostapd-0.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.2.5.ebuild,v 1.4 2004/12/11 22:46:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.2.5.ebuild,v 1.5 2005/01/03 11:06:53 brix Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/net-wireless/hostapd/hostapd-0.2.6.ebuild b/net-wireless/hostapd/hostapd-0.2.6.ebuild
index d8ecea032dbe..ff96657a44e7 100644
--- a/net-wireless/hostapd/hostapd-0.2.6.ebuild
+++ b/net-wireless/hostapd/hostapd-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.2.6.ebuild,v 1.1 2004/12/26 21:34:04 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.2.6.ebuild,v 1.2 2005/01/03 11:06:53 brix Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/net-wireless/hostapd/hostapd-0.3.0.ebuild b/net-wireless/hostapd/hostapd-0.3.0.ebuild
index 96402471964b..bce4ef14ee63 100644
--- a/net-wireless/hostapd/hostapd-0.3.0.ebuild
+++ b/net-wireless/hostapd/hostapd-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.3.0.ebuild,v 1.1 2004/12/12 11:32:43 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.3.0.ebuild,v 1.2 2005/01/03 11:06:53 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/hostapd/hostapd-0.3.1.ebuild b/net-wireless/hostapd/hostapd-0.3.1.ebuild
index 662eacee3bd6..7f5c09a14ec1 100644
--- a/net-wireless/hostapd/hostapd-0.3.1.ebuild
+++ b/net-wireless/hostapd/hostapd-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.3.1.ebuild,v 1.1 2004/12/13 09:26:11 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.3.1.ebuild,v 1.2 2005/01/03 11:06:53 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/hostapd/hostapd-0.3.2.ebuild b/net-wireless/hostapd/hostapd-0.3.2.ebuild
index d6eec691b4e8..4b4bf1378bb4 100644
--- a/net-wireless/hostapd/hostapd-0.3.2.ebuild
+++ b/net-wireless/hostapd/hostapd-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.3.2.ebuild,v 1.1 2004/12/20 09:09:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.3.2.ebuild,v 1.2 2005/01/03 11:06:53 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/hostapd/hostapd-0.3.3.ebuild b/net-wireless/hostapd/hostapd-0.3.3.ebuild
new file mode 100644
index 000000000000..07d0c2949774
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.3.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.3.3.ebuild,v 1.1 2005/01/03 11:06:53 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="0.1_pre20041019"
+
+DESCRIPTION="HostAP wireless daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
+		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="ssl"
+
+DEPEND=">=net-wireless/hostap-driver-0.3.0
+		ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# authentication methods
+	echo "CONFIG_EAP=y"           >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y"       >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y"       >> ${CONFIG}
+	echo "CONFIG_IAPP=y"          >> ${CONFIG}
+	echo "CONFIG_PKCS12=y"        >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y"   >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y"       >> ${CONFIG}
+
+	if use ssl; then
+		# SSL authentication methods
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
+	fi
+
+	# Linux specific drivers
+	echo "CONFIG_DRIVER_HOSTAP=y"  >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=y"   >> ${CONFIG}
+	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
+
+	# Add include path for madwifi-driver headers
+	echo "CFLAGS += -I${WORKDIR}"  >> ${CONFIG}
+	echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	insinto /etc/hostapd
+	doins hostapd.conf hostapd.accept hostapd.deny
+
+	dosed 's:\(accept_mac_file=\)/etc/hostapd.accept:\1/etc/hostapd/hostapd.accept:g' \
+		/etc/hostapd/hostapd.conf
+	dosed 's:\(deny_mac_file=\)/etc/hostapd.deny:\1/etc/hostapd/hostapd.deny:g' \
+		/etc/hostapd/hostapd.conf
+
+	dosbin hostapd
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/hostapd.init.d hostapd
+
+	dodoc ChangeLog developer.txt README
+
+	docinto examples
+	dodoc madwifi.conf wired.conf
+}
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index bcc758804c58..2739e7c9e0b6 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/wpa_supplicant
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.8 2004/12/26 21:38:21 brix Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.9 2005/01/03 11:09:01 brix Exp $
+
+*wpa_supplicant-0.3.3 (03 Jan 2005)
+
+  03 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.3.3-conf.d, +files/wpa_supplicant-0.3.3-init.d,
+  +wpa_supplicant-0.3.3.ebuild:
+  New development snapshot.
 
 *wpa_supplicant-0.2.6 (26 Dec 2004)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 2765012f4ed6..8d9986b54412 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,6 +1,7 @@
 MD5 7d8933369ed23d91402eaa3a8041d12e wpa_supplicant-0.2.6.ebuild 2723
 MD5 aebcf20783dcb62a6ae2d33d65497e19 wpa_supplicant-0.2.5-r1.ebuild 1854
 MD5 434a9cf8d7c405f7bfe3dc8b9a1796f8 wpa_supplicant-0.3.1.ebuild 2843
+MD5 6d8049478d30d98640e51a6d691dcca2 wpa_supplicant-0.3.3.ebuild 2901
 MD5 c3cec75d7e12b74c46d32639369084e2 wpa_supplicant-0.3.0.ebuild 2872
 MD5 8e5d97a8bbe1a66dda54c8742591d3cc ChangeLog 3041
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
@@ -10,11 +11,14 @@ MD5 6f5827a2c4a23e44c33018d90ac25829 files/wpa_supplicant-0.3.1-conf.d 398
 MD5 11ecf21202cd23fc4faa511fec21a85e files/wpa_supplicant-0.3.1-init.d 975
 MD5 8ce172f90e194edc1d06ac18b81a7301 files/wpa_supplicant-0.2.5-conf.d 398
 MD5 b2bb8e6d5a1663945c4ce0d9b4c70ba1 files/wpa_supplicant-0.2.5-config 606
+MD5 586a30fb3487cfd6155df0de2871dedf files/wpa_supplicant-0.3.3-conf.d 398
 MD5 4bec60e49c33275fa8e21d27c3909cc5 files/wpa_supplicant-0.2.5-init.d 974
 MD5 ea1906e324ec931c5a70f344d516dca7 files/digest-wpa_supplicant-0.2.6 156
 MD5 1b08e42f180b3bee6247776212a5fb4f files/digest-wpa_supplicant-0.3.0 156
 MD5 d6b9d13af0f01e8b7fa70b880b8ecdfe files/digest-wpa_supplicant-0.3.1 156
 MD5 3b2cce8cf6663297d567b4f0a7402776 files/digest-wpa_supplicant-0.3.2 156
+MD5 a64b1197d398c9f9c7f2fb9b18f4bfb3 files/digest-wpa_supplicant-0.3.3 156
+MD5 f6319e9891f7bf22f32419bf16535324 files/wpa_supplicant-0.3.3-init.d 975
 MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa_supplicant-0.2.5-r1 235
 MD5 6dbdde5c93f286b00afacc10673e4de7 files/wpa_supplicant-0.3.0-conf.d 398
 MD5 4290cd41db8ead604b3096f53d6795e4 files/wpa_supplicant-0.3.0-init.d 975
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.3 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.3
new file mode 100644
index 000000000000..e40409030727
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.3
@@ -0,0 +1,2 @@
+MD5 ca712a6ef47c46d5fce0e886db87bf7a wpa_supplicant-0.3.3.tar.gz 289131
+MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d
new file mode 100644
index 000000000000..46e8fe44b0ad
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d,v 1.1 2005/01/03 11:09:01 brix Exp $
+
+# List of interfaces
+INTERFACES="eth1"
+
+# Common arguments to all wpa_supplicant instances
+ARGS="-w"
+
+# Interface specific arguments
+#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d
new file mode 100644
index 000000000000..a8d833fb2e85
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d,v 1.1 2005/01/03 11:09:01 brix Exp $
+
+depend() {
+	before net
+}
+
+start() {
+	ebegin "Starting wpa_supplicant"
+
+	if [ ! -f /etc/wpa_supplicant.conf ]; then
+		eerror "Configuration file /etc/wpa_supplicant.conf not found"
+		return 1
+	fi
+
+	if [ -z "$INTERFACES" ]; then
+		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
+		return 1
+	fi
+
+	for IFACE in $INTERFACES; do
+		ebegin "  ${IFACE}"
+
+		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
+
+		/sbin/ifconfig ${IFACE} up
+
+		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
+			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
+		eend $?
+	done
+}
+
+stop() {
+	ebegin "Stopping wpa_supplicant"
+
+	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
+	eend ${?}
+}
+
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild
index 4de737532358..5ee806ce6d46 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild,v 1.1 2004/12/16 19:28:26 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild
index 8e9fd2d97de8..834d5a5a3a96 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild,v 1.1 2004/12/26 21:38:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
index 04fc7099e28a..787183e2d3cd 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild,v 1.1 2004/12/11 14:39:12 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
index 68d183b75fc2..ad05593041e4 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild,v 1.1 2004/12/13 09:24:34 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild
index 31d09522783a..e9c1985a6f9f 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild,v 1.1 2004/12/20 09:11:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild
new file mode 100644
index 000000000000..cdf89bdb4b2f
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild,v 1.1 2005/01/03 11:09:01 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="0.1_pre20041019"
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
+		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="gsm readline ssl"
+
+DEPEND="gsm? ( sys-apps/pcsc-lite )
+		readline? ( sys-libs/ncurses
+					sys-libs/readline )
+		ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# basic setup
+	echo "CONFIG_CTRL_IFACE=y"        >> ${CONFIG}
+	echo "CONFIG_XSUPPLICANT_IFACE=y" >> ${CONFIG}
+
+	# basic authentication methods
+	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
+	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
+
+	if use gsm; then
+		# smart card authentication
+		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+		echo "CONFIG_PCSC=y"    >> ${CONFIG}
+	fi
+
+	if use readline; then
+		# readline/history support for wpa_cli
+		echo "CONFIG_READLINE=y" >> ${CONFIG}
+	fi
+
+	if use ssl; then
+		# SSL authentication methods
+		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
+	fi
+
+	# Linux specific drivers
+	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
+	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
+	echo "CONFIG_DRIVER_IPW2100=y"     >> ${CONFIG}
+	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
+	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
+
+	# Add include path for madwifi-driver headers
+	echo "CFLAGS += -I${WORKDIR}"  >> ${CONFIG}
+	echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
+	dodoc doc/wpa_supplicant.fig
+
+	insinto /etc
+	newins wpa_supplicant.conf wpa_supplicant.conf.example
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${P}-init.d wpa_supplicant || die
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${P}-conf.d wpa_supplicant || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${P} you must create the configuration file"
+	einfo "/etc/wpa_supplicant.conf"
+	einfo
+	einfo "An example configuration file has been installed as"
+	einfo "/etc/wpa_supplicant.conf.example"
+	einfo
+}