gentoo auto-resync : 19:08:2023 - 21:39:30

19 files changed, 604 insertions, 283 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 8f45e9c2cf9e..8f1d73041841 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 23bcedd0bd74..c9e37d79ba48 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -12,5 +12,5 @@ AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197b
 DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053
 DIST crda-4.15.tar.gz 72907 BLAKE2B c5fe2a625e37a92447a52a477214fe8279201cb729fdb4af9f26e4174923179edf53e35484a34f76707e6801b2b636e38fe043c2a54038b7dd7f14ab97532d45 SHA512 5a5a2c6914529383ae84895a70d2455dbc94939f0bd0f8ee3f7158e768ab4a0123053abf5d87b050dc4104397f246ec2f1c1b97e9b6a7043c65b7aef568af539
 EBUILD crda-4.14.ebuild 2131 BLAKE2B 43113fb57584f043a86c1711d2e0d5937c5121dea762a749b9a3d227943f64426b1205bed1f415852855134a9b7683ef933e0fd040479cd6fa5f038832048cde SHA512 afe6c01244ce33710166b91970f44ad933ecc8991ef7f8aecfd879cfde0de17a86336cd99bb31793154bf6fc34014f7d1e95fc1817c3637407f435daeb7a7eb1
-EBUILD crda-4.15.ebuild 2174 BLAKE2B 296c93fce0bd9e61ab8bc1a6d5a79976350b65f8d6c1e714de31e8ee7e107dba0cf5c8ae475481a17ddb4c342b652f31d8214c1ee404b837dee6f5d0a56a4692 SHA512 7fb463fcab0eb82d4487606fb9cc35ea8df2d0b37ada0fc3bcf8fd031e10849068bc5f1093d7f4decb8e7ccef03266227bcb64046a759c7b4408ccc320ff6516
+EBUILD crda-4.15-r1.ebuild 2238 BLAKE2B 730bb1e7a4ac1d8500e4e9fa4d88099bab0e78795b55baf69f1b5a83fa01d3be667a4f24c59d316d89e92ac7abfcf7e77b474ab0c4962e3ef7590fce1dd3a649 SHA512 4d9a97cb06093a0bdd2577665b09cbfff0e65454828350f7cbf2e775e1550598ff90bf3ecf02d30cb3522cf06aff06ae786f729efa5b735d882e1dc62f734555
 MISC metadata.xml 342 BLAKE2B 88aa38f713696271570968796b27533c0a990225592a4b553c4d1ff50528bce6bc5c96ab43998950b1391c42051eac0b7ed32eeb9b01458e4112ddfca56fbab7 SHA512 1775a84638c2ccdd1171d073603c2f0fa2d1248c1b2584ac25c26dd2eba0dc3af2800740253ca2083f10c11ad8763c4614cf73cdb695142dc75be79ea1c03675
