New stable release.

(Portage version: 2.0.51.22-r1)

13 files changed, 339 insertions, 15 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 4ba6f083ad2d..5239c83116de 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.37 2005/05/23 11:44:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.38 2005/06/11 09:36:31 brix Exp $
+
+*hostap-driver-0.3.9 (11 Jun 2005)
+
+  11 Jun 2005; <brix@gentoo.org> +files/hostap-driver-0.3.9-firmware.patch,
+  +hostap-driver-0.3.9.ebuild:
+  New stable release.
 
 *hostap-driver-0.4.1 (23 May 2005)
 
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index ba4dc81215fe..85f44cb1990c 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,14 +1,17 @@
 MD5 7a12001557f4b22aeb53aec8c27dc87f hostap-driver-0.3.7.ebuild 2758
 MD5 d9d8da6b47513f08b48995b7e52453f9 hostap-driver-0.4.0.ebuild 2485
+MD5 18aed928d17d09b2f5a124e0d7460608 hostap-driver-0.3.9.ebuild 2380
 MD5 e07067013550cc1d44ba949484adfdbe hostap-driver-0.2.6-r1.ebuild 2867
 MD5 220066ab65b8d58927fe7083ec1b7870 hostap-driver-0.4.1.ebuild 2485
 MD5 c94b7e9fe75e00370db3af612d4b4761 hostap-driver-0.2.5-r1.ebuild 3607
 MD5 d9bd5ee0790bec1e0174e3a483bf55c6 ChangeLog 7124
 MD5 5f6ec5c50fa3a91a429fec8670cf241b metadata.xml 722
 MD5 2d9db693839a9fb5d88d8e5c1fa13170 files/hostap-driver-0.4.0-firmware.patch 739
+MD5 8214baf7253070b31cf2d9f976229bec files/hostap-driver-0.3.9-firmware.patch 739
 MD5 702e5e315551f06833fde599816fd65a files/digest-hostap-driver-0.2.5-r1 441
 MD5 2867dcc26d843b380c5c6be06a89a9af files/digest-hostap-driver-0.2.6-r1 441
 MD5 176b7133187acc58466f505d727149ac files/digest-hostap-driver-0.3.7 441
+MD5 d56a1f3da96fc43c6a4a13838b71d3f6 files/digest-hostap-driver-0.3.9 71
 MD5 2b82d64ebc2aa9b711920761843b7368 files/digest-hostap-driver-0.4.0 71
 MD5 4ddbfa2123a5985cf0494985b1d7414f files/digest-hostap-driver-0.4.1 71
 MD5 d76aa90f71a4ef13a49ccca8863b66ba files/hostap-driver-0.2.6-firmware.patch 739
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.9 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.9
new file mode 100644
index 000000000000..1f4d9d4d5523
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.3.9
@@ -0,0 +1 @@
+MD5 6eac8910802c5535bc5248eae259b228 hostap-driver-0.3.9.tar.gz 200847
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.3.9-firmware.patch b/net-wireless/hostap-driver/files/hostap-driver-0.3.9-firmware.patch
new file mode 100644
index 000000000000..2d966b691ec7
--- /dev/null
+++ b/net-wireless/hostap-driver/files/hostap-driver-0.3.9-firmware.patch
@@ -0,0 +1,12 @@
+diff -urp hostap-driver-0.3.9/driver/modules/hostap_config.h hostap-driver-0.3.9-firmware/driver/modules/hostap_config.h
+--- hostap-driver-0.3.9/driver/modules/hostap_config.h	2005-06-11 05:03:36.000000000 +0200
++++ hostap-driver-0.3.9-firmware/driver/modules/hostap_config.h	2005-06-11 11:24:45.000000000 +0200
+@@ -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.3.9.ebuild b/net-wireless/hostap-driver/hostap-driver-0.3.9.ebuild
new file mode 100644
index 000000000000..47509c8772bc
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.3.9.ebuild
@@ -0,0 +1,94 @@
+# 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.9.ebuild,v 1.1 2005/06/11 09:36:31 brix Exp $
+
+inherit toolchain-funcs eutils linux-mod
+
+DESCRIPTION="Driver for Intersil Prism2/2.5/3 based IEEE 802.11b wireless LAN products"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~ppc"
+IUSE="pcmcia"
+SLOT="0"
+
+RDEPEND=">=net-wireless/wireless-tools-25"
+
+BUILD_PARAMS="KERNEL_PATH=${KV_DIR}"
+BUILD_TARGETS="all"
+MODULESD_HOSTAP_DOCS="README"
+
+CONFIG_CHECK="NET_RADIO"
+NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+
+pkg_setup() {
+	MODULE_NAMES="hostap(net::${S}/driver/modules)
+				hostap_pci(net::${S}/driver/modules)
+				hostap_plx(net::${S}/driver/modules)
+				hostap_crypt_wep(net::${S}/driver/modules)
+				hostap_crypt_ccmp(net::${S}/driver/modules)
+				hostap_crypt_tkip(net::${S}/driver/modules)"
+
+	if use pcmcia; then
+		MODULE_NAMES="${MODULE_NAMES} hostap_cs(net::${S}/driver/modules)"
+	fi
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-firmware.patch
+
+	# set compiler
+	sed -i "s:gcc:$(tc-getCC):" ${S}/Makefile
+
+	# unpack the pcmcia-cs sources if needed
+	pcmcia_src_unpack
+
+	# 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
+
+	convert_to_m ${S}/Makefile
+}
+
+src_install() {
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins driver/etc/hostap_cs.conf
+	fi
+
+	dodoc ChangeLog
+
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	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
+
+	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 ""
+
+	linux-mod_pkg_postinst
+}
diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index fba40e7b516e..4ca61970e1e0 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.29 2005/05/23 11:47:42 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.30 2005/06/11 09:38:17 brix Exp $
+
+*hostapd-0.3.9 (11 Jun 2005)
+
+  11 Jun 2005; <brix@gentoo.org> +hostapd-0.3.9.ebuild:
+  New stable release.
 
 *hostapd-0.4.1 (23 May 2005)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 73a81e5132c5..541eb271f0e0 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -3,12 +3,14 @@ MD5 c5e8b64dc57b18327f36d8530dda4921 hostapd-0.4.1.ebuild 2158
 MD5 a1ffc69d43fb9333ba712a41d0966775 hostapd-0.4.0-r1.ebuild 2161
 MD5 32b4c4cf4e25ff18aa6d6592d424bfa4 hostapd-0.3.7.ebuild 2115
 MD5 e1948d4ae3d8cd344d53ecb6166d2192 hostapd-0.2.6.ebuild 1021
