Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 462032 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild (-2 / +23 lines)
Lines 13-26 Link Here
13
13
14
SLOT="0"
14
SLOT="0"
15
KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
15
KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
16
IUSE="ap dbus gnutls eap-sim fasteap p2p ps3 qt4 readline selinux smartcard ssl wimax wps kernel_linux kernel_FreeBSD"
16
IUSE="ap crda dbus gnutls eap-sim fasteap p2p ps3 qt4 readline selinux smartcard ssl wimax wps kernel_linux kernel_FreeBSD"
17
REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )"
17
REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )"
18
18
19
RDEPEND="dbus? ( sys-apps/dbus )
19
RDEPEND="dbus? ( sys-apps/dbus )
20
	kernel_linux? (
20
	kernel_linux? (
21
		eap-sim? ( sys-apps/pcsc-lite )
21
		eap-sim? ( sys-apps/pcsc-lite )
22
		dev-libs/libnl:3
22
		dev-libs/libnl:3
23
		net-wireless/crda
23
		crda? ( net-wireless/crda )
24
		!crda? ( net-wireless/wireless-regdb )
24
	)
25
	)
25
	!kernel_linux? ( net-libs/libpcap )
26
	!kernel_linux? ( net-libs/libpcap )
26
	qt4? (
27
	qt4? (
Lines 120-125 Link Here
120
	echo "CONFIG_EAP_TLS=y"         >> .config
121
	echo "CONFIG_EAP_TLS=y"         >> .config
121
	echo "CONFIG_EAP_TTLS=y"        >> .config
122
	echo "CONFIG_EAP_TTLS=y"        >> .config
122
123
124
	# Skip out on the CRDA and udev requirement 
125
	# depends on net-wireless/wireless-regdb
126
	# NOTE: not recommended but a proposed workaround
127
	if use crda ; then
128
		echo "CONFIG_CFG80211_INTERNAL_REGDB=y" >> .config
129
	fi
130
123
	if use dbus ; then
131
	if use dbus ; then
124
		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
132
		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
125
		echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config
133
		echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config
Lines 299-304 Link Here
299
	elog "An example configuration file is available for reference in"
307
	elog "An example configuration file is available for reference in"
300
	elog "/usr/share/doc/${PF}/"
308
	elog "/usr/share/doc/${PF}/"
301
309
310
	# prevent udev dependency pulled by crda installation
311
	if use !crda; then
312
		elog ""
313
		elog "internal regdb enabled"
314
		elog ""
315
		elog "The downside to using this option is that you will need to"
316
		elog "to rebuild your kernel for any regulatory updates,"
317
		elog "therefore using CONFIG_CFG80211_INTERNAL_REGDB is not recommended."
318
		elog ""
319
		elog "For further information read:"
320
		elog "http://wireless.kernel.org/en/developers/Regulatory/CRDA"
321
	fi
322
302
	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
323
	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
303
		echo
324
		echo
304
		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
325
		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"

Return to bug 462032