diff --git a/net-wireless/crda/crda-4.15.ebuild b/net-wireless/crda/crda-4.15-r1.ebuild
index 5a6481317949..7f41b1fb732e 100644
--- a/net-wireless/crda/crda-4.15.ebuild
+++ b/net-wireless/crda/crda-4.15-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit toolchain-funcs python-any-r1 udev
 
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
@@ -84,3 +84,11 @@ src_install() {
 	_emake DESTDIR="${D}" install
 	keepdir /etc/wireless-regdb/pubkeys
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index dc369c5f6560..a1ce387ebab0 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,6 +1,6 @@
 DIST hostapd-2.10.tar.gz 2440435 BLAKE2B dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f SHA512 243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
 EBUILD hostapd-2.10-r1.ebuild 7170 BLAKE2B 65a8eabd2ade5a1931f722d4f4552da2be3f86c22be2e45476159bfaa26f62bc7ac283bff591e770a3700856854a8e392f24216bba2faa08706cd4b70d9fc603 SHA512 4650c0a812bf409ff445f1c443816b5b2044108d1d3ba34e46985524012dd3e773f9cade75e6e649daab9cd2942a134458e99eba63031906adfdb4db03f3026e
-EBUILD hostapd-2.10.ebuild 7068 BLAKE2B f8b6dda4daf81b40830dcb27d9225fc2c2644f2b9352478610411205a4817fd7b271abb447bc752b3159f3902ad80110d41809ad9a4b4dbf28f5a397286630ba SHA512 e58f84943b752bda63822d441b35210ce70d0ca34daf29fe436ffff3723766a34626a24fc738ad0e4e22863287c7a580cfa515e5992023c0c6c5c190c4be62e8
-EBUILD hostapd-9999.ebuild 7175 BLAKE2B 5e7ad049273594046a398cbaa3b094d95602bfd7301055a46ed0b1186e1d0b54a1722ac914b19377e5bae2552dd7cd644f804b933b68640634c7e9af137d6b1d SHA512 e2191fd6f8cd4883e04c466f9579a3ceb70a25cba022530b6f677e0717ab3b52de747120cac1bbcfbf84e4c464d66324c52c7825a293d38286f65b6c2ad6468b
+EBUILD hostapd-2.10-r2.ebuild 7167 BLAKE2B 47eeacd7524900846080b38f11e61add26275f20ceb884470ae228d9d82a17252fa99d3f67bfafc8984d8f1e7b7b05dd29277bb19d1068087aa593dee6bf7761 SHA512 93a14d8e5fdc9508df0972429ea9c0787a9c8eff85d056e4dc8526146e1f2d944b2682e0807cbc558546f90fdb2dbfd6f145451d1eef85e310bdcf257c5d8c6c
+EBUILD hostapd-9999.ebuild 7167 BLAKE2B 47eeacd7524900846080b38f11e61add26275f20ceb884470ae228d9d82a17252fa99d3f67bfafc8984d8f1e7b7b05dd29277bb19d1068087aa593dee6bf7761 SHA512 93a14d8e5fdc9508df0972429ea9c0787a9c8eff85d056e4dc8526146e1f2d944b2682e0807cbc558546f90fdb2dbfd6f145451d1eef85e310bdcf257c5d8c6c
 MISC metadata.xml 1017 BLAKE2B 90f775b08fe2389ab1d84c35662d7ddb79e8f01b3419ce852f72cc82b02fd94b8e10493428f09308ed463a0b9fa1bb6b406172fe4d33a1ef0603c2cae51f1505 SHA512 6947ad5f84c87fdf2fb94136647038d99c5a0a0cbdb2f895acf998d25d035c5041233064069d325f73f01f1cafd0ba23fc4acd87ac05a6ec3f4babed7df711f1
diff --git a/net-wireless/hostapd/hostapd-2.10.ebuild b/net-wireless/hostapd/hostapd-2.10-r2.ebuild
index c9c014c28576..81c6f18518bb 100644
--- a/net-wireless/hostapd/hostapd-2.10.ebuild
+++ b/net-wireless/hostapd/hostapd-2.10-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic systemd savedconfig toolchain-funcs
 
@@ -23,23 +23,27 @@ else
 	fi
 
 	# Never stabilize snapshot ebuilds please
-	KEYWORDS="amd64 arm arm64 ~mips ppc x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps"
 
 DEPEND="
 	internal-tls? ( dev-libs/libtommath )
 	!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
 	kernel_linux? (
+		net-wireless/wireless-regdb
 		>=dev-libs/libnl-3.2:3
-		crda? ( net-wireless/crda )
 	)
 	netlink? ( net-libs/libnfnetlink )
-	sqlite? ( >=dev-db/sqlite-3 )"
-RDEPEND="${DEPEND}"
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-hostapd )
+"
 BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
