diff options
| author |   Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-10-03 19:22:03 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-10-03 19:22:03 +0000 |
| commit | 5e094f0dba4f5ded05667b4bab5ae10c1c34dfb0 (patch) | |
| tree | 73cc37984a7f2ced0c8c0fdce08612a903303569 /net-wireless/wpa_supplicant | |
| parent | Stable for amd64, wrt bug #436940 (diff) | |
| download | gentoo-2-5e094f0dba4f5ded05667b4bab5ae10c1c34dfb0.tar.gz gentoo-2-5e094f0dba4f5ded05667b4bab5ae10c1c34dfb0.tar.bz2 gentoo-2-5e094f0dba4f5ded05667b4bab5ae10c1c34dfb0.zip | |
Migrated to REQUIRED_USE, fixing bug #436824
(Portage version: 2.2.0_alpha134/cvs/Linux i686)
Diffstat (limited to 'net-wireless/wpa_supplicant')
| -rw-r--r-- | net-wireless/wpa_supplicant/ChangeLog | 5 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index 71892b37fb85..13fd608459a3 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.182 2012/06/03 08:03:26 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.183 2012/10/03 19:22:03 gurligebis Exp $ + + 03 Oct 2012; <gurligebis@gentoo.org> wpa_supplicant-1.0.ebuild: + Migrated to REQUIRED_USE, fixing bug #436824 03 Jun 2012; <gurligebis@gentoo.org> wpa_supplicant-1.0.ebuild: Making wpa_supplicant depend on net-wireless/crda on linux, fixing bug diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild index 6a42acc2729a..c955056ccb3d 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild,v 1.3 2012/06/03 08:03:26 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild,v 1.4 2012/10/03 19:22:03 gurligebis Exp $ EAPI=4 @@ -14,6 +14,7 @@ LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline selinux ssl wimax wps kernel_linux kernel_FreeBSD" +REQUIRED_USE="fasteap? ( !gnutls !ssl )" RDEPEND="dbus? ( sys-apps/dbus ) kernel_linux? ( @@ -41,10 +42,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${P}/${PN}" pkg_setup() { - if use fasteap && (use gnutls || use ssl) ; then - die "If you use fasteap, you must build with wpa_supplicant's internal TLS implementation. That is, both 'gnutls' and 'ssl' USE flags must be disabled" - fi - if use gnutls && use ssl ; then einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\"" fi |