gentoo auto-resync : 21:01:2024 - 14:09:19

3 files changed, 18 insertions, 26 deletions

diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index d8a6b430c691..bf0bc3c536e6 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -7,7 +7,7 @@ DIST iwd-2.3.tar.xz 1061732 BLAKE2B d22bb6bd2a1672536872f5642ed31361681fb16e08f3
 DIST iwd-2.8.tar.xz 1067700 BLAKE2B ac691dfff675bd331a7af9e02179a5df61f0e20299c4a2851bd31950cbd0b696369069bd4a635cb25d24aec75996190bf8e47c2626eeff43b7ab37af5f932989 SHA512 bd208dc5ff391dccfe1b4a12f4b587ca8cedc1c1a7a2ddb34999c23acfad0e590e0463ac1ddc5093cb6489eb8ab8a090c01bcf06d679cfaf59c4b81469631795
 EBUILD iwd-2.12.ebuild 4139 BLAKE2B 20dea8d2d5fff1a24674b8bd5fbea4cd58794f6a123aac6b31e8445e361713ed64b0de1eef8530cb22a2c1d8a5e3fa15d66144fbd629f47adbd8e0749ce8d489 SHA512 ce4683a480aad029b14bf0e8c277f3674d1f7b3728ef78628e9631b6094e43221df19c9d21042757a8211ba48f79266ab78ff80eb80c955acb693c53da6ee1f1
 EBUILD iwd-2.13.ebuild 4139 BLAKE2B 3afc75a203d91c998117e27f3cbafdb051d4db77d03ebc8875f1cc59f46c2752fee79316d6eca1a37de3e4a30ae74fde5d938c2dcce6fa9a5e7ec69cef423bb7 SHA512 dad8f3e6c5c427b1f62b3a50471a7a9f92818e7bd4e8f6df796e47b661c60e3e0ef461f5cdb919d8a8e29761344542e515f17198e2d8a531e69b64300cc576a7
-EBUILD iwd-2.3.ebuild 5019 BLAKE2B 3e70ba2fb44150598bfc1b8e6ff2e104c894c42d15e73a33061f26bd0a8df42915d1a09d9727b02c294c4db65307578466faeda063d6e6a05689e24228af4edc SHA512 be93e840a764e675894521447c5ea2b2e31365b160a7ae4f3b4514e9fd7585386d4fb29c83715af910f189f60559e768c87d822d50de643b8bb8f5a8dcb0c71c
+EBUILD iwd-2.3.ebuild 4806 BLAKE2B a55c6a342bee4294507cb4d8e2b90e36883abfcef3b76bb472c67b33481a78fb227cb451fd74fbb77bb5bbcb54530145ded874cb1f47d8da7366d8a696673657 SHA512 b316d852b47aa8cd1e6db8458eb2233d438b5344e31487bc764509f284330a014a23b2852be2f7a1b5231106ff43caabca4ee10322b5f9142d63965c131e6bbd
 EBUILD iwd-2.8-r2.ebuild 4133 BLAKE2B 7b9b7ba722760e7af20875377da15c7aa77d8fac7357fd814a70cc599fb2f63e6a383d6abfa82dec599f744eb8ee2ac277fe3317df35fc7918d702263d5cab53 SHA512 f49d215b1acdd0a76e09f93b84fa3ac33c5e11e74d7b61dfc334ca7cdd1bb431eedcae9711b6a7551ecfe7b5d01f71a6abdcb087235df6d231195a68fe538eda
 EBUILD iwd-9999.ebuild 4134 BLAKE2B fc962b5d779c059553cdb33cda2ca2824c7dcea091de99b884d2d6bc7e89cc2b2b43bc5cd4064b50386b7be21b1516cf9435c47276cde6f2ec2dcde284f18b65 SHA512 7e9ed114434f2d26b7b85a03f458ee30fcdcc12622da4501d00e685e712b4bb706939b2e0ffba358375b6025816a9b9ca9bd19d8ea7aac228662dad3dfc48baa
-MISC metadata.xml 844 BLAKE2B a0745226f5314cee29c405d53b5f03c1e2706518272a69443174123601c4b79ad5902e2f22575b46bed37c5d6ebebd1ad4cdcccbb7c40405c4d04f2b92bef17d SHA512 9997101871ad37981492b0a70150d091926ec2321f13d70d5f85f2ff5d360cc87970beb9575c2f78a909e6f3a91ef022fd7115db9ec0ec77d5d94363ed30d793
+MISC metadata.xml 717 BLAKE2B 4619afbff3a4275ff2307476c044c1a4f7c2a14ec4fbeec0db02cd35d8ec98a5d3febcde34dbc43a358129d02369ee6178e02d3938b7cace99946a963d235d99 SHA512 46809c9157af3809f720d38e71e900bb4ee8418f79030cda45e7c4547dca9f2f3b5932c5b481c44ae6bbfd0b48c0997106ada3be30ef5f2110cc287738f24473
diff --git a/net-wireless/iwd/iwd-2.3.ebuild b/net-wireless/iwd/iwd-2.3.ebuild
index 9f77d24c371e..6448e6e3e291 100644
--- a/net-wireless/iwd/iwd-2.3.ebuild
+++ b/net-wireless/iwd/iwd-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 crda +monitor ofono selinux standalone systemd wired"
+IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired"
 
 DEPEND="
 	sys-apps/dbus
@@ -35,7 +35,6 @@ RDEPEND="
 	${DEPEND}
 	acct-group/netdev
 	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
 	selinux? ( sec-policy/selinux-networkmanager )
 	standalone? (
 		systemd? ( sys-apps/systemd )
@@ -73,11 +72,6 @@ pkg_setup() {
 		~RFKILL
 		~X509_CERTIFICATE_PARSER
 	"
-	if use crda;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
-		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper
-	regulatory domain support"
-	fi
 
 	if use amd64;then
 		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
@@ -102,21 +96,20 @@ pkg_setup() {
 
 	check_extra_config
 
-	if ! use crda; then
-		if use kernel_linux && kernel_is -lt 4 15; then
-			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
-			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
-		fi
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
+	if use kernel_linux && kernel_is -lt 4 15; then
+		ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
+		ewarn "Regulatory domain support for kernels older than 4.15 requires crda, which has been removed."
+		ewarn "Please update to a more recent kernel."
+	fi
+	if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+		[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+	then
+		ewarn ""
+		ewarn "REGULATORY DOMAIN PROBLEM:"
+		ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+		ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+		ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+		ewarn ""
 	fi
 }
 
diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml
index e63160880b73..af405c7bf0b6 100644
--- a/net-wireless/iwd/metadata.xml
+++ b/net-wireless/iwd/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="client">Enable iwctl client tool</flag>
-		<flag name="crda">Use <pkg>net-wireless/crda</pkg> for regulatory domain loading instead of in-kernel (4.15+) support</flag>
 		<flag name="monitor">Enable iwmon monitor tool</flag>
 		<flag name="ofono">Enable support for oFono SIM authentication</flag>
 		<flag name="standalone">Enable standalone mode with built-in DHCP client and DNS handling"</flag>