[gentoo-commits] repo/proj/libressl:master commit in: net-wireless/wpa_supplicant/

[orbea]

commit:     760d88fe4f0ac0b21ba2298b307a27f1ac228f7e
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu May  1 15:17:42 2025 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Thu May  1 15:17:42 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=760d88fe

net-wireless/wpa_supplicant: add 2.11-r3, drop 2.11-r1

Signed-off-by: orbea <orbea <AT> riseup.net>

 ...t-2.11-r1.ebuild => wpa_supplicant-2.11-r3.ebuild} | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.11-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.11-r3.ebuild
similarity index 96%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.11-r1.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.11-r3.ebuild
index 05a8be7..7f02411 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.11-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.11-r3.ebuild
@@ -13,12 +13,12 @@ if [ "${PV}" = "9999" ]; then
        inherit git-r3
        EGIT_REPO_URI="https://w1.fi/hostap.git";
 else
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+       KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
~sparc x86"
        SRC_URI="https://w1.fi/releases/${P}.tar.gz";
 fi
 
 SLOT="0"
-IUSE="+ap broadcom-sta dbus eap-sim eapol-test +fils macsec +mbo +mesh p2p 
privsep qt6 readline selinux smartcard tkip uncommon-eap-types wep wps"
+IUSE="+ap broadcom-sta dbus eap-sim eapol-test +fils gui macsec +mbo +mesh p2p 
privsep readline selinux smartcard tkip uncommon-eap-types wep wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -39,7 +39,7 @@ DEPEND="
                eap-sim? ( sys-apps/pcsc-lite )
        )
        !kernel_linux? ( net-libs/libpcap )
-       qt6? (
+       gui? (
                dev-qt/qtbase:6[gui,widgets]
                dev-qt/qtsvg:6
        )
@@ -119,11 +119,14 @@ src_prepare() {
        # bug (948052)
        eapply "${FILESDIR}/${PN}-2.10-use-qt6.patch"
 
-       # bug (640492)
-       sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+       # bug (937452)
+       eapply 
"${FILESDIR}/${PN}-2.11-Revert-Mark-authorization-completed-on-driver-indica.patch"
 
        # LibreSSL patch (https://github.com/gentoo/libressl/issues/336)
        eapply "${FILESDIR}/${PN}-2.11-libressl.patch"
+
+       # bug (640492)
+       sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
 }
 
 src_configure() {
@@ -337,7 +340,7 @@ src_configure() {
                Kconfig_style_config LIBNL32
        fi
 
-       if use qt6 ; then
+       if use gui ; then
                pushd "${S}"/wpa_gui-qt4 > /dev/null || die
                eqmake6 wpa_gui.pro
                popd > /dev/null || die
@@ -348,7 +351,7 @@ src_compile() {
        einfo "Building wpa_supplicant"
        emake V=1 BINDIR=/usr/sbin
 
-       if use qt6; then
+       if use gui ; then
                einfo "Building wpa_gui"
                emake -C "${S}"/wpa_gui-qt4
        fi
@@ -379,7 +382,7 @@ src_install() {
                doman doc/docbook/*.{5,8}
        fi
 
-       if use qt6 ; then
+       if use gui ; then
                into /usr
                dobin wpa_gui-qt4/wpa_gui
                doicon wpa_gui-qt4/icons/wpa_gui.svg