New development snapshot.

Package-Manager: portage-2.0.54

11 files changed, 404 insertions, 4 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 9479f99bc9f6..8ed92fbc01b9 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.59 2006/03/15 23:27:39 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.60 2006/03/20 08:14:50 brix Exp $
+
+*hostapd-0.5.2 (20 Mar 2006)
+
+  20 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/hostapd-0.5.2-conf.d, +files/hostapd-0.5.2-init.d,
+  +hostapd-0.5.2.ebuild:
+  New development snapshot.
 
   15 Mar 2006; Henrik Brix Andersen <brix@gentoo.org> hostapd-0.4.8.ebuild:
   Stable on x86.
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 135cc9c64f98..5185dd2a1593 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,10 +1,11 @@
-MD5 8412f7ae5476a9603b2422bf838f7d3f ChangeLog 9784
+MD5 e0c6f44e7ea04eba280b10882355300c ChangeLog 9982
 MD5 b0b607a1e367c39a3b14a50fd66d89b1 files/digest-hostapd-0.4.7-r1 65
 MD5 b0b607a1e367c39a3b14a50fd66d89b1 files/digest-hostapd-0.4.7-r2 65
 MD5 b889b17ff10dbe3193353f453f04be64 files/digest-hostapd-0.4.8 65
 MD5 c19ab8edc7e308271d2d635a18cfa222 files/digest-hostapd-0.5.0 65
 MD5 c19ab8edc7e308271d2d635a18cfa222 files/digest-hostapd-0.5.0-r1 65
 MD5 4b2d0883addad191d4fc38ac342c24e8 files/digest-hostapd-0.5.1 65
+MD5 371819cdecb937819dcca6c56f322ff3 files/digest-hostapd-0.5.2 65
 MD5 d5a08b266b9a031229e8910fe8cd18b3 files/hostapd-0.4.7-conf.d 425
 MD5 4995955a0f26765b587f160d89e83910 files/hostapd-0.4.7-init.d 967
 MD5 b0f2b07b294b771e1ffc4505970cb73d files/hostapd-0.4.8-conf.d 425
@@ -13,10 +14,13 @@ MD5 655fa0ef1b20ccc6bc2268ee90aecc3a files/hostapd-0.5.0-conf.d 425
 MD5 009d662616f66d64ea566b7b132c8556 files/hostapd-0.5.0-init.d 967
 MD5 a45861d1723db49024fa8affa9bfaebf files/hostapd-0.5.1-conf.d 425
 MD5 b73ba7cf689487ef572d0645f81858f3 files/hostapd-0.5.1-init.d 967
+MD5 44e1d599bbbbabcb53ce925ee037e42b files/hostapd-0.5.2-conf.d 245
+MD5 56b31e03a75f471149e3a1f41a6847e2 files/hostapd-0.5.2-init.d 847
 MD5 657b30ed33c277b88ddf007a4d1d55e9 hostapd-0.4.7-r1.ebuild 2738
 MD5 98674360a16af6d2ee36838a0e186c05 hostapd-0.4.7-r2.ebuild 2738
 MD5 f4e6122490ccca438f39e8c3d145809e hostapd-0.4.8.ebuild 3079
 MD5 e81a10191b36ddaa9d236d8db4f52c37 hostapd-0.5.0-r1.ebuild 3249
 MD5 488f000c0a3020fa871f0a636271e284 hostapd-0.5.0.ebuild 3246
 MD5 1e2c8963876964f2584727b4e56b1671 hostapd-0.5.1.ebuild 3246