@@ -154,6 +158,7 @@ src_configure() {
 	echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
 	echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
 	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211AX=y" >> ${CONFIG} || die
 	echo "CONFIG_OCV=y" >> ${CONFIG} || die
 	echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
 	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index f96e871c975b..81c6f18518bb 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic systemd savedconfig toolchain-funcs
 
@@ -28,17 +28,17 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps"
 
 DEPEND="
 	internal-tls? ( dev-libs/libtommath )
 	!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
 	kernel_linux? (
+		net-wireless/wireless-regdb
 		>=dev-libs/libnl-3.2:3
-		crda? ( net-wireless/crda )
 	)
 	netlink? ( net-libs/libnfnetlink )
-	sqlite? ( >=dev-db/sqlite-3 )
+	sqlite? ( dev-db/sqlite:3 )
 "
 RDEPEND="
 	${DEPEND}
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index b8bb559b795d..7dd5681a3971 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,7 +1,5 @@
-DIST iw-5.16.tar.xz 149548 BLAKE2B f5c27cd92c0a5404b73992c178d611e3c78b71369f97fab1b617cc83a9951cdcbcc00bfb20cc6a8f8d08a6bef16cef7d042fc5ed3139e2fd40aa3392f66e37a6 SHA512 4537a7844b652b890bdafd21ff087137e04cb1b8c9c352c33ef15476c08d02fb530b7a2d920c6c581529bba6a62a9eb5460d04db8917426fb5d759033fd55408
 DIST iw-5.19.tar.xz 152044 BLAKE2B 57c14b3be0b171b80abcbc71a45f392115f62cc0c3f8440185cb05b42f7a7c901653969a4d5200878b7ceb7aea356d9cf02e07a9fbb282b34372c23561f4fe0a SHA512 ff5c23543806c91eda27c91da923737c74cbccd6acc55f1f45114338f518cd959ca292c9255fd75b91dc127ed016eb235dd97af319e30631578eba6cb0823c6c
 DIST iw-5.9.tar.xz 145296 BLAKE2B d7abe6c65d408a7570227dbe69fe11e1d72a1f502de21d1fcb7dcff6bfe229804020d5c1ebdda42a3694e31cf87c631faf089746f8df4733b0b1a459c185e2af SHA512 08b0c8d92c7e695bb2a107b89c3cc406e8386393b65ecbf96ded6fd757043ccd12bedaa90c14138e03e53f107365d04e229633c1cfa024ecab5fe993578491be
-EBUILD iw-5.16.ebuild 882 BLAKE2B 0960690c6e96d3c6b0a00d343e48ef473f1adeb6dedece98b7162cafa80060ce679e625753fa2199f07571102ceab9cf565c27f66b01c74e5d2855e05ed73bde SHA512 8c0b2c9bbfc41cb48d99b6581905299fcec993be08982a385339c267095bcf2011a6854e26a1d6a8d23d0753525c88a7fb620bed765417a293052669b86bdedd
 EBUILD iw-5.19.ebuild 883 BLAKE2B 3f9c85488274f81780ba5910d801d2c14dcf7835ffb0f1129c3891b707a5c46297551636040a3a744cd591ba1e9943345674179f7ea8df9e744bed20fa0fda38 SHA512 b359a4f0a78193c1574ce1f92396e08b47c3e9b2bcfc182df4e4b3e10d240219e0b7b87840c8dbf92c3defcf54b47569507ee82634e02c746cdf94b76f2eab37
 EBUILD iw-5.9.ebuild 862 BLAKE2B 22b2c65957b58261c1ae778d5b901bcd69eb96e58d2f381c6c538f5973c55f0383a530f2fb1a207e0fb72a6e99aa53c4e30fed547a61c42a32f40e69ab47800f SHA512 ca57a9d4623eb36b98bcfa82384b68ab811c1ae85c407b14ec2eadec8fc4e6833e4143e53d89a9469fc8a2b5ec0ebc991a22c905b2680920b6c1a8ec8aeb674b
 MISC metadata.xml 326 BLAKE2B b542a288462866aab338ad36546026aa12ce0c8b0e8abf2eff3cbff0bd591c6402379d68df77686b36524f1127ed0c061f57f223f4559f4456728009226a663c SHA512 32b6a69e2ad35466321ffa8ae5a9ffde83f99b64b91e65ffca3662fb7dc3c6c2d7d46acb0d8da40e46de3c1b9764abb836bdb0934d727837c4c7d5bacd501a0b
diff --git a/net-wireless/iw/iw-5.16.ebuild b/net-wireless/iw/iw-5.16.ebuild
deleted file mode 100644
index d7698616f612..000000000000
--- a/net-wireless/iw/iw-5.16.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211 configuration utility for wireless devices using the mac80211 stack"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	tc-export CC LD PKG_CONFIG
-
-	# do not compress man pages by default.
-	sed 's@\(iw\.8\)\.gz@\1@' -i Makefile || die
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 1ef4f559d3c3..81d64930ceb1 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,13 +1,5 @@
-DIST wireless-regdb-2022.02.18.tar.xz 25908 BLAKE2B 1237537a5d9ed249cc53b838b65effa83ceecd06bb76b11388a6c7673cd61322026617f033bea53d024f15a58ca19c4ab51bb624f2ee8fb1f2233b8e99140d4a SHA512 133fadd331dc0bd3f23e7dab54c3dfb1c55d8271bdaf9f393207fccd6c4d1d3d8f6428c1bebad54b2f3fd4837c4b6930b2fb33b3dc07abb53e41bdc8a54d8de4
-DIST wireless-regdb-2022.04.08.tar.xz 26308 BLAKE2B 30d3be06709c9dac3c034ded733f24a2261be06adfb9723cfb5bfec79439b89383be8b2d2acb41ea98c2138532b227b8fc14ba92512fa40b61ae7c3294d9a284 SHA512 328ccd6df67241faf03674820e4f799572764af580254b3aa4c834a9535a2732d303bcfe3ce503404f608074849424f1f8599b0f567dc00d7393dbcff7f07cf8
 DIST wireless-regdb-2022.06.06.tar.xz 26636 BLAKE2B e7695b1d4173ec239645a1f9c0bdd8f9cef92da86d918f3b2a7904487787b1a8b6fce5a75d0b7fad7d8a25f1419a4771e509977a5e3b13dff03bc53e976609f6 SHA512 ee6e79eeef3bf995120d31741bac9592771cbf918401f83d0ee059ba4119f7d9667607c5218bd9eeb0011dd7083264cf39a1a0ad3ebfd37dcfd957b01f248e0d
-DIST wireless-regdb-2022.08.12.tar.xz 26812 BLAKE2B ae84adfcaf66147f1a8bc6646225efe9d1a3b6313e04f82f18f4c5bfb0aa58270c5a5872d808a7267ce918f0343e2772ff38c7829de466bead4c2da4755614cc SHA512 37939229500571a273080c04010e5a131041f345cb817cf0c310de0b162a19e4eb0b90044f80a39dd53d8fef500581969052a9ac536202629e896659ead1cbe7
-DIST wireless-regdb-2023.02.13.tar.xz 27068 BLAKE2B a1d312b1301d27352a3dc5e62b19caa4c3e910014eab392fe298867b2eb8ec8758d59d25ba015689f5831eaa1acad2b74085534367e015a4d9c5926621e5a7c2 SHA512 a5f65fb00e2d3dc09559df864972f94d8b1a76521567a6a486c23d7349cdb7c7f9598fa269f70a1f674517f5f6103e051d5c3e048d5324489ee6e6b2c455fc78
 DIST wireless-regdb-2023.05.03.tar.xz 27260 BLAKE2B e880be3bacd7409719ede3e104ea6af870e0fb4edaefa6c61615ca74a8169a159348d631a4c296e273f6cc6e01ced2089e56c10080dd15a7439d8b4510eff7b8 SHA512 9de4852a1d351c11399ca55ea2ad61be23f488c61595b5c5afa3498d76488adc8120c6c77644275c460efcd1bb5bb68fa25597e73bec22ae847321bb55f7af27
-EBUILD wireless-regdb-20220218.ebuild 1092 BLAKE2B 5a8e4d26468e69a0901fd938bf6681afb86d50c74af038afb57fd992db0359bc748e24bbcb3e2d9997300df62cdaf83a6aff9d73435f1938f1dd84e93947c992 SHA512 849fa96f1cc4ebfe66604af7ab1647846bc9f45c2c4056dbe278c42e9e003a694aad4c6ed0de366e4ca996a18e3cadcece569516f0d5a2cc705130c189b2c4cb
-EBUILD wireless-regdb-20220408.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db
 EBUILD wireless-regdb-20220606.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db
-EBUILD wireless-regdb-20220812.ebuild 1106 BLAKE2B bb16990e7fd4813be8c29bcd12e5aae4fefb5a90a188c70ebbc9462b5ea3e10a0b2f28d3077e1141798bf388b0ba87113adfd667758bdfc5b5b0483608ef099c SHA512 b0373a5fc8c1f491d43bc16f016e28fa5aa5ace6c73ee0994a9ada71bdb34ffa959ddee19fe5628cf929f955c0d44742adad59794293379c4b36392fa4958f8a
-EBUILD wireless-regdb-20230213.ebuild 1106 BLAKE2B bb16990e7fd4813be8c29bcd12e5aae4fefb5a90a188c70ebbc9462b5ea3e10a0b2f28d3077e1141798bf388b0ba87113adfd667758bdfc5b5b0483608ef099c SHA512 b0373a5fc8c1f491d43bc16f016e28fa5aa5ace6c73ee0994a9ada71bdb34ffa959ddee19fe5628cf929f955c0d44742adad59794293379c4b36392fa4958f8a
-EBUILD wireless-regdb-20230503.ebuild 1115 BLAKE2B 652854f563058cb039720e58f27291a93335aace84d93d92965d9f930616303b17d61aa047d8661c8bc3403f88d154a3eb8ffa362f9b11cce4acc4eb4a0639e2 SHA512 3c97484c5e754fe4105de75c64fdbf6b836ee2432e3c720364c58138d61d7d613a504516a831140493e22f3a908dec349aab73c90110e71d78420fe3a13de967
-MISC metadata.xml 272 BLAKE2B 2a42142ca287ab19668cc11278dac4d0f16bf5b183646b0f06317a6e60568d9328d42baa986af6c692a256b28fdef32f24442faf69ae9b8305d625a3265df298 SHA512 4595277c33cd3d565c652cae1644c4ba131dea25899984629a48dc9a679441c95a7d26527c6fe4578a3e6f616e6f8c25580ee9f785fdcbd699bd43bacd846dd3
+EBUILD wireless-regdb-20230503-r1.ebuild 2777 BLAKE2B eb1d2be6c710d1588a951b5d9e52102266e561efe502ab1c2c9674ab65174a6a4eb9c29c618ff97e0138db7317f0c7af72788ec2262291eac45d8b04f2423ab1 SHA512 a7cd5f5ef6a1a393b23a535c032e0803e86aa439add1c8c0692f7fc55460a1d58aff8a21823589f399cbf6beb1335e9b1c78f2c571416a3863ec02d639c9c423
+MISC metadata.xml 423 BLAKE2B 5efca466ca95efca980dede4352cd67f120440ccac911e1dbd16bc7931ed193a3c08b1794acb77389caea2494f6e6ede0052313fd9ca0ac5ad18b87d0491fdd3 SHA512 97a332381f091c8365992a226eeb4b22c764b6d44fa9ece8ea6fddf299f1e91901690743211a13023652f1cc8d6b5d771f8c2425638fe43891425b5a0753a406
diff --git a/net-wireless/wireless-regdb/metadata.xml b/net-wireless/wireless-regdb/metadata.xml
index a61f7bfb3196..101c017e6f75 100644
--- a/net-wireless/wireless-regdb/metadata.xml
+++ b/net-wireless/wireless-regdb/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<use>
+		<flag name="crda">Use obsolete <pkg>net-wireless/crda</pkg> for regulatory domain loading instead of in-kernel (4.15+) support</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20220218.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220218.ebuild
deleted file mode 100644
index 050550bee28b..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20220218.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild
deleted file mode 100644
index 3f15ef755143..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20220812.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220812.ebuild
deleted file mode 100644
index b684d0aeffa7..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20220812.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230213.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230213.ebuild
deleted file mode 100644
index b684d0aeffa7..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20230213.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild
new file mode 100644
index 000000000000..cf490e5d7dd3
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
+DESCRIPTION="Wireless Regulatory database for Linux"
+HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
+SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="crda"
+
+RDEPEND="crda? ( net-wireless/crda )"
+
+REQUIRED_USE="kernel_linux"
+
+pkg_pretend() {
+	if kernel_is -ge 4 15; then
+		if linux_config_exists; then
+			if linux_chkconfig_builtin CFG80211 &&
+				[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]; then
+				ewarn "REGULATORY DOMAIN PROBLEM:"
+				ewarn "  With CONFIG_CFG80211=y (built-in), the driver(s) 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."
+			fi
+			if ! linux_chkconfig_present CFG80211; then
+				ewarn "REGULARTORY DOMAIN PROBLEM:"
+				ewarn "  With CONFIG_CFG80211 unset, the driver(s) won't be able to load the regulatory.db from"
+				ewarn "  /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m."
+			fi
+		fi
+
+		if has_version net-wireless/crda || use crda; then
+			ewarn "Starting from kernel version 4.15 net-wireless/crda is no longer needed."
+			ewarn "The crda USE flag will be removed on or after Feb 01, 2024"
+		fi
+
+		CONFIG_CHECK="EXPERT ~!CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="You can safely disable CFG80211_CRDA_SUPPORT"
+	else
+		CONFIG_CHECK="~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: \
+please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	check_extra_config
+}
+
+src_compile() {
+	einfo "Recompiling regulatory database(s) from db.txt would break signature verification."
+	einfo "Installing unmodified binary version."
+}
+
+src_install() {
+	if use crda; then
+		# This file is not ABI-specific, and crda itself always hardcodes
+		# this path.  So install into a common location for all ABIs to use.
+		insinto /usr/lib/crda
+		doins regulatory.bin
+
+		insinto /etc/wireless-regdb/pubkeys
+		doins sforshee.key.pub.pem
+	fi
+	# install the files the kernel needs unconditionally,
+	# they are small and kernels get upgraded
+	insinto /lib/firmware
+	doins regulatory.db regulatory.db.p7s
+
+	# regulatory.db.5 is a reference to regulatory.bin.5 so you need both unconditionally
+	doman -i18n= regulatory.db.5 regulatory.bin.5
+	dodoc README db.txt
+}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503.ebuild
deleted file mode 100644
index 5a750ea025a0..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20230503.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 382707b7378f..20c6ca112df6 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -5,5 +5,6 @@ AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e1
 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-r1.ebuild 13515 BLAKE2B 71a0a18099f6e233e0a73d50266b36839ab4608782712e31aeb326961b01e29f3f5ffddd699ce1cc205ca5bfddf5456f1ce2376fb1c4dc9fc5054607ab9f04bf SHA512 d669c9b3cfa9b2914e54ac70ad068a3959c282b5d64372d72036f2d88afaee4580ed9905bdd89202e072e86e1f7cce1382435496c7b7d1b44c5b5de222169a93
-EBUILD wpa_supplicant-9999.ebuild 13521 BLAKE2B b23c0109d040b6126f9ab16173151332ad019671526089f5957fda745cd9ea1f4823d15ce2b87533ba3dbaab7b96cc6217ac82eccbbc7716e0a3b323de4d3fe5 SHA512 ebd7002056064c40d94f2d8d46fbb4df4c1bfed7f4c1cf3a8304cceb182df896c2d47f092beac2b4131bbd6ee89a128824d6741ec09147de5429a1a2742b2fd8
+EBUILD wpa_supplicant-2.10-r2.ebuild 12514 BLAKE2B 43059454cffd29b4ffde61630b5bfd3c93d7c8f83035f9a0e53af65d9082cbb9eb2122884de1f61933ca11c28600639b0c5e2820db60ddd54c1d00fe21dfe67e SHA512 458c449bf9259bbfd0e68070595e817a9b8261680d46c9216f5ab8c7ea19bc1f6834b084e29c6c4de589ea38dc7521aaee45d50404d2350129fb42a82c407de7
+EBUILD wpa_supplicant-9999.ebuild 12514 BLAKE2B 43059454cffd29b4ffde61630b5bfd3c93d7c8f83035f9a0e53af65d9082cbb9eb2122884de1f61933ca11c28600639b0c5e2820db60ddd54c1d00fe21dfe67e SHA512 458c449bf9259bbfd0e68070595e817a9b8261680d46c9216f5ab8c7ea19bc1f6834b084e29c6c4de589ea38dc7521aaee45d50404d2350129fb42a82c407de7
 MISC metadata.xml 2009 BLAKE2B 1325c2f5c246bd9c4760b31d5a3cd65519aada177f10fb8df4cbb591dce85e69dcf2033cad88be8e96205721d6c0523e061af0dc281afcea3b625815fb1716fe SHA512 91a69ae5aeebcc5dc5f3f121d007ba6efc61d8025023e0dcad030918af83294622ae72e93db70c835da8ae2ab77de3aab29c7e4ad890471243992b1db490376c
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild
new file mode 100644
index 000000000000..656297bfa793
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild
@@ -0,0 +1,483 @@
+# Copyright 1999-2023 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 ~ia64 ~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 qt5 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 )
+	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=
+	)
+"
+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
+	${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)
+			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 (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 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/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 aee70bb7bc41..656297bfa793 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-2022 Gentoo Authors
+# Copyright 1999-2023 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 +crda 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 qt5 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
@@ -52,7 +52,6 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-networkmanager )
 	kernel_linux? (
 		net-wireless/wireless-regdb
-		crda? ( net-wireless/crda )
 	)
 "
 BDEPEND="virtual/pkgconfig"
@@ -77,36 +76,18 @@ Kconfig_style_config() {
 			#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 ! 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
-			sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
-		fi
-}
-
-pkg_pretend() {
-	CONFIG_CHECK=""
-
-	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
-
-	check_extra_config
-
-	if ! use crda ; then
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			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."
+			if ! sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config; then
+				echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+			fi
 		fi
-	fi
 }
 
 src_prepare() {
@@ -117,13 +98,6 @@ src_prepare() {
 		-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):" \