Fix compilation with USE=-ssl, thanks to langthang in bug #127598. Pruned old ebuilds.

Package-Manager: portage-2.0.54

16 files changed, 30 insertions, 621 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 8ed92fbc01b9..960cdf0d592c 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.60 2006/03/20 08:14:50 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.61 2006/03/26 12:15:07 brix Exp $
+
+  26 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
+  -files/hostapd-0.5.0-conf.d, -files/hostapd-0.5.0-init.d,
+  -files/hostapd-0.5.1-conf.d, -files/hostapd-0.5.1-init.d,
+  +files/hostapd-0.5.2-ssl.patch, -hostapd-0.4.7-r1.ebuild,
+  -hostapd-0.5.0.ebuild, -hostapd-0.5.0-r1.ebuild, -hostapd-0.5.1.ebuild,
+  hostapd-0.5.2.ebuild:
+  Fix compilation with USE=-ssl, thanks to langthang in bug #127598. Pruned
+  old ebuilds.
 
 *hostapd-0.5.2 (20 Mar 2006)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 7d07dea3c40c..40fb5cc834d6 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,26 +1,15 @@
-MD5 87a7fe07a108cc6cc19cd83f0404b023 ChangeLog 9982
-MD5 b0b607a1e367c39a3b14a50fd66d89b1 files/digest-hostapd-0.4.7-r1 65
+MD5 80747f90aa385255781fc17382f63c46 ChangeLog 10406
 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
 MD5 4150a7586faf504196a8f4f4e46c4b7a files/hostapd-0.4.8-init.d 967
-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 124087c0589db2ab55758b3316d43edf files/hostapd-0.5.2-init.d 954
-MD5 657b30ed33c277b88ddf007a4d1d55e9 hostapd-0.4.7-r1.ebuild 2738
+MD5 b4a52e58c5b08e2f69f837d0a811b8d4 files/hostapd-0.5.2-ssl.patch 371
 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 15482e4a6c821de89d4a892cdd230805 hostapd-0.5.2.ebuild 3246
