From 498d3e05a8417c5f09d6f9f958fcec556e03665d Mon Sep 17 00:00:00 2001 From: Bjarke Istrup Pedersen Date: Sat, 14 Nov 2015 13:29:52 +0000 Subject: [PATCH] net-wireless/wpa_supplicant: Bumping to 2.5-r1 This fixes the following bugs: #506886, #565270, #565450 Package-Manager: portage-2.2.24 --- ....5.ebuild => wpa_supplicant-2.5-r1.ebuild} | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) rename net-wireless/wpa_supplicant/{wpa_supplicant-2.5.ebuild => wpa_supplicant-2.5-r1.ebuild} (96%) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild similarity index 96% rename from net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild rename to net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild index 7e8122ddf35a..b183c3643a0a 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.5-r1.ebuild @@ -13,7 +13,7 @@ LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )" CDEPEND="dbus? ( sys-apps/dbus ) @@ -38,9 +38,17 @@ CDEPEND="dbus? ( sys-apps/dbus ) sys-libs/ncurses:0= sys-libs/readline:0 ) - ssl? ( dev-libs/openssl:0 ) - !ssl? ( gnutls? ( net-libs/gnutls ) ) - !ssl? ( !gnutls? ( dev-libs/libtommath ) ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + !ssl? ( + gnutls? ( + net-libs/gnutls + dev-libs/libgcrypt:* + ) + !gnutls? ( dev-libs/libtommath ) + ) " DEPEND="${CDEPEND} virtual/pkgconfig @@ -157,6 +165,9 @@ 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 -- 2.26.2