[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

[Lars Wendler]

commit:     454714bd9c39b2ca6008b136d7e4423e1b8acd7c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 19:49:24 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 19:51:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=454714bd

net-wireless/wpa_supplicant: Fixed build with USE="-ssl" or USE="ssl gnutls".

Committed without explicit permission due to maintainer timeout.

Closes: https://bugs.gentoo.org/640350
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r4.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r4.ebuild
index 04965c898f1..02b2a20e35f 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -174,7 +174,6 @@ src_configure() {
 	Kconfig_style_config EAP_LEAP
 	Kconfig_style_config EAP_MSCHAPV2
 	Kconfig_style_config EAP_PEAP
-	Kconfig_style_config EAP_PWD
 	Kconfig_style_config EAP_TLS
 	Kconfig_style_config EAP_TTLS
 
@@ -182,9 +181,6 @@ src_configure() {
 	Kconfig_style_config BGSCAN_SIMPLE
 	Kconfig_style_config BGSCAN_LEARN
 
-	# Enabling mesh networks.
-	Kconfig_style_config MESH
-
 	if use dbus ; then
 		Kconfig_style_config CTRL_IFACE_DBUS
 		Kconfig_style_config CTRL_IFACE_DBUS_NEW
@@ -239,6 +235,10 @@ src_configure() {
 			Kconfig_style_config GNUTLS_EXTRA
 		else
 			Kconfig_style_config TLS openssl
+			Kconfig_style_config EAP_PWD
+
+			# Enabling mesh networks.
+			Kconfig_style_config MESH
 		fi
 	else
 		Kconfig_style_config TLS internal