+MD5 335990396cc91a2191dac8b570b05b00 hostapd-0.5.2.ebuild 3298
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.4.7-r1 b/net-wireless/hostapd/files/digest-hostapd-0.4.7-r1
deleted file mode 100644
index 4680e1c2c50f..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.4.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b299211691fe8a6840e7adafda351d2b hostapd-0.4.7.tar.gz 288016
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.5.0 b/net-wireless/hostapd/files/digest-hostapd-0.5.0
deleted file mode 100644
index f5d254f23e44..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 abfe9a3381437e580001b484b7f77335 hostapd-0.5.0.tar.gz 323906
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.5.0-r1 b/net-wireless/hostapd/files/digest-hostapd-0.5.0-r1
deleted file mode 100644
index f5d254f23e44..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.5.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 abfe9a3381437e580001b484b7f77335 hostapd-0.5.0.tar.gz 323906
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.5.1 b/net-wireless/hostapd/files/digest-hostapd-0.5.1
deleted file mode 100644
index f4c0777a231a..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e38533604187e291f45a2f6873b71cc hostapd-0.5.1.tar.gz 336232
diff --git a/net-wireless/hostapd/files/hostapd-0.5.0-conf.d b/net-wireless/hostapd/files/hostapd-0.5.0-conf.d
deleted file mode 100644
index 0d71d622363f..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.5.0-conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2005 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.0-conf.d,v 1.1 2005/12/20 11:09:30 brix Exp $
-
-# List of interfaces which needs to be started before hostapd
-INTERFACES="wlan0"
-
-# List of configuration files
-CONFIGS="/etc/hostapd/hostapd.conf"
-
-# Extra options to pass to hostapd
-OPTIONS="-B"
diff --git a/net-wireless/hostapd/files/hostapd-0.5.0-init.d b/net-wireless/hostapd/files/hostapd-0.5.0-init.d
deleted file mode 100644
index 5888d353e079..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.5.0-init.d
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 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.0-init.d,v 1.2 2006/01/09 16:55:36 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 --quiet --exec /usr/sbin/hostapd \
-		-- ${OPTIONS} ${CONFIGS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping hostapd"
-	start-stop-daemon --stop --quiet --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/files/hostapd-0.5.1-conf.d b/net-wireless/hostapd/files/hostapd-0.5.1-conf.d
deleted file mode 100644
index 8370fd9df7e7..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.5.1-conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2005 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.1-conf.d,v 1.1 2006/01/30 22:28:39 brix Exp $
-
-# List of interfaces which needs to be started before hostapd
-INTERFACES="wlan0"
-
-# List of configuration files
-CONFIGS="/etc/hostapd/hostapd.conf"
-
-# Extra options to pass to hostapd
-OPTIONS="-B"
diff --git a/net-wireless/hostapd/files/hostapd-0.5.1-init.d b/net-wireless/hostapd/files/hostapd-0.5.1-init.d
deleted file mode 100644
index 9f61ceaaf043..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.5.1-init.d
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 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.1-init.d,v 1.1 2006/01/30 22:28:39 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 --quiet --exec /usr/sbin/hostapd \
-		-- ${OPTIONS} ${CONFIGS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping hostapd"
-	start-stop-daemon --stop --quiet --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/files/hostapd-0.5.2-ssl.patch b/net-wireless/hostapd/files/hostapd-0.5.2-ssl.patch
new file mode 100644
index 000000000000..77ab3ace4a31
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-0.5.2-ssl.patch
@@ -0,0 +1,12 @@
+diff -urp hostapd-0.5.2/Makefile hostapd-0.5.2-ssl/Makefile
+--- hostapd-0.5.2/Makefile	2006-03-20 04:20:09.000000000 +0100
++++ hostapd-0.5.2-ssl/Makefile	2006-03-26 14:01:18.000000000 +0200
+@@ -249,7 +249,7 @@ ifdef CONFIG_IPV6
+ CFLAGS += -DCONFIG_IPV6
+ endif
+ 
+-ALL=hostapd hostapd_cli nt_password_hash hlr_auc_gw
++ALL=hostapd hostapd_cli
+ 
+ all: verify_config $(ALL)
+ 
diff --git a/net-wireless/hostapd/hostapd-0.4.7-r1.ebuild b/net-wireless/hostapd/hostapd-0.4.7-r1.ebuild
deleted file mode 100644
index 682df2eee28d..000000000000
--- a/net-wireless/hostapd/hostapd-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.4.7-r1.ebuild,v 1.4 2006/01/02 18:09:54 hansmi 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 ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-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}
-
-	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}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-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
-
-	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
-	einfo "Please notice that madwifi support was removed in this version"
-	einfo "of the ebuild. It will return once madwifi is stable again."
-	einfo
-}
diff --git a/net-wireless/hostapd/hostapd-0.5.0-r1.ebuild b/net-wireless/hostapd/hostapd-0.5.0-r1.ebuild
deleted file mode 100644
index 271743354596..000000000000
--- a/net-wireless/hostapd/hostapd-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.0-r1.ebuild,v 1.3 2006/02/27 21:45:59 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/hostapd/hostapd-0.5.0.ebuild b/net-wireless/hostapd/hostapd-0.5.0.ebuild
deleted file mode 100644
index 53b126067cae..000000000000
--- a/net-wireless/hostapd/hostapd-0.5.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.0.ebuild,v 1.3 2006/02/27 21:45:59 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/hostapd/hostapd-0.5.1.ebuild b/net-wireless/hostapd/hostapd-0.5.1.ebuild
deleted file mode 100644
index fb3c6404e424..000000000000
--- a/net-wireless/hostapd/hostapd-0.5.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.1.ebuild,v 1.3 2006/02/27 21:45:59 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/hostapd/hostapd-0.5.2.ebuild b/net-wireless/hostapd/hostapd-0.5.2.ebuild
index 5176a4faa4ec..7a049c69d18f 100644
--- a/net-wireless/hostapd/hostapd-0.5.2.ebuild
+++ b/net-wireless/hostapd/hostapd-0.5.2.ebuild
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.5.2.ebuild,v 1.2 2006/03/26 12:15:08 brix Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://hostap.epitest.fi"
@@ -24,6 +24,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ssl.patch
+
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
 		${S}/hostapd.conf