+MD5 bc4c0700cc1a3d0146808c89508aec19 hostapd-0.5.2.ebuild 3145
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.5.2 b/net-wireless/hostapd/files/digest-hostapd-0.5.2
new file mode 100644
index 000000000000..39c3414070a2
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.5.2
@@ -0,0 +1 @@
+MD5 b7f4739ca4758798f8dc3b1ea9fd00d0 hostapd-0.5.2.tar.gz 367925
diff --git a/net-wireless/hostapd/files/hostapd-0.5.2-conf.d b/net-wireless/hostapd/files/hostapd-0.5.2-conf.d
new file mode 100644
index 000000000000..7d05735eb3b4
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-0.5.2-conf.d
@@ -0,0 +1,9 @@
+# Space separated List of interfaces which needs to be started before
+# hostapd
+INTERFACES="wlan0"
+
+# Space separated list of configuration files
+CONFIGS="/etc/hostapd/hostapd.conf"
+
+# Extra options to pass to hostapd, see hostapd(8)
+OPTIONS=""
diff --git a/net-wireless/hostapd/files/hostapd-0.5.2-init.d b/net-wireless/hostapd/files/hostapd-0.5.2-init.d
new file mode 100644
index 000000000000..0fb3cd4ee169
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-0.5.2-init.d
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.5.2-init.d,v 1.1 2006/03/20 08:14:51 brix Exp $
+
+opts="start stop reload"
+
+depend() {
+	local iface
+
+	for iface in ${INTERFACES}; do
+		need net.${iface}
+	done
+
+	use logger
+}
+
+checkconfig() {
+	local file
+
+	for file in ${CONFIGS}; do
+		if [[ ! -r ${file} ]]; then
+			eerror "hostapd configuration file (${CONFIG}) not found"
+			return 1
+		fi
+	done
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting hostapd"
+	start-stop-daemon --start --exec /usr/sbin/hostapd \
+		-- -B ${OPTIONS} ${CONFIGS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping hostapd"
+	start-stop-daemon --stop --exec /usr/sbin/hostapd
+	eend ${?}
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading hostapd configuration"
+	kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
+	eend ${?}
+}
diff --git a/net-wireless/hostapd/hostapd-0.5.2.ebuild b/net-wireless/hostapd/hostapd-0.5.2.ebuild
new file mode 100644
index 000000000000..5176a4faa4ec
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.5.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.5.2.ebuild,v 1.1 2006/03/20 08:14:51 brix Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="ipv6 logwatch madwifi ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+		madwifi? ( >=net-wireless/madwifi-driver-0.1_pre20050420-r1 )"
+DEPEND="${RDEPEND}
+		sys-apps/sed"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		${S}/hostapd.conf
+
+	# 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}
+	echo "CONFIG_STAKEY=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
+
+	if use ipv6; then
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	# Linux specific drivers
+	echo "CONFIG_DRIVER_HOSTAP=y"  >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=y"   >> ${CONFIG}
+	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
+
+	if use madwifi; then
+		# Add include path for madwifi-driver headers
+		echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> ${CONFIG}
+		echo "CONFIG_DRIVER_MADWIFI=y"                 >> ${CONFIG}
+	fi
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use ssl; then
+		emake nt_password_hash || die "emake nt_password_hash failed"
+	fi
+}
+
+src_install() {
+	insinto /etc/hostapd
+	doins hostapd.conf hostapd.accept hostapd.deny \
+		hostapd.eap_user hostapd.radius_clients hostapd.sim_db hostapd.wpa_psk
+
+	dosbin hostapd
+	dobin hostapd_cli
+	use ssl && dobin nt_password_hash
+
+	newinitd ${FILESDIR}/${P}-init.d hostapd
+	newconfd ${FILESDIR}/${P}-conf.d hostapd
+
+	doman hostapd.8 hostapd_cli.1
+
+	dodoc ChangeLog developer.txt README
+
+	docinto examples
+	dodoc madwifi.conf wired.conf
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/hostapd.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/hostapd
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "In order to use ${PN} you need to set up your wireless card"
+	einfo "for master mode in /etc/conf.d/net or /etc/conf.d/wireless"
+	einfo "and then start /etc/init.d/hostapd."
+	einfo
+	einfo "Example configuration:"
+	einfo
+	einfo "config_wlan0=( \"192.168.1.1/24\" )"
+	einfo "channel_wlan0=\"6\""
+	einfo "essid_wlan0=\"test\""
+	einfo "mode_wlan0=\"master\""
+	einfo
+	if use madwifi; then
+		einfo "This package now compiles against the headers installed by"
+		einfo "net-wireless/madwifi-driver. You should remerge ${PN} after"
+		einfo "upgrading net-wireless/madwifi-driver."
+		einfo
+	fi
+}
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 52478660f5aa..607a240423ad 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.53 2006/03/15 23:32:04 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.54 2006/03/20 08:16:34 brix Exp $
+
+*wpa_supplicant-0.5.2 (20 Mar 2006)
+
+  20 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.5.2-wpa_cli.sh, +wpa_supplicant-0.5.2.ebuild:
+  New development snapshot.
 
   15 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
   wpa_supplicant-0.4.8.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index f29091bf4098..909aceedd535 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,16 +1,18 @@