-MD5 dc70b154bc0a0efbbfe47f8004d1fdb0 ChangeLog 4314
+MD5 f8ce7e91897314f20e0fd6fbb44d020b hostapd-0.3.9.ebuild 2032
+MD5 f7d75f9bfbe31f16cf95495e0c624c65 ChangeLog 4423
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
 MD5 15c56fec11babac2ba5846b20fa571df files/hostapd-0.4.1-conf.d 425
 MD5 ba14f3282c1fe345b2b9bc3233bc2f6d files/digest-hostapd-0.2.5 65
 MD5 9cbbd29bd90ddbddaa1abe1e726e2fd1 files/digest-hostapd-0.2.6 65
 MD5 3cb68569c34f2c059da88220513d9af4 files/digest-hostapd-0.3.7 150
+MD5 1a5ea229c1f23346e39a4af2abd08add files/digest-hostapd-0.3.9 150
 MD5 26b88f2fe60b7f9aaed70cd87d172f87 files/digest-hostapd-0.4.1 150
 MD5 cf287b50f0ccd832a08fb3031281cd4f files/hostapd.init.d 858
 MD5 7f75e4d61b1b99452beb1027fc61462e files/hostapd-0.4.1-init.d 982
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.3.9 b/net-wireless/hostapd/files/digest-hostapd-0.3.9
new file mode 100644
index 000000000000..344f6a5a7d9f
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.3.9
@@ -0,0 +1,2 @@
+MD5 c9cab38387594090a36062008b3de59e hostapd-0.3.9.tar.gz 246919
+MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/hostapd/hostapd-0.3.9.ebuild b/net-wireless/hostapd/hostapd-0.3.9.ebuild
new file mode 100644
index 000000000000..b088dd2ec26b
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.3.9.ebuild
@@ -0,0 +1,79 @@
+# 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.9.ebuild,v 1.1 2005/06/11 09:38:17 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="2005-04-20"
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
+		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="ssl"
+
+DEPEND="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}/madwifi" >> ${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
+
+	newinitd ${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 b8ff9bc73533..15e3173ede37 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.24 2005/05/27 07:57:34 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.25 2005/06/11 09:41:00 brix Exp $
+
+*wpa_supplicant-0.3.9 (11 Jun 2005)
+
+  11 Jun 2005; <brix@gentoo.org> +wpa_supplicant-0.3.9.ebuild:
+  New stable release.
 
   27 May 2005; Lars Weiler <pylon@gentoo.org> wpa_supplicant-0.3.8.ebuild:
   Stable on ppc.
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index b7b1a1754ccf..8d41a0d0e5ac 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,20 +1,22 @@
-MD5 ef04ba020a435b09182559cf64b20f2f ChangeLog 7281
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 4d2fd49e3994d5cabec6b9c26b92ea11 wpa_supplicant-0.2.7.ebuild 2722
+MD5 1c914826bb810161486a241d047eebc5 wpa_supplicant-0.3.9.ebuild 3078
 MD5 5c367e1ee7f780b0d5539c68d1ec1100 wpa_supplicant-0.3.8.ebuild 3127
-MD5 8a525c1c0f9610f81add0b4e6fcf762d wpa_supplicant-0.4.0.ebuild 3291
 MD5 7093cee7143930fcf60e66ab0b5df1b1 wpa_supplicant-0.4.1.ebuild 3497
-MD5 45abb8645fc71ba3dec029527af5375a files/wpa_supplicant-0.4.0-wpa_cli.action 1233
-MD5 5f93177414c5f5e6a21efb7aeb83ddb8 files/digest-wpa_supplicant-0.4.1 157
+MD5 4d2fd49e3994d5cabec6b9c26b92ea11 wpa_supplicant-0.2.7.ebuild 2722
+MD5 0ae60487334a1489dcf8f0b90c25e0ee ChangeLog 7404
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 8a525c1c0f9610f81add0b4e6fcf762d wpa_supplicant-0.4.0.ebuild 3291
+MD5 78e1b4e6585e53e08ba3210eb53d4258 files/wpa_supplicant-0.3.8-conf.d 394
 MD5 1e84620fc5d91acb84e7a280c9adc0ea files/wpa_supplicant-0.4.1-conf.d 394
 MD5 461b028eb4103f140fa88d33efbb640a files/digest-wpa_supplicant-0.2.7 156
 MD5 6b30dfb43745d57ea0280e9fb1467546 files/digest-wpa_supplicant-0.3.8 157
+MD5 a5d385e515e9989ba56f4c89fd83091a files/digest-wpa_supplicant-0.3.9 157
+MD5 8a187dfdf8f03c84c486378b2b165f06 files/digest-wpa_supplicant-0.4.0 157
+MD5 5f93177414c5f5e6a21efb7aeb83ddb8 files/digest-wpa_supplicant-0.4.1 157
+MD5 95a04705cb8e47f8d4611186cffb6a96 files/wpa_supplicant-0.3.8-init.d 975
+MD5 aa75bd008ca09560a1567034a989b283 files/wpa_supplicant-0.4.1-init.d 975
 MD5 38d9ee18b195a6ceb213c1c74a57aab9 files/wpa_supplicant-0.2.7-conf.d 398
 MD5 d49276870258f0f4b9f8830e82553e7b files/wpa_supplicant-0.2.7-init.d 975
-MD5 78e1b4e6585e53e08ba3210eb53d4258 files/wpa_supplicant-0.3.8-conf.d 394
-MD5 95a04705cb8e47f8d4611186cffb6a96 files/wpa_supplicant-0.3.8-init.d 975
-MD5 8a187dfdf8f03c84c486378b2b165f06 files/digest-wpa_supplicant-0.4.0 157
+MD5 6ff8ebd7ae71a2838c63f9e7427f297c files/wpa_supplicant-0.4.1-wpa_cli.action 1233
 MD5 035f82dc368ff221eb6580fbbf45ce39 files/wpa_supplicant-0.4.0-conf.d 394
+MD5 45abb8645fc71ba3dec029527af5375a files/wpa_supplicant-0.4.0-wpa_cli.action 1233
 MD5 76ed26073c863e8f5a59de859c510694 files/wpa_supplicant-0.4.0-init.d 975
-MD5 aa75bd008ca09560a1567034a989b283 files/wpa_supplicant-0.4.1-init.d 975
-MD5 6ff8ebd7ae71a2838c63f9e7427f297c files/wpa_supplicant-0.4.1-wpa_cli.action 1233
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.9 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.9
new file mode 100644
index 000000000000..ad7be5d42221
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.9
@@ -0,0 +1,2 @@
+MD5 113873aafc4fcaa0515841a6f0a17fd0 wpa_supplicant-0.3.9.tar.gz 310421
+MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.9.ebuild
new file mode 100644
index 000000000000..e64ef5138a51
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.9.ebuild
@@ -0,0 +1,111 @@
+# 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.9.ebuild,v 1.1 2005/06/11 09:41:00 brix Exp $
+
+inherit toolchain-funcs
+
+MY_P=${PN}-${PV/_/-}
+S=${WORKDIR}/${MY_P}
+
+MADWIFI_VERSION="2005-04-20"
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz
+		mirror://gentoo/madwifi-cvs-snapshot-${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_IPW=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}/madwifi" >> ${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
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${MY_P} you must create the configuration file"
+	einfo "/etc/wpa_supplicant.conf"
+	einfo
+	einfo "Please notice that the ipw2100 driver has changed name"
+	einfo "to ipw, meaning you will need to specify -Dipw to ${PN}"
+	einfo
+	einfo "An example configuration file has been installed as"
+	einfo "/etc/wpa_supplicant.conf.example"
+	einfo
+	einfo "Please note that the wpa_supplicant init script has been"
+	einfo "removed in favor of sys-apps/baselayout-1.11.x"
+	einfo
+}