gentoo auto-resync : 24:01:2025 - 06:47:17

5 files changed, 804 insertions, 12 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3a58d9475375..a9dd55ea80f2 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 46da309d9a88..9633a80e1e46 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -2,11 +2,13 @@ AUX wpa_cli-r1.sh 1200 BLAKE2B f3dca6e7810b004a567802f59eaa414b4eaadf2eb1fb1338d
 AUX wpa_cli.sh 1284 BLAKE2B 50757aa432bf714923d0ff5e2e8357bf3126c82dcfebbc2c342325ad97e3ca95a15ea138f9a55e5a7b9ac86cb2518c173e7d5186d5feb3e57ac762a71b11ef85 SHA512 250372231eda6f7228fcf76b13fc1b95637d0d9dec96b7bef820bfa1af1496f218909f521daf2ddb2ca81d0ebb3162500f833575b64d8d2b4820c247499e1c56
 AUX wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch 2386 BLAKE2B cd4db56d476e4bde8d4343c6d2f20bad644d9794184f55313c3d5a9ea04392b0173791335476cadc3bafec8d588e29be971e573b27fd975280a059f0bf22c63c SHA512 d1f7e17dd1f6e9974825f26e549c194a450190191320251e5158432d88795a502ff4d06014af43c75338c9c7b0540f13f1fdf1173bec78ce78e681388bbd04d0
 AUX wpa_supplicant-2.10-allow-legacy-renegotiation.patch 1172 BLAKE2B 90af7a43418babd981d6d092c77852ff515b187ce05a3dce6497710582ddefa5d3103ddbf1f0e2481fa102cfb9d28e775646601f139ad61633f3cfc74554dbdc SHA512 afbb89ef8248b8e32a4f537092f8255f3c17fa6281811c25cfc6dec6bae69a4fda9e65a69dae2034a4d3e8e29ecf67b867604c80fd9726cb8f26a059c3bfe8a0
+AUX wpa_supplicant-2.10-use-qt6.patch 12334 BLAKE2B af1a34db36e8ff3295b6b35782cf9d630a4770961f7dc59027133163cb8823e3688d93ab24583bc87dafb721b49437d03d6b1c11369e007f18e74382bc01ce10 SHA512 961a130ab5a0ef65badecb3885fb7d81a0e2722386dd8e744a65a52044843a083b23f16eb997b148069051ac80de3b1cbb25884d4a6c438ae1fc4ad96e4b213a
 AUX wpa_supplicant-2.6-do-not-call-dbus-functions-with-NULL-path.patch 486 BLAKE2B 877e15a45851331a1499cf8bc96fd514d88b6b270f54d52760e46cc7edbcc4b74a48a0271f0c93b546bb659203c56fdfba63b231757c21ca8ee6ade98406ac2e SHA512 dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed
 AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f649489afd1636105cdddc29d58d45659c5368cc177f919ce94a7e2b5a9ed3fe8ddccd1fba3d059d270bae1a8 SHA512 6bbb9d4f6132b3d4e20cd65f27245ccadd60712ef5794261499f882057a930a393297e491d8147e04e30c0a53645af0eb3514332587118c19b5594f23f1d62ad
 AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e140f56fc1d3e6b16454351a270e566dd7fc4717b92251193bdf59a77f57fc3fdd1d53b067f2e5253796c041b SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403
 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8
 DIST wpa_supplicant-2.10.tar.gz 3511622 BLAKE2B 7f6045e5dcf24f7ccf1ea75c99541f9d68fadaea858a6ca11a95c997de14e33b3aa89138e748664579b5a4ea493d247cf6613da3c5fae49a4dbb5cd58dace752 SHA512 021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1
 EBUILD wpa_supplicant-2.10-r5.ebuild 12406 BLAKE2B ebaaf0685a183b849bbcba4978f717ea385d66e3bc8e56c557dbd289fc60b2eeb75d7b63adfadbedcee846590bb62d45d66ce68024d5dfc89da11a07d2cd4b6b SHA512 a21336436bdabd80c2e945592afb1722548bd7dfb8c1d70be06688d6394d82ab63945c2c3e5d349b53458c89ab94fed7205c5698b04523cf35cc5e7161ecb74b