-MD5 05564263f418c83a60c8683aaa49e0de ChangeLog 13151
+MD5 1d47c44a735ecfdef38007315264d5a1 ChangeLog 13343
 MD5 399c0ed3e8d999a49b9435a83705f96c files/digest-wpa_supplicant-0.4.7 72
 MD5 399c0ed3e8d999a49b9435a83705f96c files/digest-wpa_supplicant-0.4.7-r1 72
 MD5 3c1bdab1affb98719ab98620e2863c8d files/digest-wpa_supplicant-0.4.8 72
 MD5 a62623b2da060504fd692243f7fe8565 files/digest-wpa_supplicant-0.5.0 72
 MD5 a62623b2da060504fd692243f7fe8565 files/digest-wpa_supplicant-0.5.0-r1 72
 MD5 5bfea8bd43099447fbc04e9d1ea252f9 files/digest-wpa_supplicant-0.5.1 72
+MD5 a9017f6f882a41e700a0a517ef60e964 files/digest-wpa_supplicant-0.5.2 72
 MD5 733cfce52cfeaadca5b61e90b36fd90b files/wpa_supplicant-0.4.5-wpa_cli.action 1233
 MD5 c3e0a211ce07e200426b871069487403 files/wpa_supplicant-0.4.6-wpa_cli.action 1233
 MD5 647ec6dd4aa43749b03eabb84072b161 files/wpa_supplicant-0.4.7-wpa_cli.action 1233
 MD5 c6d1b2e0c7ae03ce2de856f00f4718d8 files/wpa_supplicant-0.4.8-wpa_cli.action 1233
 MD5 5f13846e2c19fe54d04d79d05fd5638b files/wpa_supplicant-0.5.0-wpa_cli.action 1233
 MD5 2ecf4177ed028679f9699adbddf44a1e files/wpa_supplicant-0.5.1-wpa_cli.sh 1229
+MD5 8e6592a74a9ec38472748f935ba407a0 files/wpa_supplicant-0.5.2-wpa_cli.sh 1104
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 8dfebc5985f7972d0d715dd003bf1c5a wpa_supplicant-0.4.7-r1.ebuild 3909
 MD5 e160e685fea1c7c2717acebbe4fe6dff wpa_supplicant-0.4.7.ebuild 3564
@@ -18,3 +20,4 @@ MD5 9414c0c30939cc9396b55d6c8621a452 wpa_supplicant-0.4.8.ebuild 3905
 MD5 9bba1cd8d3c57b397850e7288489eed2 wpa_supplicant-0.5.0-r1.ebuild 3955
 MD5 b8e4a9f34bdfbcf05f03a39b8d600186 wpa_supplicant-0.5.0.ebuild 3610
 MD5 95677943f0c2e744da906043c1d8e94d wpa_supplicant-0.5.1.ebuild 4047
