Build-time updates

doc/info.txt

@@ -41,7 +41,7 @@ libevent                ssl                     ssl             tor
 aircrack-ng             ssl                     ssl
 
 networkmanager          gnutls, nss             gnutls
-wpa_supplicant          ssl, gnutls, libtom     gnutls          networkmanager
+wpa_supplicant          ssl, gnutls, libtom     ssl             networkmanager
 vpnc                    ssl, gnutls             gnutls          networkmanager-vpnc
 openvpn                 ssl, polarssl           ssl             networkmanager-openvpn
 pkcs11-helper           !ssl, gnutls, nss       ssl             openvpn

src/etc/portage/package.accept_keywords

@@ -1,6 +1,6 @@
 # System
 =app-crypt/gnupg-pkcs11-scd-0.7.3*
-=sys-power/cpupower-3.8*
+=sys-power/cpupower-3.11*
 
 # Boot process (cdrtools: EFI platform support)
 =sys-boot/grub-2.00*:2

src/etc/portage/package.use/all

@@ -34,7 +34,6 @@ x11-base/xorg-drivers           -video_cards_nv
 # Networking, including SSL/TLS
 net-libs/libetpan               gnutls
 net-libs/libmicrohttpd          -ssl
-net-wireless/wpa_supplicant     -ssl  gnutls
 net-misc/networkmanager         gnutls -nss
 net-im/pidgin                   gnutls sasl
 net-analyzer/netcat             -crypt
@@ -116,6 +115,7 @@ media-gfx/ufraw                 gnome contrast timezone
 media-gfx/graphicsmagick        imagemagick
 media-libs/vips                 imagemagick
 net-dialup/ppp                  ipv6
+net-wireless/wpa_supplicant     ap p2p
 
 # Internationalization
 app-i18n/uim                    -linguas_*