commit:     91835ebfb082547cbe6ec2cc35358c2b54f298ac
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 16:23:58 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 16:23:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91835ebf

net-wireless/wpa_supplicant: remove most old

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/wpa_supplicant/Manifest               |   2 -
 net-wireless/wpa_supplicant/metadata.xml           |   1 -
 .../wpa_supplicant/wpa_supplicant-2.6-r10.ebuild   | 463 ---------------------
 .../wpa_supplicant/wpa_supplicant-2.7-r1.ebuild    | 458 --------------------
 .../wpa_supplicant/wpa_supplicant-2.7-r3.ebuild    | 442 --------------------
 .../wpa_supplicant/wpa_supplicant-2.9.ebuild       | 458 --------------------
 6 files changed, 1824 deletions(-)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index 54e1a007a51..637bcc2c825 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,4 +1,2 @@
-DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 
99c61326c402f60b384fa6c9a7381e43d4d021d7e44537a6e05552909270f30997da91b690d8a30aa690f0d1ce0aed7798bd8bb8972fcf6830c282ccc91193ac
 SHA512 
46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6
-DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B 
bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa
 SHA512 
8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3
 DIST wpa_supplicant-2.8.tar.gz 3155904 BLAKE2B 
260b4830949a3e051ef4f33f279b3b225ab9fd95100e4b270d29af457cf07601421fac636d9f1d8927271d7c76aecb0b7c93ddab35203e31a0fd84c3e327d951
 SHA512 
b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B 
f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807
 SHA512 
37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8

diff --git a/net-wireless/wpa_supplicant/metadata.xml 
b/net-wireless/wpa_supplicant/metadata.xml
index a2085baaa25..a52a722509e 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -16,7 +16,6 @@
                <flag name="p2p">Add support for Wi-Fi Direct mode</flag>
                <flag name="ps3">Add support for ps3 hypervisor driven gelic 
wifi</flag>
                <flag name="privsep">Enable wpa_priv privledge separation 
binary</flag>
-               <flag name="suiteb">Enable enable NSA Suite B encryption</flag>
                <flag name="tdls">Add support for Tunneled Direct Link Setup 
(802.11z)</flag>
                <flag name="uncommon-eap-types">Add support for GPSK, SAKE, 
