--- /usr/portage/net-wireless/hostapd/hostapd-2.4.ebuild	2015-03-21 14:19:27.000000000 +0100
+++ /usr/local/portage/net-wireless/hostapd/hostapd-2.4.ebuild	2015-03-21 19:39:27.877455677 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.4.ebuild,v 1.1 2015/03/21 13:19:27 gurligebis Exp $
+# $Header: $
 
 EAPI="4"
 
@@ -14,8 +14,14 @@
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
+IUSE="${IUSE} hostap nl80211 none wired"
+IUSE="${IUSE} gnutls internal"
 
-DEPEND="ssl? ( dev-libs/openssl[-bindist] )
+REQUIRED_USE="|| ( hostap nl80211 none wired )
+	^^ ( gnutls internal ssl )"
+
+DEPEND="gnutls? ( net-libs/gnutls )
+	ssl? ( dev-libs/openssl[-bindist] )
 	kernel_linux? (
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
@@ -56,6 +62,21 @@
 		echo "CONFIG_TLSV12=y" >> ${CONFIG}
 	fi
 
+	# GNUTLS
+	if use gnutls; then
+		echo "CONFIG_TLS=gnutls" >> ${CONFIG}
+	fi
+
+	# Internal TLSv1 implementation (experimental)
+	if use internal; then
+		echo "CONFIG_TLS=internal" >> ${CONFIG}
+	fi
+
+	# OpenSSL
+	if use ssl; then
+		echo "CONFIG_TLS=openssl" >> ${CONFIG}
+	fi
+
 	if use wps; then
 		# Enable Wi-Fi Protected Setup
 		echo "CONFIG_WPS=y" >> ${CONFIG}
@@ -79,20 +100,25 @@
 	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
 	echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
 
-	einfo "Enabling drivers: "
-
 	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-	einfo "  Prism54 driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
-	einfo "  None driver enabled"
+	einfo "Enabling drivers: "
 
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+	if use hostap; then
+		echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+		einfo "  HostAP driver enabled"
+	fi
+	if use nl80211; then
+		einfo "  nl80211 driver enabled"
+		echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+	fi
+	if use none; then
+		einfo "  nl80211 driver enabled"
+		echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	fi
+	if use wired; then
+		echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+		einfo "  Wired driver enabled"
+	fi
 
 	# misc
 	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}