+MD5 83b1f18dedffcbd2988cf1694fa73cd4 wpa_supplicant-0.5.2.ebuild 4201
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.2 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.2
new file mode 100644
index 000000000000..087075f19971
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.2
@@ -0,0 +1 @@
+MD5 a73b5b1be3f20f3e2c4d325f0a7a38e4 wpa_supplicant-0.5.2.tar.gz 523404
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.2-wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.2-wpa_cli.sh
new file mode 100644
index 000000000000..5d162694a642
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.2-wpa_cli.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright 1999-2006 Gentoo Foundation
+# Written by Roy Marples <uberlord@gentoo.org>
+# Distributed under the terms of the GNU General Public License v2
+# Alternatively, this file may be distributed under the terms of the BSD License
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.2-wpa_cli.sh,v 1.1 2006/03/20 08:16:34 brix Exp $
+
+if [ -z "$1" -o -z "$2" ]; then
+	echo "Insufficient parameters" > /dev/stderr
+	exit 1
+fi
+
+INTERFACE="$1"
+ACTION="$2"
+
+# Note, the below action must NOT mark the interface down via ifconfig, ip or
+# similar. Addresses can be removed, changed and daemons can be stopped, but
+# the interface must remain up for wpa_supplicant to work.
+
+if [ -f /etc/gentoo-release ]; then
+	EXEC="/etc/init.d/net.${INTERFACE} --quiet"
+else
+	echo "I don't know what to do with this distro!" > /dev/stderr
+	exit 1
+fi
+
+case ${ACTION} in
+	CONNECTED)
+		EXEC="${EXEC} start"
+		;;
+	DISCONNECTED)
+		EXEC="${EXEC} stop"
+		;;
+	*)
+		echo "Unknown action ${ACTION}" > /dev/stderr
+		exit 1
+		;;
+esac
+
+# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't
+# stopping the interface and a background process - like wpa_cli - is.
+export IN_BACKGROUND=true
+
+${EXEC}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild
new file mode 100644
index 000000000000..7240984b50c2
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2006 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.5.2.ebuild,v 1.1 2006/03/20 08:16:34 brix Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-${PV/_/-}
+S=${WORKDIR}/${MY_P}
+
+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"
+LICENSE="|| ( GPL-2 BSD )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gsm madwifi qt readline ssl"
+
+RDEPEND="gsm? ( sys-apps/pcsc-lite )
+		qt? ( || ( =x11-libs/qt-3* =x11-libs/qt-4* ) )
+		readline? ( sys-libs/ncurses
+					sys-libs/readline )
+		ssl? ( dev-libs/openssl )
+		madwifi? ( >=net-wireless/madwifi-driver-0.1401.20060117 )"
+DEPEND="sys-apps/sed
+		${RDEPEND}"
+
+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_BACKEND=file" >> ${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}
+	echo "CONFIG_STAKEY=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}
+		echo "CONFIG_SMARTCARD=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}
+	echo "CONFIG_DRIVER_WIRED=y"       >> ${CONFIG}
+
+	if use madwifi; then
+		# Add include path for madwifi-driver headers
+		echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> ${CONFIG}
+		echo "CONFIG_DRIVER_MADWIFI=y"                 >> ${CONFIG}
+	fi
+
+	# people seem to take the example file too literally, bug #102361
+	sed -i \
+		-e "s:^\(opensc_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_module_path\):#\1:" \
+		${S}/wpa_supplicant.conf || die
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use qt; then
+		if has_version '=x11-libs/qt-4*'; then
+			qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
+			cd "${S}"/wpa_gui-qt4
+			emake || die "emake wpa_gui-qt4 failed"
+		else
+			[[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings
+			emake wpa_gui || die "emake wpa_gui failed"
+		fi
+	fi
+}
+
+src_install() {
+	into /
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	exeinto /etc/wpa_supplicant/
+	newexe ${FILESDIR}/${MY_P}-wpa_cli.sh wpa_cli.sh
+
+	# compatibility symlink for older baselayout
+	dosym /etc/wpa_supplicant/wpa_cli.sh /sbin/wpa_cli.action
+
+	if use qt; then
+		into /usr
+
+		if has_version '=x11-libs/qt-4*'; then
+			dobin wpa_gui-qt4/wpa_gui
+		else
+			dobin wpa_gui/wpa_gui
+		fi
+	fi
+
+	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
+	newdoc wpa_supplicant.conf wpa_supplicant.conf.example
+
+	doman doc/docbook/*.8
+	doman doc/docbook/*.5
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${MY_P} you must create the configuration file"
+	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
+	einfo
+	einfo "An example configuration file is available as"
+	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.example.gz"
+	einfo
+	if use madwifi; then
+		einfo "This package now compiles against the headers installed by"
+		einfo "net-wireless/madwifi-driver. You should reemerge ${PN} after"
+		einfo "upgrading net-wireless/madwifi-driver."
+		einfo
+	fi
+}