GPSK_SHA256, IKEV2 and EKE</flag>
                <flag name="wps">Add support for Wi-Fi Protected Setup</flag>

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
deleted file mode 100644
index 5c5b91c36f5..00000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="https://w1.fi/wpa_supplicant/";
-SRC_URI="https://w1.fi/releases/${P}.tar.gz";
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p 
privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types 
wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="smartcard? ( ssl )"
-
-CDEPEND="dbus? ( sys-apps/dbus )
-       kernel_linux? (
-               dev-libs/libnl:3
-               net-wireless/crda
-               eap-sim? ( sys-apps/pcsc-lite )
-       )
-       !kernel_linux? ( net-libs/libpcap )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtsvg:5
-               dev-qt/qtwidgets:5
-       )
-       readline? (
-               sys-libs/ncurses:0=
-               sys-libs/readline:0=
-       )
-       ssl? (
-               gnutls? (
-                       dev-libs/libgcrypt:0=
-                       net-libs/gnutls:=
-               )
-               !gnutls? (
-                       !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       !ssl? ( dev-libs/libtommath )
-"
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-networkmanager )
-"
-
-DOC_CONTENTS="
-       If this is a clean installation of wpa_supplicant, you
-       have to create a configuration file named
-       ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf
-       An example configuration file is available for reference in
-       ${EROOT%/}/usr/share/doc/${PF}/
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-Kconfig_style_config() {
-               #param 1 is CONFIG_* item
-               #param 2 is what to set it = to, defaulting in y
-               CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
-               setting="${2:-y}"
-
-               if [ ! $setting = n ]; then
-                       #first remove any leading "# " if $2 is not n
-                       sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo 
"Kconfig_style_config error uncommenting $CONFIG_PARAM"
-                       #set item = $setting (defaulting to y)
-                       sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || 
echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
-                       if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
-                               echo "$CONFIG_PARAM=$setting" >>.config
-                       fi
-               else
-                       #ensure item commented out
-                       sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# 
$CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting 
$CONFIG_PARAM"
-               fi
-}
-
-pkg_setup() {
-       if use ssl ; then
-               if use gnutls && use libressl ; then
-                       elog "You have both 'gnutls' and 'libressl' USE flags 
enabled: defaulting to USE=\"gnutls\""
-               fi
-       else
-               elog "You have 'ssl' USE flag disabled: defaulting to internal 
TLS implementation"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-       sed -i \
-               -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-               ../src/l2_packet/l2_packet_freebsd.c || die
-
-       # People seem to take the example configuration file too literally (bug 
#102361)
-       sed -i \
-               -e "s:^\(opensc_engine_path\):#\1:" \
-               -e "s:^\(pkcs11_engine_path\):#\1:" \
-               -e "s:^\(pkcs11_module_path\):#\1:" \
-               wpa_supplicant.conf || die
-
-       # Change configuration to match Gentoo locations (bug #143750)
-       sed -i \
-               -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-               -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-               wpa_supplicant.conf || die
-
-       # systemd entries to D-Bus service files (bug #372877)
-       echo 'SystemdService=wpa_supplicant.service' \
-               | tee -a dbus/*.service >/dev/null || die
-
-       cd "${WORKDIR}/${P}" || die
-
-       if use wimax; then
-               # generate-libeap-peer.patch comes before
-               # fix-undefined-reference-to-random_get_bytes.patch
-               eapply "${FILESDIR}/${P}-generate-libeap-peer.patch"
-
-               # multilib-strict fix (bug #373685)
-               sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i 
src/eap_peer/Makefile || die
-       fi
-
-       # bug (320097)
-       eapply 
"${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
-
-       # bug (596332 & 651314)
-       eapply "${FILESDIR}/${P}-libressl-compatibility.patch"
-
-       # bug (671006)
-       eapply "${FILESDIR}/${P}-openssl-1.1.patch"
-
-       # 
https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
-       eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
-       eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
-       eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
-       eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
-       eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
-       eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
-       eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"
-       eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
-
-       # https://w1.fi/security/2018-1/unauthenticated-eapol-key-decryption.txt
-       eapply 
"${FILESDIR}/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch"
-
-       # bug (640492)
-       sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
-}
-
-src_configure() {
-       # Toolchain setup
-       tc-export CC
-
-       cp defconfig .config || die
-
-       # Basic setup
-       Kconfig_style_config CTRL_IFACE
-       Kconfig_style_config MATCH_IFACE
-       Kconfig_style_config BACKEND file
-       Kconfig_style_config IBSS_RSN
-       Kconfig_style_config IEEE80211W
-       Kconfig_style_config IEEE80211R
-
-       # Basic authentication methods
-       # NOTE: we don't set GPSK or SAKE as they conflict
-       # with the below options
-       Kconfig_style_config EAP_GTC
-       Kconfig_style_config EAP_MD5
-       Kconfig_style_config EAP_OTP
-       Kconfig_style_config EAP_PAX
-       Kconfig_style_config EAP_PSK
-       Kconfig_style_config EAP_TLV
-       Kconfig_style_config EAP_EXE
-       Kconfig_style_config IEEE8021X_EAPOL
-       Kconfig_style_config PKCS12
-       Kconfig_style_config PEERKEY
-       Kconfig_style_config EAP_LEAP
-       Kconfig_style_config EAP_MSCHAPV2
-       Kconfig_style_config EAP_PEAP
-       Kconfig_style_config EAP_TLS
-       Kconfig_style_config EAP_TTLS
-
-       # Enabling background scanning.
-       Kconfig_style_config BGSCAN_SIMPLE
-       Kconfig_style_config BGSCAN_LEARN
-
-       if use dbus ; then
-               Kconfig_style_config CTRL_IFACE_DBUS
-               Kconfig_style_config CTRL_IFACE_DBUS_NEW
-               Kconfig_style_config CTRL_IFACE_DBUS_INTRO
-       fi
-
-       if use eapol_test ; then
-               Kconfig_style_config EAPOL_TEST
-       fi
-
-       # Enable support for writing debug info to a log file and syslog.
-       Kconfig_style_config DEBUG_FILE
-       Kconfig_style_config DEBUG_SYSLOG
-
-       if use hs2-0 ; then
-               Kconfig_style_config INTERWORKING
-               Kconfig_style_config HS20
-       fi
-
-       if use uncommon-eap-types; then
-               Kconfig_style_config EAP_GPSK
-               Kconfig_style_config EAP_SAKE
-               Kconfig_style_config EAP_GPSK_SHA256
-               Kconfig_style_config EAP_IKEV2
-               Kconfig_style_config EAP_EKE
-       fi
-
-       if use eap-sim ; then
-               # Smart card authentication
-               Kconfig_style_config EAP_SIM
-               Kconfig_style_config EAP_AKA
-               Kconfig_style_config EAP_AKA_PRIME
-               Kconfig_style_config PCSC
-       fi
-
-       if use fasteap ; then
-               Kconfig_style_config EAP_FAST
-       fi
-
-       if use readline ; then
-               # readline/history support for wpa_cli
-               Kconfig_style_config READLINE
-       else
-               #internal line edit mode for wpa_cli
-               Kconfig_style_config WPA_CLI_EDIT
-       fi
-
-       if use suiteb; then
-               Kconfig_style_config SUITEB
-       fi
-
-       # SSL authentication methods
-       if use ssl ; then
-               if use gnutls ; then
-                       Kconfig_style_config TLS gnutls
-                       Kconfig_style_config GNUTLS_EXTRA
-               else
-                       #this fails for gnutls
-                       Kconfig_style_config SUITEB192
-                       Kconfig_style_config TLS openssl
-                       if ! use bindist; then
-                         #this fails for gnutls
-                         Kconfig_style_config EAP_PWD
-                         # SAE fails on gnutls and everything below here needs 
SAE
-                         # Enabling mesh networks.
-                         Kconfig_style_config MESH
-                         #WPA3
-                         Kconfig_style_config OWE
-                         Kconfig_style_config SAE
-                         #we also need to disable FILS, except that isn't 
enabled yet
-                       fi
-
-               fi
-       else
-               Kconfig_style_config TLS internal
-       fi
-
-       if use smartcard ; then
-               Kconfig_style_config SMARTCARD
-       fi
-
-       if use tdls ; then
-               Kconfig_style_config TDLS
-       fi
-
-       if use kernel_linux ; then
-               # Linux specific drivers
-               Kconfig_style_config DRIVER_ATMEL
-               Kconfig_style_config DRIVER_HOSTAP
-               Kconfig_style_config DRIVER_IPW
-               Kconfig_style_config DRIVER_NL80211
-               Kconfig_style_config DRIVER_RALINK
-               Kconfig_style_config DRIVER_WEXT
-               Kconfig_style_config DRIVER_WIRED
-
-               if use ps3 ; then
-                       Kconfig_style_config DRIVER_PS3
-               fi
-
-       elif use kernel_FreeBSD ; then
-               # FreeBSD specific driver
-               Kconfig_style_config DRIVER_BSD
-       fi
-
-       # Wi-Fi Protected Setup (WPS)
-       if use wps ; then
-               Kconfig_style_config WPS
-               Kconfig_style_config WPS2
-               # USB Flash Drive
-               Kconfig_style_config WPS_UFD
-               # External Registrar
-               Kconfig_style_config WPS_ER
-               # Universal Plug'n'Play
-               Kconfig_style_config WPS_UPNP
-               # Near Field Communication
-               Kconfig_style_config WPS_NFC
-       fi
-
-       # Wi-Fi Direct (WiDi)
-       if use p2p ; then
-               Kconfig_style_config P2P
-               Kconfig_style_config WIFI_DISPLAY
-       fi
-
-       # Access Point Mode
-       if use ap ; then
-               Kconfig_style_config AP
-       fi
-
-       # Enable essentials for AP/P2P
-       if use ap || use p2p ; then
-               # Enabling HT support (802.11n)
-               Kconfig_style_config IEEE80211N
-
-               # Enabling VHT support (802.11ac)
-               Kconfig_style_config IEEE80211AC
-       fi
-
-       # Enable mitigation against certain attacks against TKIP
-       Kconfig_style_config DELAYED_MIC_ERROR_REPORT
-
-       if use privsep ; then
-               Kconfig_style_config PRIVSEP
-       fi
-
-       # If we are using libnl 2.0 and above, enable support for it
-       # Bug 382159
-       # Removed for now, since the 3.2 version is broken, and we don't
-       # support it.
-       if has_version ">=dev-libs/libnl-3.2"; then
-               Kconfig_style_config LIBNL32
-       fi
-
-       if use qt5 ; then
-               pushd "${S}"/wpa_gui-qt4 > /dev/null || die
-               eqmake5 wpa_gui.pro
-               popd > /dev/null || die
-       fi
-}
-
-src_compile() {
-       einfo "Building wpa_supplicant"
-       emake V=1 BINDIR=/usr/sbin
-
-       if use wimax; then
-               emake -C ../src/eap_peer clean
-               emake -C ../src/eap_peer
-       fi
-
-       if use qt5; then
-               einfo "Building wpa_gui"
-               emake -C "${S}"/wpa_gui-qt4
-       fi
-
-       if use eapol_test ; then
-               emake eapol_test
-       fi
-}
-
-src_install() {
-       dosbin wpa_supplicant
-       use privsep && dosbin wpa_priv
-       dobin wpa_cli wpa_passphrase
-
-       # baselayout-1 compat
-       if has_version "<sys-apps/baselayout-2.0.0"; then
-               dodir /sbin
-               dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-               dodir /bin
-               dosym ../usr/bin/wpa_cli /bin/wpa_cli
-       fi
-
-       if has_version ">=sys-apps/openrc-0.5.0"; then
-               newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
-               newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
-       fi
-
-       exeinto /etc/wpa_supplicant/
-       newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
-
-       readme.gentoo_create_doc
-       dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-               wpa_supplicant.conf
-
-       newdoc .config build-config
-
-       doman doc/docbook/*.{5,8}
-
-       if use qt5 ; then
-               into /usr
-               dobin wpa_gui-qt4/wpa_gui
-               doicon wpa_gui-qt4/icons/wpa_gui.svg
-               make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" 
"wpa_gui" "Qt;Network;"
-       else
-               rm "${ED}"/usr/share/man/man8/wpa_gui.8
-       fi
-
-       use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
-
-       if use dbus ; then
-               pushd "${S}"/dbus > /dev/null || die
-               insinto /etc/dbus-1/system.d
-               newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-               insinto /usr/share/dbus-1/system-services
-               doins fi.epitest.hostap.WPASupplicant.service 
fi.w1.wpa_supplicant1.service
-               popd > /dev/null || die
-
-               # This unit relies on dbus support, bug 538600.
-               systemd_dounit systemd/wpa_supplicant.service
-       fi
-
-       if use eapol_test ; then
-               dobin eapol_test
-       fi
-
-       systemd_dounit "systemd/[email protected]"
-       systemd_dounit "systemd/[email protected]"
-       systemd_dounit "systemd/[email protected]"
-}
-
-pkg_postinst() {
-       readme.gentoo_print_elog
-
-       if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
-               echo
-               ewarn "WARNING: your old configuration file 
${EROOT%/}/etc/wpa_supplicant.conf"
-               ewarn "needs to be moved to 
${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
-       fi
-
-       if use bindist || use gnutls; then
-               if ! use libressl; then
-                       ewarn "Using bindist or gnutls use flags presently 
breaks WPA3 (specifically SAE and OWE)."
-                       ewarn "This is incredibly undesirable"
-               fi
-       fi
-
-       # Mea culpa, feel free to remove that after some time --mgorny.
-       local fn
-       for fn in wpa_supplicant{,@wlan0}.service; do
-               if [[ -e 
"${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} ]]
-               then
-                       ebegin "Moving ${fn} to multi-user.target"
-                       mv 
"${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} \
-                               
"${EROOT%/}"/etc/systemd/system/multi-user.target.wants/ || die
-                       eend ${?} \
-                               "Please try to re-enable ${fn}"
-               fi
-       done
-
-       systemd_reenable wpa_supplicant.service
-}

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
deleted file mode 100644
index e9cff980621..00000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="https://w1.fi/wpa_supplicant/";
-LICENSE="|| ( GPL-2 BSD )"
-
-if [ "${PV}" = "9999" ]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://w1.fi/hostap.git";
-else
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-       SRC_URI="https://w1.fi/releases/${P}.tar.gz";
-fi
-
-SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p 
privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types 
wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="smartcard? ( ssl )"
-
-CDEPEND="dbus? ( sys-apps/dbus )
-       kernel_linux? (
-               dev-libs/libnl:3
-               net-wireless/crda
-               eap-sim? ( sys-apps/pcsc-lite )
-       )
-       !kernel_linux? ( net-libs/libpcap )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtsvg:5
-               dev-qt/qtwidgets:5
-       )
-       readline? (
-               sys-libs/ncurses:0=
-               sys-libs/readline:0=
-       )
-       ssl? (
-               gnutls? (
-                       dev-libs/libgcrypt:0=
-                       net-libs/gnutls:=
-               )
-               !gnutls? (
-                       !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       !ssl? ( dev-libs/libtommath )
-"
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-networkmanager )
-"
-
-DOC_CONTENTS="
-       If this is a clean installation of wpa_supplicant, you
-       have to create a configuration file named
-       ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf
-       An example configuration file is available for reference in
-       ${EROOT%/}/usr/share/doc/${PF}/
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-Kconfig_style_config() {
-               #param 1 is CONFIG_* item
-               #param 2 is what to set it = to, defaulting in y
-               CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
-               setting="${2:-y}"
-
-               if [ ! $setting = n ]; then
-                       #first remove any leading "# " if $2 is not n
-                       sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo 
"Kconfig_style_config error uncommenting $CONFIG_PARAM"
-                       #set item = $setting (defaulting to y)
-                       sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || 
echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
-                       if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
-                               echo "$CONFIG_PARAM=$setting" >>.config
-                       fi
-               else
-                       #ensure item commented out
-                       sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# 
$CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting 
$CONFIG_PARAM"
-               fi
-}
-
-pkg_setup() {
-       if use ssl ; then
-               if use gnutls && use libressl ; then
-                       elog "You have both 'gnutls' and 'libressl' USE flags 
enabled: defaulting to USE=\"gnutls\""
-               fi
-       else
-               elog "You have 'ssl' USE flag disabled: defaulting to internal 
TLS implementation"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-       sed -i \
-               -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-               ../src/l2_packet/l2_packet_freebsd.c || die
-
-       # People seem to take the example configuration file too literally (bug 
#102361)
-       sed -i \
-               -e "s:^\(opensc_engine_path\):#\1:" \
-               -e "s:^\(pkcs11_engine_path\):#\1:" \
-               -e "s:^\(pkcs11_module_path\):#\1:" \
-               wpa_supplicant.conf || die
-
-       # Change configuration to match Gentoo locations (bug #143750)
-       sed -i \
-               -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-               -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-               wpa_supplicant.conf || die
-
-       # systemd entries to D-Bus service files (bug #372877)
-       echo 'SystemdService=wpa_supplicant.service' \
-               | tee -a dbus/*.service >/dev/null || die
-
-       cd "${WORKDIR}/${P}" || die
-
-       if use wimax; then
-               # generate-libeap-peer.patch comes before
-               # fix-undefined-reference-to-random_get_bytes.patch
-               eapply "${FILESDIR}/${P}-generate-libeap-peer.patch"
-
-               # multilib-strict fix (bug #373685)
-               sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i 
src/eap_peer/Makefile || die
-       fi
-
-       # bug (320097)
-       eapply 
"${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
-
-       # fix undefined reference to remove_ie()
-       eapply "${FILESDIR}/${P}-fix-undefined-remove-ie.patch"
-
-       # bug (672632)
-       eapply "${FILESDIR}/${P}-libressl.patch"
-
-       # bug (640492)
-       sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
-}
-
-src_configure() {
-       # Toolchain setup
-       tc-export CC
-
-       cp defconfig .config || die
-
-       # Basic setup
-       Kconfig_style_config CTRL_IFACE
-       Kconfig_style_config MATCH_IFACE
-       Kconfig_style_config BACKEND file
-       Kconfig_style_config IBSS_RSN
-       Kconfig_style_config IEEE80211W
-       Kconfig_style_config IEEE80211R
-
-       # Basic authentication methods
-       # NOTE: we don't set GPSK or SAKE as they conflict
-       # with the below options
-       Kconfig_style_config EAP_GTC
-       Kconfig_style_config EAP_MD5
-       Kconfig_style_config EAP_OTP
-       Kconfig_style_config EAP_PAX
-       Kconfig_style_config EAP_PSK
-       Kconfig_style_config EAP_TLV
-       Kconfig_style_config EAP_EXE
-       Kconfig_style_config IEEE8021X_EAPOL
-       Kconfig_style_config PKCS12
-       Kconfig_style_config PEERKEY
-       Kconfig_style_config EAP_LEAP
-       Kconfig_style_config EAP_MSCHAPV2
-       Kconfig_style_config EAP_PEAP
-       Kconfig_style_config EAP_TLS
-       Kconfig_style_config EAP_TTLS
-
-       # Enabling background scanning.
-       Kconfig_style_config BGSCAN_SIMPLE
-       Kconfig_style_config BGSCAN_LEARN
-
-       if use dbus ; then
-               Kconfig_style_config CTRL_IFACE_DBUS
-               Kconfig_style_config CTRL_IFACE_DBUS_NEW
-               Kconfig_style_config CTRL_IFACE_DBUS_INTRO
-       fi
-
-       if use eapol_test ; then
-               Kconfig_style_config EAPOL_TEST
-       fi
-
-       # Enable support for writing debug info to a log file and syslog.
-       Kconfig_style_config DEBUG_FILE
-       Kconfig_style_config DEBUG_SYSLOG
-
-       if use hs2-0 ; then
-               Kconfig_style_config INTERWORKING
-               Kconfig_style_config HS20
-       fi
-
-       if use uncommon-eap-types; then
-               Kconfig_style_config EAP_GPSK
-               Kconfig_style_config EAP_SAKE
-               Kconfig_style_config EAP_GPSK_SHA256
-               Kconfig_style_config EAP_IKEV2
-               Kconfig_style_config EAP_EKE
-       fi
-
-       if use eap-sim ; then
-               # Smart card authentication
-               Kconfig_style_config EAP_SIM
-               Kconfig_style_config EAP_AKA
-               Kconfig_style_config EAP_AKA_PRIME
-               Kconfig_style_config PCSC
-       fi
-
-       if use fasteap ; then
-               Kconfig_style_config EAP_FAST
-       fi
-
-       if use readline ; then
-               # readline/history support for wpa_cli
-               Kconfig_style_config READLINE
-       else
-               #internal line edit mode for wpa_cli
-               Kconfig_style_config WPA_CLI_EDIT
-       fi
-
-       if use suiteb; then
-               Kconfig_style_config SUITEB
-       fi
-
-       # SSL authentication methods
-       if use ssl ; then
-               if use gnutls ; then
-                       Kconfig_style_config TLS gnutls
-                       Kconfig_style_config GNUTLS_EXTRA
-               else
-                       #this fails for gnutls
-                       Kconfig_style_config SUITEB192
-                       Kconfig_style_config TLS openssl
-                       if ! use bindist; then
-                         #this fails for gnutls
-                         Kconfig_style_config EAP_PWD
-                         # SAE fails on gnutls and everything below here needs 
SAE
-                         # Enabling mesh networks.
-                         Kconfig_style_config MESH
-                         #WPA3
-                         Kconfig_style_config OWE
-                         Kconfig_style_config SAE
-                         #we also need to disable FILS, except that isn't 
enabled yet
-                       fi
-
-               fi
-       else
-               Kconfig_style_config TLS internal
-       fi
-
-       if use smartcard ; then
-               Kconfig_style_config SMARTCARD
-       fi
-
-       if use tdls ; then
-               Kconfig_style_config TDLS
-       fi
-
-       if use kernel_linux ; then
-               # Linux specific drivers
-               Kconfig_style_config DRIVER_ATMEL
-               Kconfig_style_config DRIVER_HOSTAP
-               Kconfig_style_config DRIVER_IPW
-               Kconfig_style_config DRIVER_NL80211
-               Kconfig_style_config DRIVER_RALINK
-               Kconfig_style_config DRIVER_WEXT
-               Kconfig_style_config DRIVER_WIRED
-
-               if use ps3 ; then
-                       Kconfig_style_config DRIVER_PS3
-               fi
-
-       elif use kernel_FreeBSD ; then
-               # FreeBSD specific driver
-               Kconfig_style_config DRIVER_BSD
-       fi
-
-       # Wi-Fi Protected Setup (WPS)
-       if use wps ; then
-               Kconfig_style_config WPS
-               Kconfig_style_config WPS2
-               # USB Flash Drive
-               Kconfig_style_config WPS_UFD
-               # External Registrar
-               Kconfig_style_config WPS_ER
-               # Universal Plug'n'Play
-               Kconfig_style_config WPS_UPNP
-               # Near Field Communication
-               Kconfig_style_config WPS_NFC
-       fi
-
-       # Wi-Fi Direct (WiDi)
-       if use p2p ; then
-               Kconfig_style_config P2P
-               Kconfig_style_config WIFI_DISPLAY
-       fi
-
-       # Access Point Mode
-       if use ap ; then
-               Kconfig_style_config AP
-       fi
-
-       # Enable essentials for AP/P2P
-       if use ap || use p2p ; then
-               # Enabling HT support (802.11n)
-               Kconfig_style_config IEEE80211N
-
-               # Enabling VHT support (802.11ac)
-               Kconfig_style_config IEEE80211AC
-       fi
-
-       # Enable mitigation against certain attacks against TKIP
-       Kconfig_style_config DELAYED_MIC_ERROR_REPORT
-
-       if use privsep ; then
-               Kconfig_style_config PRIVSEP
-       fi
-
-       # If we are using libnl 2.0 and above, enable support for it
-       # Bug 382159
-       # Removed for now, since the 3.2 version is broken, and we don't
-       # support it.
-       if has_version ">=dev-libs/libnl-3.2"; then
-               Kconfig_style_config LIBNL32
-       fi
-
-       if use qt5 ; then
-               pushd "${S}"/wpa_gui-qt4 > /dev/null || die
-               eqmake5 wpa_gui.pro
-               popd > /dev/null || die
-       fi
-}
-
-src_compile() {
-       einfo "Building wpa_supplicant"
-       emake V=1 BINDIR=/usr/sbin
-
-       if use wimax; then
-               emake -C ../src/eap_peer clean
-               emake -C ../src/eap_peer
-       fi
-
-       if use qt5; then
-               einfo "Building wpa_gui"
-               emake -C "${S}"/wpa_gui-qt4
-       fi
-
-       if use eapol_test ; then
-               emake eapol_test
-       fi
-}
-
-src_install() {
-       dosbin wpa_supplicant
-       use privsep && dosbin wpa_priv
-       dobin wpa_cli wpa_passphrase
-
-       # baselayout-1 compat
-       if has_version "<sys-apps/baselayout-2.0.0"; then
-               dodir /sbin
-               dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-               dodir /bin
-               dosym ../usr/bin/wpa_cli /bin/wpa_cli
-       fi
-
-       if has_version ">=sys-apps/openrc-0.5.0"; then
-               newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
-               newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
-       fi
-
-       exeinto /etc/wpa_supplicant/
-       newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
-
-       readme.gentoo_create_doc
-       dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-               wpa_supplicant.conf
-
-       newdoc .config build-config
-
-       if [ "${PV}" != "9999" ]; then
-               doman doc/docbook/*.{5,8}
-       fi
-
-       if use qt5 ; then
-               into /usr
-               dobin wpa_gui-qt4/wpa_gui
-               doicon wpa_gui-qt4/icons/wpa_gui.svg
-               make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" 
"wpa_gui" "Qt;Network;"
-       else
-               rm "${ED}"/usr/share/man/man8/wpa_gui.8
-       fi
-
-       use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
-
-       if use dbus ; then
-               pushd "${S}"/dbus > /dev/null || die
-               insinto /etc/dbus-1/system.d
-               newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-               insinto /usr/share/dbus-1/system-services
-               doins fi.epitest.hostap.WPASupplicant.service 
fi.w1.wpa_supplicant1.service
-               popd > /dev/null || die
-
-               # This unit relies on dbus support, bug 538600.
-               systemd_dounit systemd/wpa_supplicant.service
-       fi
-
-       if use eapol_test ; then
-               dobin eapol_test
-       fi
-
-       systemd_dounit "systemd/[email protected]"
-       systemd_dounit "systemd/[email protected]"
-       systemd_dounit "systemd/[email protected]"
-}
-
-pkg_postinst() {
-       readme.gentoo_print_elog
-
-       if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
-               echo
-               ewarn "WARNING: your old configuration file 
${EROOT%/}/etc/wpa_supplicant.conf"
-               ewarn "needs to be moved to 
${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
-       fi
-
-       if use bindist || use gnutls; then
-               if ! use libressl; then
-                       ewarn "Using bindist or gnutls use flags presently 
breaks WPA3 (specifically SAE and OWE)."
-                       ewarn "This is incredibly undesirable"
-               fi
-       fi
-
-       # Mea culpa, feel free to remove that after some time --mgorny.
-       local fn
-       for fn in wpa_supplicant{,@wlan0}.service; do
-               if [[ -e 
"${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} ]]
-               then
-                       ebegin "Moving ${fn} to multi-user.target"
-                       mv 
"${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} \
-                               
"${EROOT%/}"/etc/systemd/system/multi-user.target.wants/ || die
-                       eend ${?} \
-                               "Please try to re-enable ${fn}"
-               fi
-       done
-
-       systemd_reenable wpa_supplicant.service
-}

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild
deleted file mode 100644
index 697e343ecab..00000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild
+++ /dev/null
@@ -1,442 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="https://w1.fi/wpa_supplicant/";
-LICENSE="|| ( GPL-2 BSD )"
-
-if [ "${PV}" = "9999" ]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://w1.fi/hostap.git";
-else
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-       SRC_URI="https://w1.fi/releases/${P}.tar.gz";
-fi
-
-SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap +hs2-0 libressl macsec p2p 
privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps 
kernel_linux kernel_FreeBSD"
-
-CDEPEND="dbus? ( sys-apps/dbus )
-       kernel_linux? (
-               dev-libs/libnl:3
-               net-wireless/crda
-               eap-sim? ( sys-apps/pcsc-lite )
-       )
-       !kernel_linux? ( net-libs/libpcap )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtsvg:5
-               dev-qt/qtwidgets:5
-       )
-       readline? (
-               sys-libs/ncurses:0=
-               sys-libs/readline:0=
-       )
-       !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
-       libressl? ( dev-libs/libressl:0= )
-"
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-networkmanager )
-"
-
-DOC_CONTENTS="
-       If this is a clean installation of wpa_supplicant, you
-       have to create a configuration file named
-       ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf
-       An example configuration file is available for reference in
-       ${EROOT%/}/usr/share/doc/${PF}/
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-Kconfig_style_config() {
-               #param 1 is CONFIG_* item
-               #param 2 is what to set it = to, defaulting in y
-               CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
-               setting="${2:-y}"
-
-               if [ ! $setting = n ]; then
-                       #first remove any leading "# " if $2 is not n
-                       sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo 
"Kconfig_style_config error uncommenting $CONFIG_PARAM"
-                       #set item = $setting (defaulting to y)
-                       sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || 
echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
-                       if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
-                               echo "$CONFIG_PARAM=$setting" >>.config
-                       fi
-               else
-                       #ensure item commented out
-                       sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# 
$CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting 
$CONFIG_PARAM"
-               fi
-}
-
-src_prepare() {
-       default
-
-       # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-       sed -i \
-               -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-               ../src/l2_packet/l2_packet_freebsd.c || die
-
-       # People seem to take the example configuration file too literally (bug 
#102361)
-       sed -i \
-               -e "s:^\(opensc_engine_path\):#\1:" \
-               -e "s:^\(pkcs11_engine_path\):#\1:" \
-               -e "s:^\(pkcs11_module_path\):#\1:" \
-               wpa_supplicant.conf || die
-
-       # Change configuration to match Gentoo locations (bug #143750)
-       sed -i \
-               -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-               -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-               wpa_supplicant.conf || die
-
-       # systemd entries to D-Bus service files (bug #372877)
-       echo 'SystemdService=wpa_supplicant.service' \
-               | tee -a dbus/*.service >/dev/null || die
-
-       cd "${WORKDIR}/${P}" || die
-
-       if use wimax; then
-               # generate-libeap-peer.patch comes before
-               # fix-undefined-reference-to-random_get_bytes.patch
-               eapply "${FILESDIR}/${P}-generate-libeap-peer.patch"
-
-               # multilib-strict fix (bug #373685)
-               sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i 
src/eap_peer/Makefile || die
-       fi
-
-       # bug (320097)
-       eapply 
"${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
-
-       # fix undefined reference to remove_ie()
-       eapply "${FILESDIR}/${P}-fix-undefined-remove-ie.patch"
-
-       # bug (672632)
-       eapply "${FILESDIR}/${P}-libressl.patch"
-
-       # bug (640492)
-       sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
-}
-
-src_configure() {
-       # Toolchain setup
-       tc-export CC
-
-       cp defconfig .config || die
-
-       # Basic setup
-       Kconfig_style_config CTRL_IFACE
-       Kconfig_style_config MATCH_IFACE
-       Kconfig_style_config BACKEND file
-       Kconfig_style_config IBSS_RSN
-       Kconfig_style_config IEEE80211W
-       Kconfig_style_config IEEE80211R
-       Kconfig_style_config HT_OVERRIDES
-       Kconfig_style_config VHT_OVERRIDES
-       Kconfig_style_config OCV
-       Kconfig_style_config TLSV11
-       Kconfig_style_config TLSV12
-
-       # Basic authentication methods
-       # NOTE: we don't set GPSK or SAKE as they conflict
-       # with the below options
-       Kconfig_style_config EAP_GTC
-       Kconfig_style_config EAP_MD5
-       Kconfig_style_config EAP_OTP
-       Kconfig_style_config EAP_PAX
-       Kconfig_style_config EAP_PSK
-       Kconfig_style_config EAP_TLV
-       Kconfig_style_config EAP_EXE
-       Kconfig_style_config IEEE8021X_EAPOL
-       Kconfig_style_config PKCS12
-       Kconfig_style_config PEERKEY
-       Kconfig_style_config EAP_LEAP
-       Kconfig_style_config EAP_MSCHAPV2
-       Kconfig_style_config EAP_PEAP
-       Kconfig_style_config EAP_TLS
-       Kconfig_style_config EAP_TTLS
-
-       # Enabling background scanning.
-       Kconfig_style_config BGSCAN_SIMPLE
-       Kconfig_style_config BGSCAN_LEARN
-
-       if use dbus ; then
-               Kconfig_style_config CTRL_IFACE_DBUS
-               Kconfig_style_config CTRL_IFACE_DBUS_NEW
-               Kconfig_style_config CTRL_IFACE_DBUS_INTRO
-       fi
-
-       if use eapol_test ; then
-               Kconfig_style_config EAPOL_TEST
-       fi
-
-       # Enable support for writing debug info to a log file and syslog.
-       Kconfig_style_config DEBUG_FILE
-       Kconfig_style_config DEBUG_SYSLOG
-
-       if use hs2-0 ; then
-               Kconfig_style_config INTERWORKING
-               Kconfig_style_config HS20
-       fi
-
-       if use uncommon-eap-types; then
-               Kconfig_style_config EAP_GPSK
-               Kconfig_style_config EAP_SAKE
-               Kconfig_style_config EAP_GPSK_SHA256
-               Kconfig_style_config EAP_IKEV2
-               Kconfig_style_config EAP_EKE
-       fi
-
-       if use eap-sim ; then
-               # Smart card authentication
-               Kconfig_style_config EAP_SIM
-               Kconfig_style_config EAP_AKA
-               Kconfig_style_config EAP_AKA_PRIME
-               Kconfig_style_config PCSC
-       fi
-
-       if use fasteap ; then
-               Kconfig_style_config EAP_FAST
-       fi
-
-       if use readline ; then
-               # readline/history support for wpa_cli
-               Kconfig_style_config READLINE
-       else
-               #internal line edit mode for wpa_cli
-               Kconfig_style_config WPA_CLI_EDIT
-       fi
-
-       Kconfig_style_config TLS openssl
-       Kconfig_style_config FST
-       if ! use bindist || use libressl; then
-               Kconfig_style_config EAP_PWD
-               Kconfig_style_config FILS
-               Kconfig_style_config FILS_SK_PFS
-               # Enabling mesh networks.
-               Kconfig_style_config MESH
-               #WPA3
-               Kconfig_style_config OWE
-               Kconfig_style_config SAE
-               Kconfig_style_config DPP
-               Kconfig_style_config SUITEB192
-       fi
-       if ! use bindist && ! use libressl; then
-               Kconfig_style_config SUITEB
-       fi
-
-       if use smartcard ; then
-               Kconfig_style_config SMARTCARD
-       fi
-
-       if use tdls ; then
-               Kconfig_style_config TDLS
-       fi
-
-       if use kernel_linux ; then
-               # Linux specific drivers
-               Kconfig_style_config DRIVER_ATMEL
-               Kconfig_style_config DRIVER_HOSTAP
-               Kconfig_style_config DRIVER_IPW
-               Kconfig_style_config DRIVER_NL80211
-               Kconfig_style_config DRIVER_RALINK
-               Kconfig_style_config DRIVER_WEXT
-               Kconfig_style_config DRIVER_WIRED
-
-               if use macsec ; then
-                       #requires something, no idea what
-                       #Kconfig_style_config DRIVER_MACSEC_QCA
-                       Kconfig_style_config MACSEC
-               fi
-
-               if use ps3 ; then
-                       Kconfig_style_config DRIVER_PS3
-               fi
-
-       elif use kernel_FreeBSD ; then
-               # FreeBSD specific driver
-               Kconfig_style_config DRIVER_BSD
-       fi
-
-       # Wi-Fi Protected Setup (WPS)
-       if use wps ; then
-               Kconfig_style_config WPS
-               Kconfig_style_config WPS2
-               # USB Flash Drive
-               Kconfig_style_config WPS_UFD
-               # External Registrar
-               Kconfig_style_config WPS_ER
-               # Universal Plug'n'Play
-               Kconfig_style_config WPS_UPNP
-               # Near Field Communication
-               Kconfig_style_config WPS_NFC
-       fi
-
-       # Wi-Fi Direct (WiDi)
-       if use p2p ; then
-               Kconfig_style_config P2P
-               Kconfig_style_config WIFI_DISPLAY
-       fi
-
-       # Access Point Mode
-       if use ap ; then
-               Kconfig_style_config AP
-       fi
-
-       # Enable essentials for AP/P2P
-       if use ap || use p2p ; then
-               # Enabling HT support (802.11n)
-               Kconfig_style_config IEEE80211N
-
-               # Enabling VHT support (802.11ac)
-               Kconfig_style_config IEEE80211AC
-       fi
-
-       # Enable mitigation against certain attacks against TKIP
-       Kconfig_style_config DELAYED_MIC_ERROR_REPORT
-
-       if use privsep ; then
-               Kconfig_style_config PRIVSEP
-       fi
-
-       # If we are using libnl 2.0 and above, enable support for it
-       # Bug 382159
-       # Removed for now, since the 3.2 version is broken, and we don't
-       # support it.
-       if has_version ">=dev-libs/libnl-3.2"; then
-               Kconfig_style_config LIBNL32
-       fi
-
-       if use qt5 ; then
-               pushd "${S}"/wpa_gui-qt4 > /dev/null || die
-               eqmake5 wpa_gui.pro
-               popd > /dev/null || die
-       fi
-}
-
-src_compile() {
-       einfo "Building wpa_supplicant"
-       emake V=1 BINDIR=/usr/sbin
-
-       if use wimax; then
-               emake -C ../src/eap_peer clean
-               emake -C ../src/eap_peer
-       fi
-
-       if use qt5; then
-               einfo "Building wpa_gui"
-               emake -C "${S}"/wpa_gui-qt4
-       fi
-
-       if use eapol_test ; then
-               emake eapol_test
-       fi
-}
-
-src_install() {
-       dosbin wpa_supplicant
-       use privsep && dosbin wpa_priv
-       dobin wpa_cli wpa_passphrase
-
-       # baselayout-1 compat
-       if has_version "<sys-apps/baselayout-2.0.0"; then
-               dodir /sbin
-               dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-               dodir /bin
-               dosym ../usr/bin/wpa_cli /bin/wpa_cli
-       fi
-
-       if has_version ">=sys-apps/openrc-0.5.0"; then
-               newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
-               newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
-       fi
-
-       exeinto /etc/wpa_supplicant/
-       newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
-
-       readme.gentoo_create_doc
-       dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-               wpa_supplicant.conf
-
-       newdoc .config build-config
-
-       if [ "${PV}" != "9999" ]; then
-               doman doc/docbook/*.{5,8}
-       fi
-
-       if use qt5 ; then
-               into /usr
-               dobin wpa_gui-qt4/wpa_gui
-               doicon wpa_gui-qt4/icons/wpa_gui.svg
-               make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" 
"wpa_gui" "Qt;Network;"
-       else
-               rm "${ED}"/usr/share/man/man8/wpa_gui.8
-       fi
-
-       use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
-
-       if use dbus ; then
-               pushd "${S}"/dbus > /dev/null || die
-               insinto /etc/dbus-1/system.d
-               newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-               insinto /usr/share/dbus-1/system-services
-               doins fi.epitest.hostap.WPASupplicant.service 
fi.w1.wpa_supplicant1.service
-               popd > /dev/null || die
-
-               # This unit relies on dbus support, bug 538600.
-               systemd_dounit systemd/wpa_supplicant.service
-       fi
-
-       if use eapol_test ; then
-               dobin eapol_test
-       fi
-
-       systemd_dounit "systemd/[email protected]"
-       systemd_dounit "systemd/[email protected]"
-       systemd_dounit "systemd/[email protected]"
-}
-
-pkg_postinst() {
-       readme.gentoo_print_elog
-
-       if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
-               echo
-               ewarn "WARNING: your old configuration file 
${EROOT%/}/etc/wpa_supplicant.conf"
-               ewarn "needs to be moved to 
${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
-       fi
-
-       if use bindist; then
-               if ! use libressl; then
-                       ewarn "Using bindist use flag presently breaks WPA3 
(specifically SAE, OWE, DPP, and FILS)."
-                       ewarn "This is incredibly undesirable"
-               fi
-       fi
-       if use libressl; then
-               ewarn "Libressl doesn't support SUITEB (part of WPA3)"
-               ewarn "but it does support SUITEB192 (the upgraded strength 
version of the same)"
-               ewarn "You probably don't care.  Patches welcome"
-       fi
-
-       # Mea culpa, feel free to remove that after some time --mgorny.
-       local fn
-       for fn in wpa_supplicant{,@wlan0}.service; do
-               if [[ -e 
"${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} ]]
-               then
-                       ebegin "Moving ${fn} to multi-user.target"
-                       mv 
"${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} \
-                               
"${EROOT%/}"/etc/systemd/system/multi-user.target.wants/ || die
-                       eend ${?} \
-                               "Please try to re-enable ${fn}"
-               fi
-       done
-
-       systemd_reenable wpa_supplicant.service
-}

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild
deleted file mode 100644
index 2eb8231f0f5..00000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="https://w1.fi/wpa_supplicant/";
-LICENSE="|| ( GPL-2 BSD )"
-
-if [ "${PV}" = "9999" ]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://w1.fi/hostap.git";
-else
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-       SRC_URI="https://w1.fi/releases/${P}.tar.gz";
-fi
-
-SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 libressl macsec 
p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax 
wps kernel_linux kernel_FreeBSD"
-
-# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
-# interface functions used for MACsec, so this combination cannot be used
-# at least for now.
-REQUIRED_USE="
-       macsec? ( !privsep )
-       privsep? ( !macsec )
-"
-
-CDEPEND="dbus? ( sys-apps/dbus )
-       kernel_linux? (
-               dev-libs/libnl:3
-               net-wireless/crda
-               eap-sim? ( sys-apps/pcsc-lite )
-       )
-       !kernel_linux? ( net-libs/libpcap )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtsvg:5
-               dev-qt/qtwidgets:5
-       )
-       readline? (
-               sys-libs/ncurses:0=
-               sys-libs/readline:0=
-       )
-       !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
-       libressl? ( dev-libs/libressl:0= )
-"
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-networkmanager )
-"
-
-DOC_CONTENTS="
-       If this is a clean installation of wpa_supplicant, you
-       have to create a configuration file named
-       ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf
-       An example configuration file is available for reference in
-       ${EROOT%/}/usr/share/doc/${PF}/
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-Kconfig_style_config() {
-               #param 1 is CONFIG_* item
-               #param 2 is what to set it = to, defaulting in y
-               CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
-               setting="${2:-y}"
-
-               if [ ! $setting = n ]; then
-                       #first remove any leading "# " if $2 is not n
-                       sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo 
"Kconfig_style_config error uncommenting $CONFIG_PARAM"
-                       #set item = $setting (defaulting to y)
-                       sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || 
echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
-                       if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
-                               echo "$CONFIG_PARAM=$setting" >>.config
-                       fi
-               else
-                       #ensure item commented out
-                       sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# 
$CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting 
$CONFIG_PARAM"
-               fi
-}
-
-src_prepare() {
-       default
-
-       # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-       sed -i \
-               -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-               ../src/l2_packet/l2_packet_freebsd.c || die
-
-       # People seem to take the example configuration file too literally (bug 
#102361)
-       sed -i \
-               -e "s:^\(opensc_engine_path\):#\1:" \
-               -e "s:^\(pkcs11_engine_path\):#\1:" \
-               -e "s:^\(pkcs11_module_path\):#\1:" \
-               wpa_supplicant.conf || die
-
-       # Change configuration to match Gentoo locations (bug #143750)
-       sed -i \
-               -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-               -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-               wpa_supplicant.conf || die
-
-       # systemd entries to D-Bus service files (bug #372877)
-       echo 'SystemdService=wpa_supplicant.service' \
-               | tee -a dbus/*.service >/dev/null || die
-
-       cd "${WORKDIR}/${P}" || die
-
-       if use wimax; then
-               # generate-libeap-peer.patch comes before
-               # fix-undefined-reference-to-random_get_bytes.patch
-               eapply "${FILESDIR}/${P}-generate-libeap-peer.patch"
-
-               # multilib-strict fix (bug #373685)
-               sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i 
src/eap_peer/Makefile || die
-       fi
-
-       # bug (320097)
-       eapply 
"${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
-
-       # bug (640492)
-       sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
-}
-
-src_configure() {
-       # Toolchain setup
-       tc-export CC
-
-       cp defconfig .config || die
-
-       # Basic setup
-       Kconfig_style_config CTRL_IFACE
-       Kconfig_style_config MATCH_IFACE
-       Kconfig_style_config BACKEND file
-       Kconfig_style_config IBSS_RSN
-       Kconfig_style_config IEEE80211W
-       Kconfig_style_config IEEE80211R
-       Kconfig_style_config HT_OVERRIDES
-       Kconfig_style_config VHT_OVERRIDES
-       Kconfig_style_config OCV
-       Kconfig_style_config TLSV11
-       Kconfig_style_config TLSV12
-       Kconfig_style_config GETRANDOM
-       Kconfig_style_config MBO
-
-       # Basic authentication methods
-       # NOTE: we don't set GPSK or SAKE as they conflict
-       # with the below options
-       Kconfig_style_config EAP_GTC
-       Kconfig_style_config EAP_MD5
-       Kconfig_style_config EAP_OTP
-       Kconfig_style_config EAP_PAX
-       Kconfig_style_config EAP_PSK
-       Kconfig_style_config IEEE8021X_EAPOL
-       Kconfig_style_config PKCS12
-       Kconfig_style_config PEERKEY
-       Kconfig_style_config EAP_LEAP
-       Kconfig_style_config EAP_MSCHAPV2
-       Kconfig_style_config EAP_PEAP
-       Kconfig_style_config EAP_TEAP
-       Kconfig_style_config EAP_TLS
-       Kconfig_style_config EAP_TTLS
-
-       # Enabling background scanning.
-       Kconfig_style_config BGSCAN_SIMPLE
-       Kconfig_style_config BGSCAN_LEARN
-
-       if use dbus ; then
-               Kconfig_style_config CTRL_IFACE_DBUS
-               Kconfig_style_config CTRL_IFACE_DBUS_NEW
-               Kconfig_style_config CTRL_IFACE_DBUS_INTRO
-       else
-               Kconfig_style_config CTRL_IFACE_DBUS n
-               Kconfig_style_config CTRL_IFACE_DBUS_NEW n
-               Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
-       fi
-
-       if use eapol_test ; then
-               Kconfig_style_config EAPOL_TEST
-       fi
-
-       # Enable support for writing debug info to a log file and syslog.
-       Kconfig_style_config DEBUG_FILE
-       Kconfig_style_config DEBUG_SYSLOG
-
-       if use hs2-0 ; then
-               Kconfig_style_config INTERWORKING
-               Kconfig_style_config HS20
-       fi
-
-       if use uncommon-eap-types; then
-               Kconfig_style_config EAP_GPSK
-               Kconfig_style_config EAP_SAKE
-               Kconfig_style_config EAP_GPSK_SHA256
-               Kconfig_style_config EAP_IKEV2
-               Kconfig_style_config EAP_EKE
-       fi
-
-       if use eap-sim ; then
-               # Smart card authentication
-               Kconfig_style_config EAP_SIM
-               Kconfig_style_config EAP_AKA
-               Kconfig_style_config EAP_AKA_PRIME
-               Kconfig_style_config PCSC
-       fi
-
-       if use fasteap ; then
-               Kconfig_style_config EAP_FAST
-       fi
-
-       if use readline ; then
-               # readline/history support for wpa_cli
-               Kconfig_style_config READLINE
-       else
-               #internal line edit mode for wpa_cli
-               Kconfig_style_config WPA_CLI_EDIT
-       fi
-
-       Kconfig_style_config TLS openssl
-       Kconfig_style_config FST
-       if ! use bindist || use libressl; then
-               Kconfig_style_config EAP_PWD
-               if use fils; then
-                       Kconfig_style_config FILS
-                       Kconfig_style_config FILS_SK_PFS
-               fi
-               # Enabling mesh networks.
-               Kconfig_style_config MESH
-               #WPA3
-               Kconfig_style_config OWE
-               Kconfig_style_config SAE
-               Kconfig_style_config DPP
-               Kconfig_style_config SUITEB192
-       fi
-       if ! use bindist && ! use libressl; then
-               Kconfig_style_config SUITEB
-       fi
-
-       if use smartcard ; then
-               Kconfig_style_config SMARTCARD
-       else
-               Kconfig_style_config SMARTCARD n
-       fi
-
-       if use tdls ; then
-               Kconfig_style_config TDLS
-       fi
-
-       if use kernel_linux ; then
-               # Linux specific drivers
-               Kconfig_style_config DRIVER_ATMEL
-               Kconfig_style_config DRIVER_HOSTAP
-               Kconfig_style_config DRIVER_IPW
-               Kconfig_style_config DRIVER_NL80211
-               Kconfig_style_config DRIVER_RALINK
-               Kconfig_style_config DRIVER_WEXT
-               Kconfig_style_config DRIVER_WIRED
-
-               if use macsec ; then
-                       #requires something, no idea what
-                       #Kconfig_style_config DRIVER_MACSEC_QCA
-                       Kconfig_style_config DRIVER_MACSEC_LINUX
-                       Kconfig_style_config MACSEC
-               fi
-
-               if use ps3 ; then
-                       Kconfig_style_config DRIVER_PS3
-               fi
-
-       elif use kernel_FreeBSD ; then
-               # FreeBSD specific driver
-               Kconfig_style_config DRIVER_BSD
-       fi
-
-       # Wi-Fi Protected Setup (WPS)
-       if use wps ; then
-               Kconfig_style_config WPS
-               Kconfig_style_config WPS2
-               # USB Flash Drive
-               Kconfig_style_config WPS_UFD
-               # External Registrar
-               Kconfig_style_config WPS_ER
-               # Universal Plug'n'Play
-               Kconfig_style_config WPS_UPNP
-               # Near Field Communication
-               Kconfig_style_config WPS_NFC
-       else
-               Kconfig_style_config WPS n
-       fi
-
-       # Wi-Fi Direct (WiDi)
-       if use p2p ; then
-               Kconfig_style_config P2P
-               Kconfig_style_config WIFI_DISPLAY
-       fi
-
-       # Access Point Mode
-       if use ap ; then
-               Kconfig_style_config AP
-       else
-               Kconfig_style_config AP n
-       fi
-
-       # Enable essentials for AP/P2P
-       if use ap || use p2p ; then
-               # Enabling HT support (802.11n)
-               Kconfig_style_config IEEE80211N
-
-               # Enabling VHT support (802.11ac)
-               Kconfig_style_config IEEE80211AC
-       fi
-
-       # Enable mitigation against certain attacks against TKIP
-       Kconfig_style_config DELAYED_MIC_ERROR_REPORT
-
-       if use privsep ; then
-               Kconfig_style_config PRIVSEP
-       fi
-
-       # If we are using libnl 2.0 and above, enable support for it
-       # Bug 382159
-       # Removed for now, since the 3.2 version is broken, and we don't
-       # support it.
-       if has_version ">=dev-libs/libnl-3.2"; then
-               Kconfig_style_config LIBNL32
-       fi
-
-       if use qt5 ; then
-               pushd "${S}"/wpa_gui-qt4 > /dev/null || die
-               eqmake5 wpa_gui.pro
-               popd > /dev/null || die
-       fi
-}
-
-src_compile() {
-       einfo "Building wpa_supplicant"
-       emake V=1 BINDIR=/usr/sbin
-
-       if use wimax; then
-               emake -C ../src/eap_peer clean
-               emake -C ../src/eap_peer
-       fi
-
-       if use qt5; then
-               einfo "Building wpa_gui"
-               emake -C "${S}"/wpa_gui-qt4
-       fi
-
-       if use eapol_test ; then
-               emake eapol_test
-       fi
-}
-
-src_install() {
-       dosbin wpa_supplicant
-       use privsep && dosbin wpa_priv
-       dobin wpa_cli wpa_passphrase
-
-       # baselayout-1 compat
-       if has_version "<sys-apps/baselayout-2.0.0"; then
-               dodir /sbin
-               dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-               dodir /bin
-               dosym ../usr/bin/wpa_cli /bin/wpa_cli
-       fi
-
-       if has_version ">=sys-apps/openrc-0.5.0"; then
-               newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
-               newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
-       fi
-
-       exeinto /etc/wpa_supplicant/
-       newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
-
-       readme.gentoo_create_doc
-       dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-               wpa_supplicant.conf
-
-       newdoc .config build-config
-
-       if [ "${PV}" != "9999" ]; then
-               doman doc/docbook/*.{5,8}
-       fi
-
-       if use qt5 ; then
-               into /usr
-               dobin wpa_gui-qt4/wpa_gui
-               doicon wpa_gui-qt4/icons/wpa_gui.svg
-               domenu wpa_gui-qt4/wpa_gui.desktop
-       else
-               rm "${ED}"/usr/share/man/man8/wpa_gui.8
-       fi
-
-       use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
-
-       if use dbus ; then
-               pushd "${S}"/dbus > /dev/null || die
-               insinto /etc/dbus-1/system.d
-               newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-               insinto /usr/share/dbus-1/system-services
-               doins fi.w1.wpa_supplicant1.service
-               popd > /dev/null || die
-
-               # This unit relies on dbus support, bug 538600.
-               systemd_dounit systemd/wpa_supplicant.service
-       fi
-
-       if use eapol_test ; then
-               dobin eapol_test
-       fi
-
-       systemd_dounit "systemd/[email protected]"
-       systemd_dounit "systemd/[email protected]"
-       systemd_dounit "systemd/[email protected]"
-}
-
-pkg_postinst() {
-       readme.gentoo_print_elog
-
-       if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
-               echo
-               ewarn "WARNING: your old configuration file 
${EROOT%/}/etc/wpa_supplicant.conf"
-               ewarn "needs to be moved to 
${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
-       fi
-
-       if use bindist; then
-               if ! use libressl; then
-                       ewarn "Using bindist use flag presently breaks WPA3 
(specifically SAE, OWE, DPP, and FILS)."
-                       ewarn "This is incredibly undesirable"
-               fi
-       fi
-       if use libressl; then
-               ewarn "Libressl doesn't support SUITEB (part of WPA3)"
-               ewarn "but it does support SUITEB192 (the upgraded strength 
version of the same)"
-               ewarn "You probably don't care.  Patches welcome"
-       fi
-
-       # Mea culpa, feel free to remove that after some time --mgorny.
-       local fn
-       for fn in wpa_supplicant{,@wlan0}.service; do
-               if [[ -e 
"${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} ]]
-               then
-                       ebegin "Moving ${fn} to multi-user.target"
-                       mv 
"${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} \
-                               
"${EROOT%/}"/etc/systemd/system/multi-user.target.wants/ || die
-                       eend ${?} \
-                               "Please try to re-enable ${fn}"
-               fi
-       done
-
-       systemd_reenable wpa_supplicant.service
-}

Reply via email to