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

3 files changed, 17 insertions, 12 deletions

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}