-EBUILD wpa_supplicant-9999.ebuild 12328 BLAKE2B 022856291571a65d91107de35988263d6c0173c3524f9bf486e95bd980d0dccac20dc39a868ca827178f242b78f192e4df5e876c5024069dbc82852ce3226248 SHA512 0cd0eac42b4668167df1c547ed639821db2544dfa08c9ddce24b2693ea4df0ace5a9d24953c7bebc2c04d6cd5201f5ab719e41ac3335e8df88d942d1d09cf30d
+EBUILD wpa_supplicant-2.10-r6.ebuild 12451 BLAKE2B a5b23ffef96a7073489be36b6c88023cd13bed2e79c5d4f0556d40cdfb8990e333792ef11129b1dcf65cf924a1c2155002959ebb3ddc579150b678cef2f7b5ee SHA512 2749cfbd08a458511581ce070731231d256253db3614d1dbbfaf60848207f4d29b3d5051985331cbbf7b7ce9a699e942380c03fd7d76eb3d5afcd06effc45473
+EBUILD wpa_supplicant-9999.ebuild 12367 BLAKE2B 92d734b372fed84155a6982ff956ab78d8c3ab69100c3da5b3f385cf1708599744945a393f352e85dab95bf620d557696130a1d18f4d2649e5c6182738607a25 SHA512 7b5a8de61d92673790d8bfc5e737fba747e9506a890b58a757773101b7e511b2e74f72f143c6c806168f372a9a67ea62b9c2fd6255a923f36b82a55c9a9fe09e
 MISC metadata.xml 1882 BLAKE2B fc23e2184bd2c01f590800a2087461ba6c5d9d5021f6300f1505671369694374a26d333556b467ca0f41fb90d676a5fcad5b87e80ab8f2b2b891255afa0bcd6b SHA512 05ca61dcaf7c3d7543085be7d375088e5372eb6e3dee0cd9920b763e34f528aa988a8ec484328e122812e0f3208aac308d6011995e5ab1c9599fc7d5b9dc6733
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-use-qt6.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-use-qt6.patch
new file mode 100644
index 000000000000..2dd2b753763f
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-use-qt6.patch
@@ -0,0 +1,311 @@
+From 0ead8bb4889977af735f4d0b578497830ee6d6f7 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Fri, 10 Jan 2025 03:43:23 +0100
+Subject: [PATCH] wpa_gui: Port to Qt6
+
+This appears to be working. Fairly straight forward. Lightly tested.
+Distros are getting ready to remove Qt5, so this is somewhat important
+to do.
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ wpa_supplicant/wpa_gui-qt4/eventhistory.h    |  2 +-
+ wpa_supplicant/wpa_gui-qt4/main.cpp          |  8 ++++----
+ wpa_supplicant/wpa_gui-qt4/networkconfig.cpp |  8 ++++----
+ wpa_supplicant/wpa_gui-qt4/networkconfig.h   |  2 +-
+ wpa_supplicant/wpa_gui-qt4/peers.cpp         | 10 +++++-----
+ wpa_supplicant/wpa_gui-qt4/peers.h           |  2 +-
+ wpa_supplicant/wpa_gui-qt4/scanresults.cpp   |  2 +-
+ wpa_supplicant/wpa_gui-qt4/scanresults.h     |  2 +-
+ wpa_supplicant/wpa_gui-qt4/userdatarequest.h |  2 +-
+ wpa_supplicant/wpa_gui-qt4/wpagui.cpp        | 16 ++++++++--------
+ wpa_supplicant/wpa_gui-qt4/wpagui.h          |  2 +-
+ wpa_supplicant/wpa_gui-qt4/wpamsg.h          |  4 ++--
+ 12 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/wpa_supplicant/wpa_gui-qt4/eventhistory.h b/wpa_supplicant/wpa_gui-qt4/eventhistory.h
+index afd7b6346..2122ab45a 100644
+--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.h
++++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.h
+@@ -40,7 +40,7 @@ class EventHistory : public QDialog, public Ui::EventHistory
+ 
+ public:
+ 	EventHistory(QWidget *parent = 0, const char *name = 0,
+-		     bool modal = false, Qt::WindowFlags fl = 0);
++		     bool modal = false, Qt::WindowFlags fl = Qt::Widget);
+ 	~EventHistory();
+ 
+ public slots:
+diff --git a/wpa_supplicant/wpa_gui-qt4/main.cpp b/wpa_supplicant/wpa_gui-qt4/main.cpp
+index bbd45c6e1..d395aa135 100644
+--- a/wpa_supplicant/wpa_gui-qt4/main.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/main.cpp
+@@ -40,10 +40,10 @@ int main(int argc, char *argv[])
+ 	int ret;
+ 
+ 	locale = QLocale::system().name();
+-	resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+-	if (!translator.load("wpa_gui_" + locale, resourceDir))
+-		translator.load("wpa_gui_" + locale, "lang");
+-	app.installTranslator(&translator);
++	resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
++	if (translator.load("wpa_gui_" + locale, resourceDir) ||
++	    translator.load("wpa_gui_" + locale, "lang"))
++		app.installTranslator(&translator);
+ 
+ 	WpaGui w(&app);
+ 
+diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+index 2727318bc..59af84504 100644
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+@@ -37,7 +37,7 @@ NetworkConfig::NetworkConfig(QWidget *parent, const char *, bool,
+ 		SLOT(authChanged(int)));
+ 	connect(cancelButton, SIGNAL(clicked()), this, SLOT(close()));
+ 	connect(addButton, SIGNAL(clicked()), this, SLOT(addNetwork()));
+-	connect(encrSelect, SIGNAL(activated(const QString &)), this,
++	connect(encrSelect, SIGNAL(textActivated(const QString &)), this,
+ 		SLOT(encrChanged(const QString &)));
+ 	connect(removeButton, SIGNAL(clicked()), this, SLOT(removeNetwork()));
+ 	connect(eapSelect, SIGNAL(activated(int)), this,
+@@ -204,8 +204,8 @@ void NetworkConfig::addNetwork()
+ 	}
+ 
+ 	if (idstrEdit->isEnabled() && !idstrEdit->text().isEmpty()) {
+-		QRegExp rx("^(\\w|-)+$");
+-		if (rx.indexIn(idstrEdit->text()) < 0) {
++		QRegularExpression rx("^(\\w|-)+$");
++		if (!rx.match(idstrEdit->text()).hasMatch()) {
+ 			QMessageBox::warning(
+ 				this, tr("Network ID Error"),
+ 				tr("Network ID String contains non-word "
+@@ -797,7 +797,7 @@ void NetworkConfig::removeNetwork()
+ 		    tr("This will permanently remove the network\n"
+ 		       "from the configuration. Do you really want\n"
+ 		       "to remove this network?"),
+-		    tr("Yes"), tr("No")) != 0)
++		    QMessageBox::Yes, QMessageBox::No) != 0)
+ 		return;
+ 
+ 	snprintf(cmd, sizeof(cmd), "REMOVE_NETWORK %d", edit_network_id);
+diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.h b/wpa_supplicant/wpa_gui-qt4/networkconfig.h
+index fd09dec54..a3a7d9792 100644
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.h
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.h
+@@ -20,7 +20,7 @@ class NetworkConfig : public QDialog, public Ui::NetworkConfig
+ 
+ public:
+ 	NetworkConfig(QWidget *parent = 0, const char *name = 0,
+-		      bool modal = false, Qt::WindowFlags fl = 0);
++		      bool modal = false, Qt::WindowFlags fl = Qt::Widget);
+ 	~NetworkConfig();
+ 
+ 	virtual void paramsFromScanResults(QTreeWidgetItem *sel);
+diff --git a/wpa_supplicant/wpa_gui-qt4/peers.cpp b/wpa_supplicant/wpa_gui-qt4/peers.cpp
+index 0a0b3ffcb..268aba8b3 100644
+--- a/wpa_supplicant/wpa_gui-qt4/peers.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/peers.cpp
+@@ -403,7 +403,7 @@ void Peers::ctx_p2p_start_group()
+ 
+ void Peers::add_station(QString info)
+ {
+-	QStringList lines = info.split(QRegExp("\\n"));
++	QStringList lines = info.split(QRegularExpression("\\n"));
+ 	QString name;
+ 
+ 	for (QStringList::Iterator it = lines.begin();
+@@ -518,7 +518,7 @@ void Peers::add_p2p_group_client(QStandardItem * /*parent*/, QString params)
+ 	 */
+ 
+ 	QStringList items =
+-		params.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)"));
++		params.split(QRegularExpression(" (?=[^']*('[^']*'[^']*)*$)"));
+ 	QString addr = "";
+ 	QString name = "";
+ 	int config_methods = 0;
+@@ -591,7 +591,7 @@ bool Peers::add_bss(const char *cmd)
+ 	QString ssid, bssid, flags, wps_name, pri_dev_type;
+ 	int id = -1;
+ 
+-	QStringList lines = bss.split(QRegExp("\\n"));
++	QStringList lines = bss.split(QRegularExpression("\\n"));
+ 	for (QStringList::Iterator it = lines.begin();
+ 	     it != lines.end(); it++) {
+ 		int pos = (*it).indexOf('=') + 1;
+@@ -643,7 +643,7 @@ bool Peers::add_bss(const char *cmd)
+ 			item->setData(ssid, peer_role_ssid);
+ 		model.appendRow(item);
+ 
+-		lines = bss.split(QRegExp("\\n"));
++		lines = bss.split(QRegularExpression("\\n"));
+ 		for (QStringList::Iterator it = lines.begin();
+ 		     it != lines.end(); it++) {
+ 			if ((*it).startsWith("p2p_group_client:"))
+@@ -903,7 +903,7 @@ void Peers::event_notify(WpaMsg msg)
+ 		 * group_capab=0x0
+ 		 */
+ 		QStringList items =
+-			text.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)"));
++			text.split(QRegularExpression(" (?=[^']*('[^']*'[^']*)*$)"));
+ 		QString addr = items[1];
+ 		QString name = "";
+ 		QString pri_dev_type;
+diff --git a/wpa_supplicant/wpa_gui-qt4/peers.h b/wpa_supplicant/wpa_gui-qt4/peers.h
+index bb7373749..c44bba99a 100644
+--- a/wpa_supplicant/wpa_gui-qt4/peers.h
++++ b/wpa_supplicant/wpa_gui-qt4/peers.h
+@@ -22,7 +22,7 @@ class Peers : public QDialog, public Ui::Peers
+ 
+ public:
+ 	Peers(QWidget *parent = 0, const char *name = 0,
+-		    bool modal = false, Qt::WindowFlags fl = 0);
++		    bool modal = false, Qt::WindowFlags fl = Qt::Widget);
+ 	~Peers();
+ 	void setWpaGui(WpaGui *_wpagui);
+ 	void event_notify(WpaMsg msg);
+diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
+index a2e3072fb..ba04b4f38 100644
+--- a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
+@@ -77,7 +77,7 @@ void ScanResults::updateResults()
+ 
+ 		QString ssid, bssid, freq, signal, flags;
+ 
+-		QStringList lines = bss.split(QRegExp("\\n"));
++		QStringList lines = bss.split(QRegularExpression("\\n"));
+ 		for (QStringList::Iterator it = lines.begin();
+ 		     it != lines.end(); it++) {
+ 			int pos = (*it).indexOf('=') + 1;
+diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.h b/wpa_supplicant/wpa_gui-qt4/scanresults.h
+index 2cddd133f..39bba90ce 100644
+--- a/wpa_supplicant/wpa_gui-qt4/scanresults.h
++++ b/wpa_supplicant/wpa_gui-qt4/scanresults.h
+@@ -20,7 +20,7 @@ class ScanResults : public QDialog, public Ui::ScanResults
+ 
+ public:
+ 	ScanResults(QWidget *parent = 0, const char *name = 0,
+-		    bool modal = false, Qt::WindowFlags fl = 0);
++		    bool modal = false, Qt::WindowFlags fl = Qt::Widget);
+ 	~ScanResults();
+ 
+ public slots:
+diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
+index b6d1ad2f4..3f7dccb28 100644
+--- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
++++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
+@@ -20,7 +20,7 @@ class UserDataRequest : public QDialog, public Ui::UserDataRequest
+ 
+ public:
+ 	UserDataRequest(QWidget *parent = 0, const char *name = 0,
+-			bool modal = false, Qt::WindowFlags fl = 0);
++			bool modal = false, Qt::WindowFlags fl = Qt::Widget);
+ 	~UserDataRequest();
+ 
+ 	int setParams(WpaGui *_wpagui, const char *reqMsg);
+diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+index 9404ab424..0c125d90f 100644
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -99,9 +99,9 @@ WpaGui::WpaGui(QApplication *_app, QWidget *parent, const char *,
+ 	connect(disconnectButton, SIGNAL(clicked()), this, SLOT(disconnect()));
+ 	connect(scanButton, SIGNAL(clicked()), this, SLOT(scan()));
+ 	connect(connectButton, SIGNAL(clicked()), this, SLOT(connectB()));
+-	connect(adapterSelect, SIGNAL(activated(const QString&)), this,
++	connect(adapterSelect, SIGNAL(textActivated(const QString&)), this,
+ 		SLOT(selectAdapter(const QString&)));
+-	connect(networkSelect, SIGNAL(activated(const QString&)), this,
++	connect(networkSelect, SIGNAL(textActivated(const QString&)), this,
+ 		SLOT(selectNetwork(const QString&)));
+ 	connect(addNetworkButton, SIGNAL(clicked()), this, SLOT(addNetwork()));
+ 	connect(editNetworkButton, SIGNAL(clicked()), this,
+@@ -1078,7 +1078,7 @@ void WpaGui::selectNetwork( const QString &sel )
+ 	char reply[10];
+ 	size_t reply_len = sizeof(reply);
+ 
+-	if (cmd.contains(QRegExp("^\\d+:")))
++	if (cmd.contains(QRegularExpression("^\\d+:")))
+ 		cmd.truncate(cmd.indexOf(':'));
+ 	else
+ 		cmd = "any";
+@@ -1095,7 +1095,7 @@ void WpaGui::enableNetwork(const QString &sel)
+ 	char reply[10];
+ 	size_t reply_len = sizeof(reply);
+ 
+-	if (cmd.contains(QRegExp("^\\d+:")))
++	if (cmd.contains(QRegularExpression("^\\d+:")))
+ 		cmd.truncate(cmd.indexOf(':'));
+ 	else if (!cmd.startsWith("all")) {
+ 		debug("Invalid editNetwork '%s'",
+@@ -1114,7 +1114,7 @@ void WpaGui::disableNetwork(const QString &sel)
+ 	char reply[10];
+ 	size_t reply_len = sizeof(reply);
+ 
+-	if (cmd.contains(QRegExp("^\\d+:")))
++	if (cmd.contains(QRegularExpression("^\\d+:")))
+ 		cmd.truncate(cmd.indexOf(':'));
+ 	else if (!cmd.startsWith("all")) {
+ 		debug("Invalid editNetwork '%s'",
+@@ -1132,7 +1132,7 @@ void WpaGui::editNetwork(const QString &sel)
+ 	QString cmd(sel);
+ 	int id = -1;
+ 
+-	if (cmd.contains(QRegExp("^\\d+:"))) {
++	if (cmd.contains(QRegularExpression("^\\d+:"))) {
+ 		cmd.truncate(cmd.indexOf(':'));
+ 		id = cmd.toInt();
+ 	}
+@@ -1204,7 +1204,7 @@ void WpaGui::removeNetwork(const QString &sel)
+ 	char reply[10];
+ 	size_t reply_len = sizeof(reply);
+ 
+-	if (cmd.contains(QRegExp("^\\d+:")))
++	if (cmd.contains(QRegularExpression("^\\d+:")))
+ 		cmd.truncate(cmd.indexOf(':'));
+ 	else if (!cmd.startsWith("all")) {
+ 		debug("Invalid editNetwork '%s'",
+@@ -1476,7 +1476,7 @@ void WpaGui::showTrayStatus()
+ 
+ 	QString msg, status(buf);
+ 
+-	QStringList lines = status.split(QRegExp("\\n"));
++	QStringList lines = status.split(QRegularExpression("\\n"));
+ 	for (QStringList::Iterator it = lines.begin();
+ 	     it != lines.end(); it++) {
+ 		int pos = (*it).indexOf('=') + 1;
+diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.h b/wpa_supplicant/wpa_gui-qt4/wpagui.h
+index f0a34c97e..898722bd9 100644
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
+@@ -49,7 +49,7 @@ public:
+ 	};
+ 
+ 	WpaGui(QApplication *app, QWidget *parent = 0, const char *name = 0,
+-	       Qt::WindowFlags fl = 0);
++	       Qt::WindowFlags fl = Qt::Widget);
+ 	~WpaGui();
+ 
+ 	virtual int ctrlRequest(const char *cmd, char *buf, size_t *buflen);
+diff --git a/wpa_supplicant/wpa_gui-qt4/wpamsg.h b/wpa_supplicant/wpa_gui-qt4/wpamsg.h
+index 8f2fcdc41..fe36e2044 100644
+--- a/wpa_supplicant/wpa_gui-qt4/wpamsg.h
++++ b/wpa_supplicant/wpa_gui-qt4/wpamsg.h
+@@ -10,7 +10,7 @@
+ #define WPAMSG_H
+ 
+ #include <QDateTime>
+-#include <QLinkedList>
++#include <QList>
+ 
+ class WpaMsg {
+ public:
+@@ -30,6 +30,6 @@ private:
+ 	QDateTime timestamp;
+ };
+ 
+-typedef QLinkedList<WpaMsg> WpaMsgList;
++typedef QList<WpaMsg> WpaMsgList;
+ 
+ #endif /* WPAMSG_H */
+-- 
+2.48.0
+
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r6.ebuild
new file mode 100644
index 000000000000..6f5307e422d3
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r6.ebuild
@@ -0,0 +1,478 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+	EGIT_REPO_URI="https://w1.fi/hostap.git"
+else
+	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 fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt6 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps"
+
+# 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. bug #684442
+REQUIRED_USE="
+	macsec? ( !privsep )
+	privsep? ( !macsec )
+	broadcom-sta? ( !fils !mesh !mbo )
+"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2k:=
+	dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		>=dev-libs/libnl-3.2:3
+		eap-sim? ( sys-apps/pcsc-lite )
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtsvg:6
+	)
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-networkmanager )
+	kernel_linux? (
+		net-wireless/wireless-regdb
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+DOC_CONTENTS="
+	If this is a clean installation of wpa_supplicant, you
+	have to create a configuration file named
+	/etc/wpa_supplicant/wpa_supplicant.conf
+	An example configuration file is available for reference in
+	/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)
+			if ! sed -i "/^$CONFIG_PARAM\>/s/=.*/=$setting/" .config; then
+				echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
+			fi
+			if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
+				echo "$CONFIG_PARAM=$setting" >>.config
+			fi
+		else
+			#ensure item commented out
+			if ! sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config; then
+				echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+			fi
+		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
+
+	# 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 (912315)
+	eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
+	eapply "${FILESDIR}/${PN}-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
+
+	# bug (948052)
+	eapply "${FILESDIR}/${PN}-2.10-use-qt6.patch"
+
+	# bug (640492)
+	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC PKG_CONFIG
+
+	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
+
+	# 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_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 mbo ; then
+		Kconfig_style_config MBO
+	else
+		Kconfig_style_config MBO n
+	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
+
+	Kconfig_style_config EAP_PWD
+	if use fils; then
+		Kconfig_style_config FILS
+		Kconfig_style_config FILS_SK_PFS
+	fi
+	if use mesh; then
+		Kconfig_style_config MESH
+	else
+		Kconfig_style_config MESH n
+	fi
+	# WPA3
+	Kconfig_style_config OWE
+	Kconfig_style_config SAE
+	Kconfig_style_config DPP
+	Kconfig_style_config DPP2
+	Kconfig_style_config SUITEB192
+	Kconfig_style_config SUITEB
+
+	if use wep ; then
+		Kconfig_style_config WEP
+	else
+		Kconfig_style_config WEP n
+	fi
+
+	# Watch out, reversed logic
+	if use tkip ; then
+		Kconfig_style_config NO_TKIP n
+	else
+		Kconfig_style_config NO_TKIP
+	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
+		else
+			# bug #831369 and bug #684442
+			Kconfig_style_config DRIVER_MACSEC_LINUX n
+			Kconfig_style_config MACSEC n
+		fi
+
+		if use ps3 ; then
+			Kconfig_style_config DRIVER_PS3
+		fi
+	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
+		Kconfig_style_config WPS2 n
+		Kconfig_style_config WPS_UFD n
+		Kconfig_style_config WPS_ER n
+		Kconfig_style_config WPS_UPNP n
+		Kconfig_style_config WPS_NFC n
+	fi
+
+	# Wi-Fi Direct (WiDi)
+	if use p2p ; then
+		Kconfig_style_config P2P
+		Kconfig_style_config WIFI_DISPLAY
+	else
+		Kconfig_style_config P2P n
+		Kconfig_style_config WIFI_DISPLAY n
+	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 use kernel_linux ; then
+		Kconfig_style_config LIBNL32
+	fi
+
+	if use qt6 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null || die
+		eqmake6 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 qt6; 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
+
+	newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+	newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}/wpa_cli-r1.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 qt6 ; 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/wpa_supplicant@.service"
+	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
+	systemd_dounit "systemd/wpa_supplicant-wired@.service"
+}
+
+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 wep; then
+		einfo "WARNING: You are building with WEP support disabled, which is recommended since"
+		einfo "this protocol is deprecated and insecure.  If you still need to connect to"
+		einfo "WEP-enabled networks, you may turn this flag back on.  With this flag off,"
+		einfo "WEP-enabled networks will not even show up as available."
+		einfo "If your network is missing you may wish to USE=wep"
+	fi
+	if ! use tkip; then
+		ewarn "WARNING: You are building with TKIP support disabled, which is recommended since"
+		ewarn "this protocol is deprecated and insecure.  If you still need to connect to"
+		ewarn "TKIP-enabled networks, you may turn this flag back on.  With this flag off,"
+		ewarn "TKIP-enabled networks, including mixed mode TKIP/AES-CCMP will not even show up"
+		ewarn "as available.  If your network is missing you may wish to USE=tkip"
+	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-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index ffa8b14e9a08..9fef0e62ce8c 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-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps"
+IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt6 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -37,11 +37,9 @@ DEPEND="
 		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
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtsvg:6
 	)
 	readline? (
 		sys-libs/ncurses:0=
@@ -125,6 +123,9 @@ src_prepare() {
 	# bug (912315)
 	eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
 
+	# bug (948052)
+	eapply "${FILESDIR}/${PN}-2.10-use-qt6.patch"
+
 	# bug (640492)
 	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
 }
@@ -357,9 +358,9 @@ src_configure() {
 		Kconfig_style_config LIBNL32
 	fi
 
-	if use qt5 ; then
+	if use qt6 ; then
 		pushd "${S}"/wpa_gui-qt4 > /dev/null || die
-		eqmake5 wpa_gui.pro
+		eqmake6 wpa_gui.pro
 		popd > /dev/null || die
 	fi
 }
@@ -373,7 +374,7 @@ src_compile() {
 		emake -C ../src/eap_peer
 	fi
 
-	if use qt5; then
+	if use qt6; then
 		einfo "Building wpa_gui"
 		emake -C "${S}"/wpa_gui-qt4
 	fi
@@ -404,7 +405,7 @@ src_install() {
 		doman doc/docbook/*.{5,8}
 	fi
 
-	if use qt5 ; then
+	if use qt6 ; then
 		into /usr
 		dobin wpa_gui-qt4/wpa_gui
 		doicon wpa_gui-qt4/icons/wpa_gui.svg