net-wireless/wpa_supplicant: fix S to allow user patches to be applied

There are used source files outside of the 'wpa_supplicant' directory
which even the ebuild was working around. Also, drop the Qt6 patch
from live as it has been upstreamed.

Closes: https://bugs.gentoo.org/671004
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 51 insertions, 52 deletions

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.11-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.11-r5.ebuild
index f5f16a25891b..4d721e5fdc70 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.11-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.11-r5.ebuild
@@ -7,7 +7,6 @@ inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs
 
 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
@@ -17,6 +16,9 @@ else
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
 
+S="${WORKDIR}/${P}"
+
+LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
 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"
 
@@ -64,7 +66,20 @@ DOC_CONTENTS="
 	/usr/share/doc/${PF}/
 "
 
-S="${WORKDIR}/${P}/${PN}"
+PATCHES=(
+	# bug #320097
+	"${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
+	# bug #912315
+	"${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
+	# bug #948052
+	"${FILESDIR}/${PN}-2.10-use-qt6.patch"
+	# bug #937452
+	"${FILESDIR}/${PN}-2.11-Revert-Mark-authorization-completed-on-driver-indica.patch"
+	# bug #956555
+	"${FILESDIR}/${PN}-2.11-broadcom-wl-scanning.patch"
+	# bug #971605
+	"${FILESDIR}/${PN}-2.11-Send-CTRL-EVENT-SIGNAL-CHANGE-message-to-control-interfaces-only.patch"
+)
 
 Kconfig_style_config() {
 	#param 1 is CONFIG_* item
@@ -96,43 +111,25 @@ src_prepare() {
 	# 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
+		src/l2_packet/l2_packet_freebsd.c || 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
+		wpa_supplicant/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
-
-	# bug (320097)
-	eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
-
-	# bug (912315)
-	eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
-
-	# bug (948052)
-	eapply "${FILESDIR}/${PN}-2.10-use-qt6.patch"
-
-	# bug (937452)
-	eapply "${FILESDIR}/${PN}-2.11-Revert-Mark-authorization-completed-on-driver-indica.patch"
-
-	# bug (956555)
-	eapply "${FILESDIR}/${PN}-2.11-broadcom-wl-scanning.patch"
-
-	# bug (971605)
-	eapply "${FILESDIR}/${PN}-2.11-Send-CTRL-EVENT-SIGNAL-CHANGE-message-to-control-interfaces-only.patch"
+		| tee -a wpa_supplicant/dbus/*.service >/dev/null || die
 
 	# bug (640492)
 	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
 }
 
 src_configure() {
+	cd wpa_supplicant || die
+
 	# Toolchain setup
 	tc-export CC PKG_CONFIG
 
@@ -344,7 +341,7 @@ src_configure() {
 	fi
 
 	if use gui ; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null || die
+		pushd "${S}"/wpa_supplicant/wpa_gui-qt4 > /dev/null || die
 		eqmake6 wpa_gui.pro
 		popd > /dev/null || die
 	fi
@@ -352,19 +349,21 @@ src_configure() {
 
 src_compile() {
 	einfo "Building wpa_supplicant"
-	emake V=1 BINDIR=/usr/sbin
+	emake -C wpa_supplicant V=1 BINDIR=/usr/sbin
 
 	if use gui ; then
 		einfo "Building wpa_gui"
-		emake -C "${S}"/wpa_gui-qt4
+		emake -C wpa_supplicant/wpa_gui-qt4
 	fi
 
 	if use eapol-test ; then
-		emake eapol_test
+		emake -C wpa_supplicant/eapol_test
 	fi
 }
 
 src_install() {
+	cd wpa_supplicant || die
+
 	dosbin wpa_supplicant
 	use privsep && dosbin wpa_priv
 	dobin wpa_cli wpa_passphrase
@@ -395,7 +394,7 @@ src_install() {
 	fi
 
 	if use dbus ; then
-		pushd "${S}"/dbus > /dev/null || die
+		pushd "${S}"/wpa_supplicant/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
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index 669085aa9e21..8c27ba9b13d9 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,6 @@ inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs
 
 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
@@ -17,6 +16,9 @@ else
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
 
+S="${WORKDIR}/${P}"
+
+LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
 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"
 
@@ -64,7 +66,12 @@ DOC_CONTENTS="
 	/usr/share/doc/${PF}/
 "
 
-S="${WORKDIR}/${P}/${PN}"
+PATCHES=(
+	# bug #320097
+	"${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
+	# bug #912315
+	"${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
+)
 
 Kconfig_style_config() {
 	#param 1 is CONFIG_* item
@@ -96,34 +103,25 @@ src_prepare() {
 	# 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
+		src/l2_packet/l2_packet_freebsd.c || 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
+		wpa_supplicant/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
-
-	# bug (320097)
-	eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
-
-	# bug (912315)
-	eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
-
-	# bug (948052)
-	eapply "${FILESDIR}/${PN}-2.10-use-qt6.patch"
+		| tee -a wpa_supplicant/dbus/*.service >/dev/null || die
 
 	# bug (640492)
 	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
 }
 
 src_configure() {
+	cd wpa_supplicant || die
+
 	# Toolchain setup
 	tc-export CC PKG_CONFIG
 
@@ -335,7 +333,7 @@ src_configure() {
 	fi
 
 	if use gui ; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null || die
+		pushd "${S}"/wpa_supplicant/wpa_gui-qt4 > /dev/null || die
 		eqmake6 wpa_gui.pro
 		popd > /dev/null || die
 	fi
@@ -343,19 +341,21 @@ src_configure() {
 
 src_compile() {
 	einfo "Building wpa_supplicant"
-	emake V=1 BINDIR=/usr/sbin
+	emake -C wpa_supplicant V=1 BINDIR=/usr/sbin
 
 	if use gui ; then
 		einfo "Building wpa_gui"
-		emake -C "${S}"/wpa_gui-qt4
+		emake -C wpa_supplicant/wpa_gui-qt4
 	fi
 
 	if use eapol-test ; then
-		emake eapol_test
+		emake -C wpa_supplicant/eapol_test
 	fi
 }
 
 src_install() {
+	cd wpa_supplicant || die
+
 	dosbin wpa_supplicant
 	use privsep && dosbin wpa_priv
 	dobin wpa_cli wpa_passphrase
@@ -386,7 +386,7 @@ src_install() {
 	fi
 
 	if use dbus ; then
-		pushd "${S}"/dbus > /dev/null || die
+		pushd "${S}"/wpa_supplicant/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