gentoo resync : 12.05.2022

77 files changed, 580 insertions, 2887 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 505f292e2865..7a89e381ec44 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index dae68a115fca..108f101e5917 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,5 +1,7 @@
 AUX aircrack-ng-1.6-hwdata.patch 921 BLAKE2B 0cbe038a33745cfb9bf873ea34627281d4a5f30e7f36595ef85490d4a13d281235f7e6cf09af1f0d7fea10fefda4a4ba76bcd8f0175520fb6b314c191dcd998e SHA512 cb2bcb89185555e827f3bc28135ac0fd025f3c9a7e770c779c4feb3737ae6a975c55ce041e31cb4409a9339b730b42d453eb62b5576709a79e42737abe5ffd1b
 DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75
+DIST aircrack-ng-1.7.tar.gz 7740634 BLAKE2B 4461af7b698d30c96e6f93494d5ee658bf8d7144d8b165e9b8aee1766a35dddded3bbb738237e1100dcf22167125aa7cf9149288bba1607fe778470b04596cb2 SHA512 3e6433cba1d6b122701245e8904480de9957dad033c1642cc45b30339e9391ffa21b39b2cc712bcba79bc2c2e26f2964be8f28a27081dc4bb323792cb7df2478
 EBUILD aircrack-ng-1.6_p20200722-r1.ebuild 2474 BLAKE2B ab71fe70a5817b57b22fc0a74fea4b0b2f8f6d6c6662ec350a817028c8d66f769f6e77591c02209037cc5b8eb8e99936ef0de7e82c3bce5316ce1318c710d2e5 SHA512 daaf64848114ebea39e5ec2ff370ef373d55bfc639213881c62a28e826ab790dae5c5a362864547b6d9639508cc42e510a9efe7cee5c8001483009d0205567de
-EBUILD aircrack-ng-9999.ebuild 2268 BLAKE2B 01671a7167087aa9975a67148af35936a457c3845e46c492123475fbfe535f45beb77d3811c002cf51ffb0570aa5cd474e1330b21d703f7f16e7072fffe137cd SHA512 78518c67116723c2d6e667986c9f0ef28168bd769096ec27477bee4087a2310c3babf22803a34edab5ae42be5b0d034faff33cb3b426c91fb1b3648ef79272d1
+EBUILD aircrack-ng-1.7.ebuild 2310 BLAKE2B 4ee1e593477a0f4d6f77457e1f0b97ba4442b23450e3ac33e4b2a06d83d18f23df7bfc812c17a507adf628a6dbc926a1baea42768407b1791e499ead579dce41 SHA512 1983274ce81ddb99b01a30da88746646303e521f3661f88d8785961f7e8884c8432dacad18d58fd6dda46b77e4252eb60bec28ec99023a1fd6ef732a95b133e8
+EBUILD aircrack-ng-9999.ebuild 2310 BLAKE2B 4ee1e593477a0f4d6f77457e1f0b97ba4442b23450e3ac33e4b2a06d83d18f23df7bfc812c17a507adf628a6dbc926a1baea42768407b1791e499ead579dce41 SHA512 1983274ce81ddb99b01a30da88746646303e521f3661f88d8785961f7e8884c8432dacad18d58fd6dda46b77e4252eb60bec28ec99023a1fd6ef732a95b133e8
 MISC metadata.xml 1025 BLAKE2B 3ef3b53eb156de9ed98d8a6283b6950e6d2f184d1058139a94222b18d5695da805444d993d50d9fc9736c7035a3a20253679e06e5b64bb1c83f504aa4f0406b6 SHA512 bd9b04fb372175910512baba2320a91e9122dded0070f0498c82ae55716e4b5dc027ba7027086805ab9782283eb43ab0787e41a0a5b8c551e696511ac45bc291
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild
new file mode 100644
index 000000000000..5fa3ec4ce798
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs distutils-r1 flag-o-matic autotools
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental"
+
+DEPEND="net-libs/libpcap
+	sys-apps/hwloc:0=
+	dev-libs/libbsd
+	dev-libs/openssl:0=
+	netlink? ( dev-libs/libnl:3 )
+	pcre? ( dev-libs/libpcre )
+	airdrop-ng? ( ${PYTHON_DEPS} )
+	airgraph-ng? ( ${PYTHON_DEPS} )
+	experimental? ( sys-libs/zlib )
+	sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}
+	kernel_linux? (
+		net-wireless/iw
+		net-wireless/wireless-tools
+		sys-apps/ethtool
+		sys-apps/usbutils
+		sys-apps/pciutils )
+	sys-apps/hwdata
+	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="
+	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		STATIC_LIBDIR_NAME="$(get_libdir)" \
+		--disable-asan \
+		--enable-shared \
+		--disable-static \
+		--without-opt \
+		$(use_enable netlink libnl) \
+		$(use_with experimental) \
+		$(use_with sqlite sqlite3)
+}
+
+src_compile() {
+	if [[ $($(tc-getCC) --version) == clang* ]] ; then
+		#https://bugs.gentoo.org/show_bug.cgi?id=472890
+		filter-flags -frecord-gcc-switches
+	fi
+
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_compile
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_install
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_install
+	fi
+
+	# we don't need aircrack-ng's oui updater, we have our own
+	rm "${ED}"/usr/sbin/airodump-ng-oui-update
+	find "${D}" -xtype f -name '*.la' -delete || die
+}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index e3aaf11f7fc8..5fa3ec4ce798 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
 else
 	MY_PV=${PV/_/-}
-	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
+	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/net-wireless/airspy/Manifest b/net-wireless/airspy/Manifest
index f75174b98fe1..2cd565a5ce11 100644
--- a/net-wireless/airspy/Manifest
+++ b/net-wireless/airspy/Manifest
@@ -1,5 +1,5 @@
 AUX airspy-1.0.10-remove-static-libs.patch 1275 BLAKE2B 5eeb3d7df9be82a20f4bdeb5d6ee37adcb586fbc628922a01a64df85e79f39a13cc161de9ff986866675fd39c1dbdc849ddc274d365f3ec7f6152969fff475ee SHA512 4c418f467ab4ea1a95653b2381c2f20e0a3c7b08b3a9d82481e3d3f71aaa1ebf63f5ed4d031570d76b301cf6bc4282c10b1e41045505556386c7100400ca7df4
 DIST airspy-1.0.10.tar.gz 238863 BLAKE2B 1cd257140094205ed5c9e574b6b77b297ff88d50e3dada639d6daea4aa6969a9470f7e68d505a88e04dd42b978263b83abb0d8f37399fdf0093823b9c24150a7 SHA512 61ea82e8b9892053b6fdccd7de05f248145bb5da0d4f63bb31d3a815fa739b248662a875d53d88de260cfa2a98ef266ea165ba50397e67822ea21ca273c93b24
-EBUILD airspy-1.0.10.ebuild 958 BLAKE2B 3e716f8a94163fd3131e85b19f9e1cdb2bc9e7f553d2385550626e97985b63528e75cdc28059617fb0608ec99d0612dfbd7ef46c16484094e9a12be18655d3c9 SHA512 236c8d4abcdc534124cf2f00333b4d80850fa3fe12679ec5df939aad75cb79f5f41532911cdbc1bcb0a2a822371a091ee3bcccab6a901f0025c9a12c08622ad9
+EBUILD airspy-1.0.10.ebuild 965 BLAKE2B 513fd095f015df84f27197767954b74788b1be5972aa7bdc5eb5df3fc5592b8c15d35b0191ddf1122fbeed63d21541551a1d9b19375e22fb2c232275004c184d SHA512 323c100fbac59667b103a66f522f903b1dce46104621fee651953f502fe039c2a125646af0027aecc26c66ad012f8a5375e77da71c1c4f11083c9e571621af51
 EBUILD airspy-9999.ebuild 958 BLAKE2B 3e716f8a94163fd3131e85b19f9e1cdb2bc9e7f553d2385550626e97985b63528e75cdc28059617fb0608ec99d0612dfbd7ef46c16484094e9a12be18655d3c9 SHA512 236c8d4abcdc534124cf2f00333b4d80850fa3fe12679ec5df939aad75cb79f5f41532911cdbc1bcb0a2a822371a091ee3bcccab6a901f0025c9a12c08622ad9
 MISC metadata.xml 221 BLAKE2B 934906fa89eba872d36cbda450e77f91a1eb97deb78ffe527ef21e647d19dafe3593316ee447f092242495a4c05bb94e5bdab308013f57ac6e37047010066461 SHA512 ff4505c5e831d3a8e469b4bf56cce97765e107c6d6fdcb0832a6a31d5aae607feaa122a15f80e6bc9091bb023bda32497521874a69b978d0aa2c1f9059dbb07a
diff --git a/net-wireless/airspy/airspy-1.0.10.ebuild b/net-wireless/airspy/airspy-1.0.10.ebuild
index 710503c6cb91..20eb14ea4ba6 100644
--- a/net-wireless/airspy/airspy-1.0.10.ebuild
+++ b/net-wireless/airspy/airspy-1.0.10.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/airspy/host/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/airspyone_host-${PV}"
 
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/net-wireless/bladerf-firmware/Manifest b/net-wireless/bladerf-firmware/Manifest
index e7fc44ff251c..2691abfb4be3 100644
--- a/net-wireless/bladerf-firmware/Manifest
+++ b/net-wireless/bladerf-firmware/Manifest
@@ -1,3 +1,3 @@
 DIST bladeRF_fw_v2.4.0.img 123432 BLAKE2B f451fac209afdb976840f430bee23c2a2cfacb58bb960ea1f4608d97859974bbe4874389c69bca779ef39744d2926aa96d127780dad925451813ffbc9a83c90a SHA512 0fea8985dc4e02146056cba2bf28b31fc7331941eeb2c905cdab29c7b2ee4223c75b99de68f4734329a4c661f7472a1facacde3b251f2663608dacef8bde2017
-EBUILD bladerf-firmware-2.4.0.ebuild 824 BLAKE2B 0483b495492163a4936c21ce448426165d8867a186ad9ae64e2c0ac809ccb63540ba805273949b4bcf0d8e79e602734e5e6c762cbc63ff5c7a86e20e9b1f8b12 SHA512 c31c55eb57cf3e9cf3eee15c763b925779ca2d72b01bbd3a0d22e4fd3e4d17a716b92e0e76000963a036f9e25354f69f1715c4bd1130774ae8ce535bde149918
+EBUILD bladerf-firmware-2.4.0.ebuild 831 BLAKE2B 953e375815943987b7b529c9a3138745ff9beb8435c9b95f21af17a71a20433f03532ff22def92cbfae7668678c826080fe3afc8172fabf7ed30feafe1c89ed1 SHA512 34285d4433925b3efc31a4bd10ef2dd9343459b0376b240849919cb5efa6fa202635b1ecb475bad1c36b0cb0663bf74d719b799f1e51c0f1129033d4dd09ddd0
 MISC metadata.xml 335 BLAKE2B 4a59f01a0e3aaf3293297ab368ff1438eb9d5e5bae3edfbbb1dd9f7191ccb47e9c504fa318a1a54752bbcf507f33c96d8808343f6f77a7de7a8c1fe1d84146ac SHA512 443b02d3f3aa162d3a176ffd081f6e0ff3bdd3276b48b817a03da2f43ab360b2db99add599f501ba1efcb47a12b30cf64587c5d307dc9c3583b46265150ba2d3
diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild
index 7cdf02f656b7..b87c7b7fbf62 100644
--- a/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild
+++ b/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://nuand.com/fx3/bladeRF_fw_v${PV}.img"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-wireless/bladerf-fpga/Manifest b/net-wireless/bladerf-fpga/Manifest
index 64721910d535..d85f73c053a2 100644
--- a/net-wireless/bladerf-fpga/Manifest
+++ b/net-wireless/bladerf-fpga/Manifest
@@ -2,5 +2,5 @@ DIST hostedx115-0.12.0.rbf 3571462 BLAKE2B a89693c1d53b81e59b7801246afdbee8bc30e
 DIST hostedx40-0.12.0.rbf 1191788 BLAKE2B 47396bcade3cb2df3769569c5176dfbe8c9b717d02d62101d76d8e0ecdfa8df499966e072dd1b6ad54b03c4448e86fdad0c7e190ed30fbffb579b6282a2b1160 SHA512 1c963d5b4d3ecade5e9565202ce2563493806b44319f2b9b00325f17164f0207396b1546826afc19767f9207b3d526b90e74bef7e0d38be15ba6c81fdeb12c41
 DIST hostedxA4-0.12.0.rbf 2632660 BLAKE2B 25f434bcb434df420be3c6a4c0bb3d3f48189e81b36f7bf8d775856080e8552fd4a62690fec31dc1b13ba66057b2261ca749706183f0e4063068c62dcd909634 SHA512 5e3bf78c8f87648df241a234d2bcbad1c8ed066a2b31a7b8f529c2401e140603d47f37b72c9631308d29daaa4f56f77dbff0f1dab8071a55e66e385c1d3a9bd6
 DIST hostedxA9-0.12.0.rbf 12858972 BLAKE2B 29d3c5d12c232333a7e2cb2e9ef580a7a350a0d04287cf2d068894d4b185a0f8256cfe87269738978ab0f0fabafa28921ca6ff13b8067d61fafb46a30ca230b7 SHA512 990199f980ebdda58f40bd72823585b3091d829b2974e84ab925576b7d1db2dfeef1d0934763636b92baee982470cc2fcff85dfa9bb2c6254b7021274703e4aa
-EBUILD bladerf-fpga-0.12.0.ebuild 1094 BLAKE2B 9b246fddc6872ce2de153504e30e20736f5f47b98bbeee451645a2df391489464efad7e528eb0500fab2acada997613f678ca0d3f333fb0ea641cf766a461ffd SHA512 844ed41ecab8d43b6a7c8bbf85c8d471bc1493c6eed0d27bd39ef13dec840ae032517bc651eb808f968c4f5f2a251e6e6520adb2cc04b6836fe395355561f218
+EBUILD bladerf-fpga-0.12.0.ebuild 1101 BLAKE2B d8aebcc468761c269845b5057f60b5374d06def021fd3eea669c04154733fedaa3f2eea458ca729f19084a390076c7c4baf00c556c600b74b039f7a51b0de94c SHA512 f315d34f3033c46a995dc6f6713a8d2780bae26c5fa09ae864fe2542f506d73b6413a8de51335f17abdb4af82bdd42feaf4a32c40c76fcb361d67ea7eaba7041
 MISC metadata.xml 699 BLAKE2B 1f5aa0910d6e056a20d64daa49efcc2c54302406a30853bae927d0f2fcbb90e115b693d2ee6f1205667db95b630b1014997874d7e51ba4341b150024e3bd8087 SHA512 df38595ac836df0786c76645ef62183518505268e2da6f05f8acfc36df9df2c97cf28261989b12812a1d545e8ccc399c1ec16de3e04c1600175f1ca585cac8f7
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild
index 10f806c6a60a..5de745cdaf13 100644
--- a/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild
+++ b/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="xA4? ( http://nuand.com/fpga/v${PV}/hostedxA4.rbf -> hostedxA4-${PV}.rb
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 IUSE="+xA4 +xA9 +x40 +x115"
 
 DEPEND=""
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 60ec55a0a844..85ea59d060be 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,5 +1,5 @@
 DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
 DIST bladerf-2021.03.tar.gz 2261864 BLAKE2B b4e58e370c1e515162f01a0da3985b5ba3c210a8a045bd531e618a9da8e4e66e74a8ccca9138cf6427b512f9c4423bd4151cc63d70a5e218c2a24980afa73972 SHA512 76ebb6501ad9286c7a52a0540f991f7848e396b4d75104bf7186ffac5e3142aa79914352238c8a9e0b4453910c171218c0e861092f228202d0b236939fecc325
-EBUILD bladerf-2021.03.ebuild 1633 BLAKE2B 7d83c515d30a5f553753b6a153ae5a87eb4ecb87c4a0634e69550c6f6394d4cfdd27484eae069417b2ca7b6912c5bc9ab94007ecdfc19c6c6de166ab55851d62 SHA512 5be0ae2a713acac895913438bacc02974446ccac5185b2841cbeff35e7cf273efb9029c1ef86120711d277cfbe212aae44ae91d480f8aee8ac4ac735e1c154b4
+EBUILD bladerf-2021.03.ebuild 1640 BLAKE2B 78c010e6446a831ca7c1f881d9811e22fe562ab16c6b1d6fd4446f80a3b3f5aed89718d60d21855ab21d0e376bc64191481c073418d861c917f9217275dafe97 SHA512 a4c6a4165534a9194659d094a07222537ada1882a47b7f697d6d3a37a90d8a2cb73a6b36c976fb2aff6a0c879dac37c5be8a45380af373b9ce33b78f4322d0a0
 EBUILD bladerf-9999.ebuild 1635 BLAKE2B a094a4b9603bc24bd1214e3e65792982acc535ada7b32bbadf6f2f00f9560437582fc8d3777b08e069aec22536e4db762e8aa1c87943c8b68a5e293b1c8820db SHA512 bd46ac70a1e2b38854919f52ef5f1aa29ca3bbcf1a0e171c138a25e9e5c13dbea7fd14ebab35d12ce2d3238ea7e798d1bcca157a08d2b84840970fd65dea62b7
 MISC metadata.xml 535 BLAKE2B 7fc9a46afda3efa2b20a94b888d5c808066ea749b3fb81fd5e6351f1749b0beb02e0c9c8986a4704ecc42f6406c22b1da3742536c62b269e472b721ab7172486 SHA512 8070f05c8a481f0e921f63b0722e8991c7be6103aea4753536dd36af4d10bbb67e72a55a465d49e4ff7f5972e1f535b1cd8ff2d33b569a9fb7b71b3cd81765f2
diff --git a/net-wireless/bladerf/bladerf-2021.03.ebuild b/net-wireless/bladerf/bladerf-2021.03.ebuild
index ac1bd5fa0b1e..ca6c57bdf3d4 100644
--- a/net-wireless/bladerf/bladerf-2021.03.ebuild
+++ b/net-wireless/bladerf/bladerf-2021.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ else
 	S="${WORKDIR}/${MY_PN}-${MY_PV}"
 	SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \
 			https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~riscv x86"
 fi
 
 CDEPEND=">=dev-libs/libusb-1.0.16
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 10df9f47a05d..977e7f4d6f3e 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,7 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
-DIST blueman-2.2.2.tar.xz 1560516 BLAKE2B fb82044971fb51ed7732f7638872e3bdbc7259a4fd4f3cc26f5567cfce378319ef3346376d3f07ceab92d2d002ff6455cc7c43345da7f660c3dc9f6b5ab57980 SHA512 b95f82c8a1bc8a77755f56944852a92da3bb58ecf646da75cfc6b6b50af679a3a8efb881f7917e6bb8b3645b1d3ab95b52ecd3c13ff0891ce999b59fe6d24488
 DIST blueman-2.2.3.tar.xz 1587268 BLAKE2B b3a2d275904959437a47eec32b16f9ebd945bf49705d4f4752d9bfa40d7764b73d373225875773491432cf5b72319eba51a7206cccf10dcf6033a98f584a0504 SHA512 ccaf624bdea116c70b375ae62c1b477452207e8df0fa0941b0e80ac9fa9fbf760fa0bd0db1e7dc1e63f6010323c4b0bb228e315a0cb8f6a4283cd9da6cfa012b
-EBUILD blueman-2.2.2-r1.ebuild 2954 BLAKE2B 1e38c31a56398fa1987b9e30852337b229c0fed6fd68c9d4fd9ab65001395945bfe1c242b3b313fc7028300439e77c314b4fabca4444a9a6021cacb0c45032f2 SHA512 b07e299f4f9ba1daea6a40f8d4cc87fe0d607c58c3e22c1019b1049076abb6b67eb63fde6ce0aedbbe89929cb42d8345b8b471c72b2acf5cc0eb6d9b9f410e06
-EBUILD blueman-2.2.3-r2.ebuild 2977 BLAKE2B 72d5b1d9c8454f281da76ad4bc368e39c66edbbb1a98d1f31feb7b1370bc7ffc5723fbca400a7b96f0d09bf0e639e93440e8979f666a7dfe59233145aba9ad57 SHA512 09a067b43613edd5b156f363bdd838d5a9c4f623899d622992fdd3f9450b5b0ef1adaff34a564ef323c22a09e3215bfeb77ce697447e668a82c10f1fc312005c
+EBUILD blueman-2.2.3-r2.ebuild 2971 BLAKE2B 16fb956ccc94c0b06d25309c9d040fc68a50a8ef0d990fe04be85f0f168243e803ebde4336d94ca2e33b92dddfb1236daf30eec82089918fce849edd23c67051 SHA512 980bfa2a3f77434c310907615fba64a4a83f5d5b28079f8e8a3fe4a9b77b23b73df97228b1012fe87b0ed6af960d1f83ce2227dccdb424d16a000d48075d7b8b
 EBUILD blueman-9999.ebuild 2970 BLAKE2B f3b366b000991df89f191c290c55ea3817f765d0c92df63b65813f0a1891cb3a9eec2d37af40e6ff3b53dba4083db9d4977da9c2a869a786219800d2cc791214 SHA512 3dc045260205dddfa04f54379386956b1f17659ec4670b8d3f1690e2c6546a695ef63455edf34088a9c0e2b61b3b2e9b7de95c58822af638470bc1e30a047e58
 MISC metadata.xml 499 BLAKE2B 54e6fc4cc7b9922abf5a8bae572c282bded5bce21add03e418effeb5009ce7700a3fbede5f132638aa934b71b0898310e1b8315c48a76216045d56e53c7cf1dc SHA512 30e120ce07c4b4bfc278dfcfcad987bf878ed1ebc0ec92d859cf943270c439cdf717b5a9f01ee36399a64743c98aa73f9cd91db4fc85e0c0cf6b73c75d62a817
diff --git a/net-wireless/blueman/blueman-2.2.2-r1.ebuild b/net-wireless/blueman/blueman-2.2.2-r1.ebuild
deleted file mode 100644
index bf91bd70e3e9..000000000000
--- a/net-wireless/blueman/blueman-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
-	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-fi
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	')
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio-daemon[bluetooth]
-			<media-sound/pulseaudio-15.99.1[bluetooth]
-			media-sound/pulseaudio-modules-bt
-		)
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# replace py-compile to fix py3
-	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
-}
-
-src_configure() {
-	local myconf=(
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable appindicator)
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/blueman-2.2.3-r2.ebuild b/net-wireless/blueman/blueman-2.2.3-r2.ebuild
index 24a8732bed40..13fd55d8e9c7 100644
--- a/net-wireless/blueman/blueman-2.2.3-r2.ebuild
+++ b/net-wireless/blueman/blueman-2.2.3-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 fi
 
 # icons are GPL-2
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 6ccc2e812c96..a12bf8b6f8ee 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,18 +1,9 @@
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLAKE2B c7226ccbf1b794b5f3d6504dcb6950bc7e7bd69995243d0e4cf30dfb161f95e15c18c96724f82916e8c83cac6ff255ed957b60c9ee9ad53e108c69eb509074d5 SHA512 65a970fa82ded9f6e97ef2f0d856010f96468cbd375447e1c47d6073be5a364f747b7b5ea93a0bc3b7dba0470dc8dccd9b5d1f6567f18b38042e424d3e06171b
-AUX 0001-Revert-attrib-Make-use-of-bt_att_resend.patch 4975 BLAKE2B 4e2e8a7bb9f5ef7913fbe69b76261ceeb061a10893c3f20c3eab2a155e18fd3bef58788798503f27afc7c97c46fad2014b91bb2c70c9ba11931ae5eb717fdad2 SHA512 f3d26fcb79d5448d12bb9495c24b99b13821b8672ed6d3568b01126baf4e439bd31bcdb9d295530a876db2f3d5b9369e033e2e9d7cc49771fa8579063074c1f0
-AUX 0001-hog-Fix-read-order-of-attributes-rediffed.patch 14751 BLAKE2B f327a76e9f9b2b1274db48d306746651ad81cfbc605480ee0f1798a505d0a2841f8e518b4503eb5ca6486c21855f1cd3e3a87de0904c02fe8cc527dffa42ccfd SHA512 421f7aa162bf7ad8915440ebddd17188c3d7deb79ccc9b0584c258a149bf9e80ebda6020a46367f15020fc973066795965854a10eba979fc8dd0773bf647a857
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
-AUX 0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.patch 2648 BLAKE2B aff471dec8eebf58be5127078233e566eabc13d41ad5b641e01a4310b012ec71cf7462c99f440328988daf2e5cbdcb39bbdbde2b257c48ce045cdaa3da65b9d5 SHA512 7f3cdf331cccd726bf3510b1782b849c0cdb34e4ff060d69f593eafe03dd79085ee2d64c5b4fcf059fe01e75cb74ba3556c41ea72577a2d26f5a65a6263aad6a
 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
-AUX bluez-5.62-fix-disconnecting.patch 2244 BLAKE2B fe2d3b975adda9422ac8bfd41c1cedc70cafd363982e4a415b057498e83feaf989fff7fe78fcbfa9b4fcdb1c1629347bd6380259ef71bf8c5ac78386b7990231 SHA512 2cf7b4929ab2f8f7e68546ba15ab7f74bcb748f741d6d6cc189ead14becd3403d0d6393b0645fccd215da3aee90360db28cd327802cf2ff3212f0487edaa3e95
 AUX bluez-5.63-musl-limits.patch 558 BLAKE2B 2dd66c54aee0bd8bfe3fd530a4e29139d79f6eb153e06e13680df42f2a361274d6a8f0f80989b7962173d693f37d1cac8b16506267a1319e608382511cf4bfe1 SHA512 b752414c8219befb71e0f0a59fa33be5a0d2add2b89a0c8f90de13aef1815307e5f4b8f076d3778778ab3de6656fd50d59f621af50d9ed39695b5f7978660348
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
-DIST bluez-5.62.tar.xz 2149348 BLAKE2B db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70 SHA512 8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8
-DIST bluez-5.63.tar.xz 2169168 BLAKE2B 5393bb045a3cf05de164417ce7c98e271742ba752a58aa1ac43a758f2ad8608508e24ff59783d97aa6d5aebdc77e66d9aca94a6c8378cd3fd48fd22ce9d3b89d SHA512 1b8ce7b1bd9611873c27a762a60df580edeefe5424e8733a2067b9afb1a47915f9319849bc1eeee148f5b1f33977b7975e05867e8dbdf73d33cd68e6b99ca75b
 DIST bluez-5.64.tar.xz 2175148 BLAKE2B 828c620330d1993d5c5c2a865f2d27a29425e3583aac01a1a782290a805ee0fd6456b6832c804ad323dd8714fa9329487b2616ed08f1f491ea29403ee05dba2d SHA512 f11f9974b29c5c6fce3890d7e42425c1cb02e42c1b8f49c5cc4b249234e67b64317d0e5e82721e2fbf1b53269c8569a9c869d59ce42b5e927f6622f0753e53cd
-EBUILD bluez-5.62-r2.ebuild 9103 BLAKE2B cf83b34b46fcbaecb4d1a2d2e583b34d67534d18bf7ceeacbee589fda4d2d3bb9be4aa6bde8cbbce3311106c55e14d3eb7136c1c86cf4943dc3b8b8e9d161963 SHA512 750e391d3dc10225288037537624bd53aea605581a3a0124979d846e7e54147b72913e2c182a4e571699c33246473a42f5e56e6af578db38e256248954a9ee66
-EBUILD bluez-5.62-r3.ebuild 9518 BLAKE2B 6094902d7b691ee93c3d45b808cd3af6967f870188cbef2dcf509880a53ae08a343255535876af6162eb4cdda610c8f8672e803cb665d015c4c22a2e5e4937ea SHA512 4e552fde3a2350bf26aceea56f79881d8d7b751d723c70e29618cf6b81a0ffe12fa2aa9ecfeebcdda6fe24a322c0425ab232c715e7081eb8a976dbd983d3b133
-EBUILD bluez-5.63-r1.ebuild 9528 BLAKE2B f34f340268f324dc3de2a96acc32c1407d933e5186a2987072bb7afb412ce3fead50378805dc0b27d9c7cd427ce0fe0131fb5101c219c1af4d62db4a98816691 SHA512 5b2ed09edb772f167266f56cec1850d0bd926b3723be88c7dc97d8d5c093aff540324a45fa04252c5b2fd35938ce12947718dae04635b8bef3dcfc2fd1774f08
-EBUILD bluez-5.64.ebuild 9320 BLAKE2B ece8e614fe4b8f2d0b295b9800a98870a561659bfe4c1bd9f7e00acce49715a39de6664bd564b7fbd63a389ffdc6223a101026592429b32195a49fc89a19bc94 SHA512 aff581a7111b617070e7514d1f288a7f10a909cdd4f693a96f02392aa64b53021e96457efdc7acbc61bae7d16675c57fa7e10246e0acfece3e0bcf6926f22574
+EBUILD bluez-5.64.ebuild 9341 BLAKE2B 5f8eb4df0457233494f803f9f589039a9d67b30832b969ddf1ee4ba8ef8165664fc1e100d6611e25b2704ff8eeae2ae360f8ac699f80f0bfd2c5d9a727c2776e SHA512 458c102829f53879e6e537d78d9082e79b7b6622b376445b78d440c23018ad0184ed89049ad93949805fbcfe292c54ee6831f94dd22ece93af46431809f7bdfb
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.62-r2.ebuild b/net-wireless/bluez/bluez-5.62-r2.ebuild
deleted file mode 100644
index 70c9a7547c55..000000000000
--- a/net-wireless/bluez/bluez-5.62-r2.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-REQUIRED_USE="
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-	test? ( ${TEST_DEPS} )
-"
-DEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	btpclient? ( >=dev-libs/ell-0.39 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.39
-		>=dev-libs/json-c-0.13:=
-		sys-libs/readline:0=
-	)
-	midi? ( media-libs/alsa-lib )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd )
-	>=sys-apps/dbus-1.6:=
-	udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	# https://bugs.gentoo.org/539844
-	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-)
-
-pkg_setup() {
-	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
-	# to prevent bugs like:
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
-		~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL"
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
-	if use mesh || use test; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
-		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
-	fi
-	linux-info_pkg_setup
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	if ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
-	fi
-
-	eautoreconf
-
-	if use cups; then
-		# Only not .am to not need to run eautoreconf only because of this
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable btpclient external-ell) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable mesh external-ell) \
-		$(multilib_native_use_enable midi) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev hid2hci) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also they can break without"
-			ewarn "previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			dobin tools/btmgmt
-			# gatttool is only built with readline, bug #530776
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
-			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
-			# https://bugs.archlinux.org/task/37686
-			dobin attrib/gatttool
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
-			dobin tools/avinfo
-		fi
-
-		# Not installed by default after being built, bug #666756
-		use btpclient && dobin tools/btpclient
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# Drop python2 only test tools
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
-
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-pkgincludeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	if use systemd; then
-		dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	# Setup auto enable as Fedora does for allowing to use
-	# keyboards/mouse as soon as possible
-	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
-	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	# Install .json files as examples to be used by meshctl
-	if use mesh; then
-		dodoc tools/mesh-gatt/*.json
-		local DOC_CONTENTS="Some example .json files were installed into
-		/usr/share/doc/${PF} to be used with meshctl. Feel free to
-		uncompress and copy them to ~/.config/meshctl to use them."
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
-	use mesh && readme.gentoo_print_elog
-}
diff --git a/net-wireless/bluez/bluez-5.62-r3.ebuild b/net-wireless/bluez/bluez-5.62-r3.ebuild
deleted file mode 100644
index 71035af2f830..000000000000
--- a/net-wireless/bluez/bluez-5.62-r3.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-# btpclient needs mesh, bug #790587
-REQUIRED_USE="
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-	test? ( ${TEST_DEPS} )
-"
-DEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	btpclient? ( >=dev-libs/ell-0.39 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.39
-		>=dev-libs/json-c-0.13:=
-		sys-libs/readline:0=
-	)
-	midi? ( media-libs/alsa-lib )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd )
-	>=sys-apps/dbus-1.6:=
-	udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	# https://bugs.gentoo.org/539844
-	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
-	# causes problems with Logitech MX wireless input devices (see
-	# https://github.com/bluez/bluez/issues/220 )
-	"${FILESDIR}"/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
-
-	# gatt-client: Fix disconnecting due to GattCharacteristic1.MTU
-	# (from 'master')
-	"${FILESDIR}"/${P}-fix-disconnecting.patch
-)
-
-pkg_setup() {
-	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
-	# to prevent bugs like:
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
-		~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL"
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
-	if use mesh || use test; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
-		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
-	fi
-	linux-info_pkg_setup
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	if ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
-	fi
-
-	eautoreconf
-
-	if use cups; then
-		# Only not .am to not need to run eautoreconf only because of this
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable btpclient external-ell) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable mesh external-ell) \
-		$(multilib_native_use_enable midi) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev hid2hci) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also they can break without"
-			ewarn "previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			dobin tools/btmgmt
-			# gatttool is only built with readline, bug #530776
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
-			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
-			# https://bugs.archlinux.org/task/37686
-			dobin attrib/gatttool
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
-			dobin tools/avinfo
-		fi
-
-		# Not installed by default after being built, bug #666756
-		use btpclient && dobin tools/btpclient
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# Drop python2 only test tools
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
-
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-pkgincludeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	if use systemd; then
-		dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	# Setup auto enable as Fedora does for allowing to use
-	# keyboards/mouse as soon as possible
-	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
-	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	# Install .json files as examples to be used by meshctl
-	if use mesh; then
-		dodoc tools/mesh-gatt/*.json
-		local DOC_CONTENTS="Some example .json files were installed into
-		/usr/share/doc/${PF} to be used with meshctl. Feel free to
-		uncompress and copy them to ~/.config/meshctl to use them."
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
-	use mesh && readme.gentoo_print_elog
-}
diff --git a/net-wireless/bluez/bluez-5.63-r1.ebuild b/net-wireless/bluez/bluez-5.63-r1.ebuild
deleted file mode 100644
index baad2b48deaf..000000000000
--- a/net-wireless/bluez/bluez-5.63-r1.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-# btpclient needs mesh, bug #790587
-REQUIRED_USE="
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-	test? ( ${TEST_DEPS} )
-"
-DEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	btpclient? ( >=dev-libs/ell-0.39 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.39
-		>=dev-libs/json-c-0.13:=
-		sys-libs/readline:0=
-	)
-	midi? ( media-libs/alsa-lib )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd )
-	>=sys-apps/dbus-1.6:=
-	udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	# https://bugs.gentoo.org/539844
-	# https://github.com/bluez/bluez/issues/268
-	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
-	# https://github.com/bluez/bluez/issues/267
-	"${FILESDIR}"/${PN}-5.63-musl-limits.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# https://github.com/bluez/bluez/issues/220
-	"${FILESDIR}"/0001-hog-Fix-read-order-of-attributes-rediffed.patch
-	"${FILESDIR}"/0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.patch
-)
-
-pkg_setup() {
-	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
-	# to prevent bugs like:
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
-		~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL"
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
-	if use mesh || use test; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
-		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC
-		~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS"
-	fi
-	linux-info_pkg_setup
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	if ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
-	fi
-
-	eautoreconf
-
-	if use cups; then
-		# Only not .am to not need to run eautoreconf only because of this
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable btpclient external-ell) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable mesh external-ell) \
-		$(multilib_native_use_enable midi) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev hid2hci) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also they can break without"
-			ewarn "previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			dobin tools/btmgmt
-			# gatttool is only built with readline, bug #530776
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
-			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
-			# https://bugs.archlinux.org/task/37686
-			dobin attrib/gatttool
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
-			dobin tools/avinfo
-		fi
-
-		# Not installed by default after being built, bug #666756
-		use btpclient && dobin tools/btpclient
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# Drop python2 only test tools
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
-
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-pkgincludeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	if use systemd; then
-		dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	# Setup auto enable as Fedora does for allowing to use
-	# keyboards/mouse as soon as possible
-	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
-	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	# Install .json files as examples to be used by meshctl
-	if use mesh; then
-		dodoc tools/mesh-gatt/*.json
-		local DOC_CONTENTS="Some example .json files were installed into
-		/usr/share/doc/${PF} to be used with meshctl. Feel free to
-		uncompress and copy them to ~/.config/meshctl to use them."
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
-	use mesh && readme.gentoo_print_elog
-}
diff --git a/net-wireless/bluez/bluez-5.64.ebuild b/net-wireless/bluez/bluez-5.64.ebuild
index 9b4e71de94ac..739c0968b690 100644
--- a/net-wireless/bluez/bluez-5.64.ebuild
+++ b/net-wireless/bluez/bluez-5.64.ebuild
@@ -20,6 +20,7 @@ IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +o
 # again in the future.
 # btpclient needs mesh, bug #790587
 REQUIRED_USE="
+	btpclient? ( mesh )
 	extra-tools? ( deprecated readline )
 	test? ( ${PYTHON_REQUIRED_USE} )
 	test-programs? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch b/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
deleted file mode 100644
index a8475b0c4273..000000000000
--- a/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 697866e210e4e2dce14c95f7a7243e9b9128d01f Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Sun, 7 Nov 2021 15:10:53 -0800
-Subject: [PATCH] Revert "attrib: Make use of bt_att_resend"
-
-This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
-causes problems with Logitech MX wireless input devices (see
-https://github.com/bluez/bluez/issues/220 and
-https://bugzilla.redhat.com/show_bug.cgi?id=2019970 ).
----
- attrib/gattrib.c | 95 +++++++++++++++++++++++++++++++++++++-----------
- 1 file changed, 73 insertions(+), 22 deletions(-)
-
-diff --git a/attrib/gattrib.c b/attrib/gattrib.c
-index 270a37ebe..bc7d4f22c 100644
---- a/attrib/gattrib.c
-+++ b/attrib/gattrib.c
-@@ -41,8 +41,13 @@ struct _GAttrib {
- 	struct queue *track_ids;
- };
- 
-+struct id_pair {
-+	unsigned int org_id;
-+	unsigned int pend_id;
-+};
-+
- struct attrib_callbacks {
--	unsigned int id;
-+	struct id_pair *id;
- 	GAttribResultFunc result_func;
- 	GAttribNotifyFunc notify_func;
- 	GDestroyNotify destroy_func;
-@@ -51,6 +56,32 @@ struct attrib_callbacks {
- 	uint16_t notify_handle;
- };
- 
-+static bool find_with_org_id(const void *data, const void *user_data)
-+{
-+	const struct id_pair *p = data;
-+	unsigned int orig_id = PTR_TO_UINT(user_data);
-+
-+	return (p->org_id == orig_id);
-+}
-+
-+static struct id_pair *store_id(GAttrib *attrib, unsigned int org_id,
-+							unsigned int pend_id)
-+{
-+	struct id_pair *t;
-+
-+	t = new0(struct id_pair, 1);
-+	if (!t)
-+		return NULL;
-+
-+	t->org_id = org_id;
-+	t->pend_id = pend_id;
-+
-+	if (queue_push_tail(attrib->track_ids, t))
-+		return t;
-+
-+	return NULL;
-+}
-+
- GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu, bool ext_signed)
- {
- 	gint fd;
-@@ -119,6 +150,9 @@ static void attrib_callbacks_destroy(void *data)
- 	if (cb->destroy_func)
- 		cb->destroy_func(cb->user_data);
- 
-+	if (queue_remove(cb->parent->track_ids, cb->id))
-+		free(cb->id);
-+
- 	free(data);
- }
- 
-@@ -148,7 +182,7 @@ void g_attrib_unref(GAttrib *attrib)
- 	bt_att_unref(attrib->att);
- 
- 	queue_destroy(attrib->callbacks, attrib_callbacks_destroy);
--	queue_destroy(attrib->track_ids, NULL);
-+	queue_destroy(attrib->track_ids, free);
- 
- 	free(attrib->buf);
- 
-@@ -261,6 +295,7 @@ guint g_attrib_send(GAttrib *attrib, guint id, const guint8 *pdu, guint16 len,
- 	struct attrib_callbacks *cb = NULL;
- 	bt_att_response_func_t response_cb = NULL;
- 	bt_att_destroy_func_t destroy_cb = NULL;
-+	unsigned int pend_id;
- 
- 	if (!attrib)
- 		return 0;
-@@ -282,47 +317,62 @@ guint g_attrib_send(GAttrib *attrib, guint id, const guint8 *pdu, guint16 len,
- 
- 	}
- 
--	if (id == 0)
--		id = bt_att_send(attrib->att, pdu[0], (void *) pdu + 1,
--					len - 1, response_cb, cb, destroy_cb);
--	else {
--		int err;
--
--		err = bt_att_resend(attrib->att, id, pdu[0], (void *) pdu + 1,
--					len - 1, response_cb, cb, destroy_cb);
--		if (err)
--			return 0;
--	}
-+	pend_id = bt_att_send(attrib->att, pdu[0], (void *) pdu + 1, len - 1,
-+						response_cb, cb, destroy_cb);
- 
--	if (!id)
--		return id;
-+	/*
-+	 * We store here pair as it is easier to handle it in response and in
-+	 * case where user request us to use specific id request - see below.
-+	 */
-+	if (id == 0)
-+		id = pend_id;
- 
- 	/*
- 	 * If user what us to use given id, lets keep track on that so we give
- 	 * user a possibility to cancel ongoing request.
- 	 */
--	if (cb) {
--		cb->id = id;
--		queue_push_tail(attrib->track_ids, UINT_TO_PTR(id));
--	}
-+	if (cb)
-+		cb->id = store_id(attrib, id, pend_id);
- 
- 	return id;
- }
- 
- gboolean g_attrib_cancel(GAttrib *attrib, guint id)
- {
-+	struct id_pair *p;
-+
- 	if (!attrib)
- 		return FALSE;
- 
-+	/*
-+	 * If request belongs to gattrib and is not yet done it has to be on
-+	 * the tracking id queue
-+	 *
-+	 * FIXME: It can happen that on the queue there is id_pair with
-+	 * given id which was provided by the user. In the same time it might
-+	 * happen that other attrib user got dynamic allocated req_id with same
-+	 * value as the one provided by the other user.
-+	 * In such case there are two clients having same request id and in
-+	 * this point of time we don't know which one calls cancel. For
-+	 * now we cancel request in which id was specified by the user.
-+	 */
-+	p = queue_remove_if(attrib->track_ids, find_with_org_id,
-+							UINT_TO_PTR(id));
-+	if (!p)
-+		return FALSE;
-+
-+	id = p->pend_id;
-+	free(p);
-+
- 	return bt_att_cancel(attrib->att, id);
- }
- 
- static void cancel_request(void *data, void *user_data)
- {
--	unsigned int id = PTR_TO_UINT(data);
-+	struct id_pair *p = data;
- 	GAttrib *attrib = user_data;
- 
--	bt_att_cancel(attrib->att, id);
-+	bt_att_cancel(attrib->att, p->pend_id);
- }
- 
- gboolean g_attrib_cancel_all(GAttrib *attrib)
-@@ -330,8 +380,9 @@ gboolean g_attrib_cancel_all(GAttrib *attrib)
- 	if (!attrib)
- 		return FALSE;
- 
-+	/* Cancel only request which belongs to gattrib */
- 	queue_foreach(attrib->track_ids, cancel_request, attrib);
--	queue_remove_all(attrib->track_ids, NULL, NULL, NULL);
-+	queue_remove_all(attrib->track_ids, NULL, NULL, free);
- 
- 	return TRUE;
- }
--- 
-2.33.1
-
diff --git a/net-wireless/bluez/files/0001-hog-Fix-read-order-of-attributes-rediffed.patch b/net-wireless/bluez/files/0001-hog-Fix-read-order-of-attributes-rediffed.patch
deleted file mode 100644
index cd6dc44b5d3e..000000000000
--- a/net-wireless/bluez/files/0001-hog-Fix-read-order-of-attributes-rediffed.patch
+++ /dev/null
@@ -1,542 +0,0 @@
-From 7fe38a17f6bee713fde587487fc224b0ae390e8f Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Mon, 10 Jan 2022 17:35:15 -0800
-Subject: [PATCH 1/2] hog: Fix read order of attributes
-
-The Report Map must be read after all other attributes otherwise the
-Kernel driver may start using UHID_SET_REPORT which requires the
-report->id to be known in order to resolve the attribute to send to.
-
-Fixes: https://github.com/bluez/bluez/issues/220
----
- profiles/input/hog-lib.c | 191 ++++++++++++++++++++++++---------------
- 1 file changed, 119 insertions(+), 72 deletions(-)
-
-diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
-index d37caa1f1..beb19af70 100644
---- a/profiles/input/hog-lib.c
-+++ b/profiles/input/hog-lib.c
-@@ -90,6 +90,7 @@ struct bt_hog {
- 	uint16_t		getrep_id;
- 	unsigned int		setrep_att;
- 	uint16_t		setrep_id;
-+	unsigned int		report_map_id;
- 	struct bt_scpp		*scpp;
- 	struct bt_dis		*dis;
- 	struct queue		*bas;
-@@ -146,13 +147,34 @@ static bool set_and_store_gatt_req(struct bt_hog *hog,
- 	return queue_push_head(hog->gatt_op, req);
- }
- 
--static void destroy_gatt_req(struct gatt_request *req)
-+static void destroy_gatt_req(void *data)
- {
--	queue_remove(req->hog->gatt_op, req);
-+	struct gatt_request *req = data;
-+
- 	bt_hog_unref(req->hog);
- 	free(req);
- }
- 
-+static void read_report_map(struct bt_hog *hog);
-+
-+static void remove_gatt_req(struct gatt_request *req, uint8_t status)
-+{
-+	struct bt_hog *hog = req->hog;
-+
-+	queue_remove(hog->gatt_op, req);
-+
-+	if (!status && queue_isempty(hog->gatt_op)) {
-+		/* Report Map must be read last since that can result
-+		 * in uhid being created and the driver may start to
-+		 * use UHID_SET_REPORT which requires the report->id to
-+		 * be known what attribute to send to.
-+		 */
-+		read_report_map(hog);
-+	}
-+
-+	destroy_gatt_req(req);
-+}
-+
- static void write_char(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
- 					const uint8_t *value, size_t vlen,
- 					GAttribResultFunc func,
-@@ -178,27 +200,31 @@ static void write_char(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
- 	}
- }
- 
--static void read_char(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
--				GAttribResultFunc func, gpointer user_data)
-+static unsigned int read_char(struct bt_hog *hog, GAttrib *attrib,
-+				uint16_t handle, GAttribResultFunc func,
-+				gpointer user_data)
- {
- 	struct gatt_request *req;
- 	unsigned int id;
- 
- 	req = create_request(hog, user_data);
- 	if (!req)
--		return;
-+		return 0;
- 
- 	id = gatt_read_char(attrib, handle, func, req);
- 	if (!id) {
- 		error("hog: Could not read char");
--		return;
-+		return 0;
- 	}
- 
- 	if (!set_and_store_gatt_req(hog, req, id)) {
- 		error("hog: Failed to queue read char req");
- 		g_attrib_cancel(attrib, id);
- 		free(req);
-+		return 0;
- 	}
-+
-+	return id;
- }
- 
- static void discover_desc(struct bt_hog *hog, GAttrib *attrib,
-@@ -343,16 +369,14 @@ static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
- 	struct report *report = req->user_data;
- 	struct bt_hog *hog = report->hog;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		error("Write report characteristic descriptor failed: %s",
- 							att_ecode2str(status));
--		return;
-+		goto remove;
- 	}
- 
- 	if (report->notifyid)
--		return;
-+		goto remove;
- 
- 	report->notifyid = g_attrib_register(hog->attrib,
- 					ATT_OP_HANDLE_NOTIFY,
-@@ -360,6 +384,9 @@ static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
- 					report_value_cb, report, NULL);
- 
- 	DBG("Report characteristic descriptor written: notifications enabled");
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static void write_ccc(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
-@@ -379,14 +406,15 @@ static void ccc_read_cb(guint8 status, const guint8 *pdu, guint16 len,
- 	struct gatt_request *req = user_data;
- 	struct report *report = req->user_data;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		error("Error reading CCC value: %s", att_ecode2str(status));
--		return;
-+		goto remove;
- 	}
- 
- 	write_ccc(report->hog, report->hog->attrib, report->ccc_handle, report);
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static const char *type_to_string(uint8_t type)
-@@ -409,17 +437,15 @@ static void report_reference_cb(guint8 status, const guint8 *pdu,
- 	struct gatt_request *req = user_data;
- 	struct report *report = req->user_data;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		error("Read Report Reference descriptor failed: %s",
- 							att_ecode2str(status));
--		return;
-+		goto remove;
- 	}
- 
- 	if (plen != 3) {
- 		error("Malformed ATT read response");
--		return;
-+		goto remove;
- 	}
- 
- 	report->id = pdu[1];
-@@ -432,6 +458,9 @@ static void report_reference_cb(guint8 status, const guint8 *pdu,
- 	if (report->type == HOG_REPORT_TYPE_INPUT)
- 		read_char(report->hog, report->hog->attrib, report->ccc_handle,
- 							ccc_read_cb, report);
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static void external_report_reference_cb(guint8 status, const guint8 *pdu,
-@@ -442,12 +471,10 @@ static void discover_external_cb(uint8_t status, GSList *descs, void *user_data)
- 	struct gatt_request *req = user_data;
- 	struct bt_hog *hog = req->user_data;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		error("Discover external descriptors failed: %s",
- 							att_ecode2str(status));
--		return;
-+		goto remove;
- 	}
- 
- 	for ( ; descs; descs = descs->next) {
-@@ -457,6 +484,9 @@ static void discover_external_cb(uint8_t status, GSList *descs, void *user_data)
- 						external_report_reference_cb,
- 						hog);
- 	}
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static void discover_external(struct bt_hog *hog, GAttrib *attrib,
-@@ -480,12 +510,10 @@ static void discover_report_cb(uint8_t status, GSList *descs, void *user_data)
- 	struct report *report = req->user_data;
- 	struct bt_hog *hog = report->hog;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		error("Discover report descriptors failed: %s",
- 							att_ecode2str(status));
--		return;
-+		goto remove;
- 	}
- 
- 	for ( ; descs; descs = descs->next) {
-@@ -501,6 +529,9 @@ static void discover_report_cb(uint8_t status, GSList *descs, void *user_data)
- 			break;
- 		}
- 	}
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static void discover_report(struct bt_hog *hog, GAttrib *attrib,
-@@ -519,11 +550,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len,
- 	struct gatt_request *req = user_data;
- 	struct report *report = req->user_data;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		error("Error reading Report value: %s", att_ecode2str(status));
--		return;
-+		goto remove;
- 	}
- 
- 	if (report->value)
-@@ -531,6 +560,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len,
- 
- 	report->value = g_memdup2(pdu, len);
- 	report->len = len;
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static int report_chrc_cmp(const void *data, const void *user_data)
-@@ -572,12 +604,11 @@ static void external_service_char_cb(uint8_t status, GSList *chars,
- 	struct report *report;
- 	GSList *l;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		const char *str = att_ecode2str(status);
-+
- 		DBG("Discover external service characteristic failed: %s", str);
--		return;
-+		goto remove;
- 	}
- 
- 	for (l = chars; l; l = g_slist_next(l)) {
-@@ -595,6 +626,9 @@ static void external_service_char_cb(uint8_t status, GSList *chars,
- 		end = (next ? next->handle - 1 : primary->range.end);
- 		discover_report(hog, hog->attrib, start, end, report);
- 	}
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static void external_report_reference_cb(guint8 status, const guint8 *pdu,
-@@ -605,17 +639,15 @@ static void external_report_reference_cb(guint8 status, const guint8 *pdu,
- 	uint16_t uuid16;
- 	bt_uuid_t uuid;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		error("Read External Report Reference descriptor failed: %s",
- 							att_ecode2str(status));
--		return;
-+		goto remove;
- 	}
- 
- 	if (plen != 3) {
- 		error("Malformed ATT read response");
--		return;
-+		goto remove;
- 	}
- 
- 	uuid16 = get_le16(&pdu[1]);
-@@ -624,11 +656,14 @@ static void external_report_reference_cb(guint8 status, const guint8 *pdu,
- 
- 	/* Do not discover if is not a Report */
- 	if (uuid16 != HOG_REPORT_UUID)
--		return;
-+		goto remove;
- 
- 	bt_uuid16_create(&uuid, uuid16);
- 	discover_char(hog, hog->attrib, 0x0001, 0xffff, &uuid,
- 					external_service_char_cb, hog);
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static int report_cmp(gconstpointer a, gconstpointer b)
-@@ -687,12 +722,10 @@ static void output_written_cb(guint8 status, const guint8 *pdu,
- {
- 	struct gatt_request *req = user_data;
- 
--	destroy_gatt_req(req);
--
--	if (status != 0) {
-+	if (status != 0)
- 		error("Write output report failed: %s", att_ecode2str(status));
--		return;
--	}
-+
-+	remove_gatt_req(req, status);
- }
- 
- static void forward_report(struct uhid_event *ev, void *user_data)
-@@ -1056,7 +1089,7 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
- 	uint8_t value[HOG_REPORT_MAP_MAX_SIZE];
- 	ssize_t vlen;
- 
--	destroy_gatt_req(req);
-+	remove_gatt_req(req, status);
- 
- 	DBG("HoG inspecting report map");
- 
-@@ -1081,6 +1114,19 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
- 	}
- }
- 
-+static void read_report_map(struct bt_hog *hog)
-+{
-+	uint16_t handle;
-+
-+	if (!hog->report_map_attr || hog->uhid_created || hog->report_map_id)
-+		return;
-+
-+	handle = gatt_db_attribute_get_handle(hog->report_map_attr);
-+
-+	hog->report_map_id = read_char(hog, hog->attrib, handle,
-+						report_map_read_cb, hog);
-+}
-+
- static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
- 							gpointer user_data)
- {
-@@ -1089,18 +1135,16 @@ static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
- 	uint8_t value[HID_INFO_SIZE];
- 	ssize_t vlen;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		error("HID Information read failed: %s",
- 						att_ecode2str(status));
--		return;
-+		goto remove;
- 	}
- 
- 	vlen = dec_read_resp(pdu, plen, value, sizeof(value));
- 	if (vlen != 4) {
- 		error("ATT protocol error");
--		return;
-+		goto remove;
- 	}
- 
- 	hog->bcdhid = get_le16(&value[0]);
-@@ -1109,6 +1153,9 @@ static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
- 
- 	DBG("bcdHID: 0x%04X bCountryCode: 0x%02X Flags: 0x%02X",
- 			hog->bcdhid, hog->bcountrycode, hog->flags);
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
-@@ -1119,18 +1166,16 @@ static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
- 	uint8_t value;
- 	ssize_t vlen;
- 
--	destroy_gatt_req(req);
--
- 	if (status != 0) {
- 		error("Protocol Mode characteristic read failed: %s",
- 							att_ecode2str(status));
--		return;
-+		goto remove;
- 	}
- 
- 	vlen = dec_read_resp(pdu, plen, &value, sizeof(value));
- 	if (vlen < 0) {
- 		error("ATT protocol error");
--		return;
-+		goto remove;
- 	}
- 
- 	if (value == HOG_PROTO_MODE_BOOT) {
-@@ -1142,6 +1187,9 @@ static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
- 						sizeof(nval), NULL, NULL);
- 	} else if (value == HOG_PROTO_MODE_REPORT)
- 		DBG("HoG is operating in Report Protocol Mode");
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static void char_discovered_cb(uint8_t status, GSList *chars, void *user_data)
-@@ -1155,14 +1203,12 @@ static void char_discovered_cb(uint8_t status, GSList *chars, void *user_data)
- 	GSList *l;
- 	uint16_t info_handle = 0, proto_mode_handle = 0;
- 
--	destroy_gatt_req(req);
--
- 	DBG("HoG inspecting characteristics");
- 
- 	if (status != 0) {
--		const char *str = att_ecode2str(status);
--		DBG("Discover all characteristics failed: %s", str);
--		return;
-+		DBG("Discover all characteristics failed: %s",
-+					att_ecode2str(status));
-+		goto remove;
- 	}
- 
- 	bt_uuid16_create(&report_uuid, HOG_REPORT_UUID);
-@@ -1211,6 +1257,9 @@ static void char_discovered_cb(uint8_t status, GSList *chars, void *user_data)
- 
- 	if (info_handle)
- 		read_char(hog, hog->attrib, info_handle, info_read_cb, hog);
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static void report_free(void *data)
-@@ -1221,10 +1270,12 @@ static void report_free(void *data)
- 	g_free(report);
- }
- 
--static void cancel_gatt_req(struct gatt_request *req)
-+static bool cancel_gatt_req(const void *data, const void *user_data)
- {
--	if (g_attrib_cancel(req->hog->attrib, req->id))
--		destroy_gatt_req(req);
-+	struct gatt_request *req = (void *) data;
-+	const struct bt_hog *hog = user_data;
-+
-+	return g_attrib_cancel(hog->attrib, req->id);
- }
- 
- static void hog_free(void *data)
-@@ -1386,13 +1437,9 @@ static void foreach_hog_chrc(struct gatt_db_attribute *attr, void *user_data)
- 			 * UHID to optimize reconnection.
- 			 */
- 			uhid_create(hog, report_map.value, report_map.length);
--		} else {
--			read_char(hog, hog->attrib, value_handle,
--						report_map_read_cb, hog);
- 		}
- 
- 		gatt_db_service_foreach_desc(attr, foreach_hog_external, hog);
--		return;
- 	}
- 
- 	bt_uuid16_create(&info_uuid, HOG_INFO_UUID);
-@@ -1552,12 +1599,9 @@ static void find_included_cb(uint8_t status, GSList *services, void *user_data)
- 
- 	DBG("");
- 
--	destroy_gatt_req(req);
--
- 	if (status) {
--		const char *str = att_ecode2str(status);
--		DBG("Find included failed: %s", str);
--		return;
-+		DBG("Find included failed: %s", att_ecode2str(status));
-+		goto remove;
- 	}
- 
- 	for (l = services; l; l = l->next) {
-@@ -1566,6 +1610,9 @@ static void find_included_cb(uint8_t status, GSList *services, void *user_data)
- 		DBG("included: handle %x, uuid %s",
- 			include->handle, include->uuid);
- 	}
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- static void hog_attach_scpp(struct bt_hog *hog, struct gatt_primary *primary)
-@@ -1640,17 +1687,14 @@ static void primary_cb(uint8_t status, GSList *services, void *user_data)
- 
- 	DBG("");
- 
--	destroy_gatt_req(req);
--
- 	if (status) {
--		const char *str = att_ecode2str(status);
--		DBG("Discover primary failed: %s", str);
--		return;
-+		DBG("Discover primary failed: %s", att_ecode2str(status));
-+		goto remove;
- 	}
- 
- 	if (!services) {
- 		DBG("No primary service found");
--		return;
-+		goto remove;
- 	}
- 
- 	for (l = services; l; l = l->next) {
-@@ -1674,6 +1718,9 @@ static void primary_cb(uint8_t status, GSList *services, void *user_data)
- 		if (strcmp(primary->uuid, HOG_UUID) == 0)
- 			hog_attach_hog(hog, primary);
- 	}
-+
-+remove:
-+	remove_gatt_req(req, status);
- }
- 
- bool bt_hog_attach(struct bt_hog *hog, void *gatt)
-@@ -1790,7 +1837,7 @@ void bt_hog_detach(struct bt_hog *hog)
- 	if (hog->dis)
- 		bt_dis_detach(hog->dis);
- 
--	queue_foreach(hog->gatt_op, (void *) cancel_gatt_req, NULL);
-+	queue_remove_all(hog->gatt_op, cancel_gatt_req, hog, destroy_gatt_req);
- 	g_attrib_unref(hog->attrib);
- 	hog->attrib = NULL;
- 	uhid_destroy(hog);
--- 
-2.34.1
-
diff --git a/net-wireless/bluez/files/0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.patch b/net-wireless/bluez/files/0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.patch
deleted file mode 100644
index f39775785f4a..000000000000
--- a/net-wireless/bluez/files/0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 33d13bbc5703185ab3f15e4429df324987f3f225 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Wed, 12 Jan 2022 14:07:36 -0800
-Subject: [PATCH 2/2] hog: Add input queue while uhid device has not been
- created
-
-Since report map is only read after all reports it is possible to start
-receiving notifications before uhid has been created, so this adds a
-queue to store the events while the report map is pending and once uhid
-has been created dequeue the events.
----
- profiles/input/hog-lib.c | 32 +++++++++++++++++++++++++++++---
- 1 file changed, 29 insertions(+), 3 deletions(-)
-
-diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
-index beb19af70..0b375feb8 100644
---- a/profiles/input/hog-lib.c
-+++ b/profiles/input/hog-lib.c
-@@ -98,6 +98,7 @@ struct bt_hog {
- 	struct queue		*gatt_op;
- 	struct gatt_db		*gatt_db;
- 	struct gatt_db_attribute	*report_map_attr;
-+	struct queue		*input;
- };
- 
- struct report_map {
-@@ -355,11 +356,18 @@ static void report_value_cb(const guint8 *pdu, guint16 len, gpointer user_data)
- 		ev.u.input.size = len;
- 	}
- 
--	err = bt_uhid_send(hog->uhid, &ev);
--	if (err < 0) {
--		error("bt_uhid_send: %s (%d)", strerror(-err), -err);
-+	/* If uhid had not been created yet queue up the input */
-+	if (!hog->uhid_created) {
-+		if (!hog->input)
-+			hog->input = queue_new();
-+
-+		queue_push_tail(hog->input, g_memdup(&ev, sizeof(ev)));
- 		return;
- 	}
-+
-+	err = bt_uhid_send(hog->uhid, &ev);
-+	if (err < 0)
-+		error("bt_uhid_send: %s (%d)", strerror(-err), -err);
- }
- 
- static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
-@@ -993,6 +1001,21 @@ static char *item2string(char *str, uint8_t *buf, uint8_t len)
- 	return str;
- }
- 
-+static bool input_dequeue(const void *data, const void *match_data)
-+{
-+	const struct uhid_event *ev = data;
-+	const struct bt_hog *hog = match_data;
-+	int err;
-+
-+	err = bt_uhid_send(hog->uhid, ev);
-+	if (err < 0) {
-+		error("bt_uhid_send: %s (%d)", strerror(-err), -err);
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
- static void uhid_create(struct bt_hog *hog, uint8_t *report_map,
- 							ssize_t report_map_len)
- {
-@@ -1072,6 +1095,8 @@ static void uhid_create(struct bt_hog *hog, uint8_t *report_map,
- 	hog->uhid_created = true;
- 
- 	DBG("HoG created uHID device");
-+
-+	queue_remove_all(hog->input, input_dequeue, hog, free);
- }
- 
- static void db_report_map_write_value_cb(struct gatt_db_attribute *attr,
-@@ -1284,6 +1309,7 @@ static void hog_free(void *data)
- 
- 	bt_hog_detach(hog);
- 
-+	queue_destroy(hog->input, free);
- 	queue_destroy(hog->bas, (void *) bt_bas_unref);
- 	g_slist_free_full(hog->instances, hog_free);
- 
--- 
-2.34.1
-
diff --git a/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch b/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch
deleted file mode 100644
index 8eff9dc006dd..000000000000
--- a/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ebf2d7935690c00c7fd12768177e2023fc63c9fe Mon Sep 17 00:00:00 2001
-From: Javier de San Pedro <dev.git@javispedro.com>
-Date: Sat, 27 Nov 2021 23:21:36 +0100
-Subject: gatt-client: Fix disconnecting due to GattCharacteristic1.MTU
-
-After the MTU dbus property patches in 5.62 we are seeing bluetoothd
-terminate frequently with "Disconnected from D-Bus. Exiting." msgs.
-Apparently this is because bluetoothd sent an invalid reply to a D-Bus
-Property Get (for GattCharacteristic1's MTU).
-Multiple issues in bluez Github.com project reported similar behavior;
-at least #235 (see Fixes:), #219, and likely #238.
-
-When the Characteristic1 object is still cached/alive, but the
-underlying att connection is not (e.g. someone just called Disconnect),
-the property getter (characteristic_get_mtu) right now returns false.
-However, gdbus seems to ignore the return value and sends the empty reply
-message anyway (rather than a dbus error?), and this seems to cause
-the dbus connection to be terminated (due to the ill-formed reply?).
-bluetoothd then aborts.
-
-This patch makes the property value BT_ATT_DEFAULT_LE_MTU if the
-underlying att object does not exist, rather than returning an invalid
-message. This is consistent with the existing PropertyChanged signal
-behavior (we will emit a PropertyChange only if a larger MTU is
-exchanged), and fixes the issue on my machines.
-An alternative could be to change gdbus behavior, but I'm not sure if we
-are allowed to return an error here anyway without causing problems in
-other dbus libraries/wrappers.
-
-Fixes: aaa0c4996ae9 ("gatt: Add implementation of GattCharacteristic1.MTU")
-Fixes: https://github.com/bluez/bluez/issues/235
----
- src/gatt-client.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/gatt-client.c b/src/gatt-client.c
-index de18bea97..6ee984db9 100644
---- a/src/gatt-client.c
-+++ b/src/gatt-client.c
-@@ -883,10 +883,7 @@ static gboolean characteristic_get_mtu(const GDBusPropertyTable *property,
- 	uint16_t mtu;
- 
- 	att = bt_gatt_client_get_att(gatt);
--	if (!att)
--		return FALSE;
--
--	mtu = bt_att_get_mtu(att);
-+	mtu = att ? bt_att_get_mtu(att) : BT_ATT_DEFAULT_LE_MTU;
- 
- 	dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &mtu);
- 
--- 
-cgit 1.2.3-1.el7
-
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index fa196461b0c8..ea7adae34945 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -7,5 +7,5 @@ AUX crda-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90
 AUX crda-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28
 AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9
 DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053
-EBUILD crda-4.14.ebuild 2124 BLAKE2B 0b714d079444e9085eaa04d1868c5dbdb8607a5788bd76e75f3cb001bd98fa91a5df47a0c10806cff8c4de0c0c8c16bfb35ef33386430731a30d414bb4bd386a SHA512 a11c73ffe7b3ca5b8448117d876bf5b31ca1e187d9c7c7aa2c485afe33a6b13e4f2dfcd0bdc324211860653b9a10f46bd7bddb60664d89b4c5e5f605e04532e9
+EBUILD crda-4.14.ebuild 2131 BLAKE2B cc2beca754ca3072ae140e1e29041bd7d223f6414dceff16f79b04e089fd52f7423c97a245ea8b268aabd7f4acef8de480fd59a95fdd540f1ef7f07d711afe86 SHA512 c766befe80d301f582e00e9e58de63a7bd489b3c666b7fdfc390ebfbc07c3f4572618b4307ec234fc1baff6b350fcc806a30e8cae06c8df0d4e58cfb1c378e92
 MISC metadata.xml 342 BLAKE2B 88aa38f713696271570968796b27533c0a990225592a4b553c4d1ff50528bce6bc5c96ab43998950b1391c42051eac0b7ed32eeb9b01458e4112ddfca56fbab7 SHA512 1775a84638c2ccdd1171d073603c2f0fa2d1248c1b2584ac25c26dd2eba0dc3af2800740253ca2083f10c11ad8763c4614cf73cdb695142dc75be79ea1c03675
diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild
index e74585491eaa..0ff7d90758b1 100644
--- a/net-wireless/crda/crda-4.14.ebuild
+++ b/net-wireless/crda/crda-4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapsho
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="gcrypt"
 
 RDEPEND="!gcrypt? (
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 7b3a27a5e0e5..a922bd8b5f2d 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -3,5 +3,5 @@ AUX gnome-bluetooth-3.34.5-meson-0.61-build.patch 549 BLAKE2B 85812555ab5cc25ae3
 DIST gnome-bluetooth-3.34.5.tar.xz 353936 BLAKE2B 40300752830f71d436591e22a64a282745d8419ee46de534f76c4871a86a4c8f7b2203e3ddc4ca08d26348b97bf4a68315802ffa09c69265c55001e4806c7f1e SHA512 48431b3d19083705a6623442c5cd2d6c14962cdf30fc599ba47dceb6612b80142af77e1b6df142b530cb1015638081a06de38a3034177e0d05a354c40f19d9e5
 DIST gnome-bluetooth-42.0.tar.xz 302440 BLAKE2B f7e02efe04b1dddee365b9c316368d92428099d6d1191d9c785018bc4bebc19942e7216bd7e6e824cd132a53b6750b1f41393d270e99718312c96da7f6a4ad5b SHA512 769bd9300fa1d830240e84257230425fe7f2e871cbd6c8fa6416514487a26326601a21c16075a66cf886850bab17f5c8e2235463f3695ea194c9230d6e50337c
 EBUILD gnome-bluetooth-3.34.5.ebuild 1825 BLAKE2B 01ee70a40f6557540488b40bf101908249ee29c6cfafcb2284fc944c79b18a43bf76f95f9d0ff7487cf7bdd1630947273cf888a53a2e580318ecc7cee929ca0c SHA512 6fed89c973b8deb3628112fa242974669b698c471bd5ea7f3db3c424c019bf31b51fb0da8c40fd7fe9a5e913845f8df740695e9cd1ba13f2fb38c826a555796a
-EBUILD gnome-bluetooth-42.0-r2.ebuild 1597 BLAKE2B ed961bb2b07c86964c3f3bd590639585cec60a1d3fb266a5c8cfcbae2d9671bc88f9df17f4d0b0ae8220857618085d1c3f9181db53892a9771e4b061ff6e8d77 SHA512 104c68a7c1477bf1d80de0f0d4fd7f0e07d0d1aac9ff78ba6804a6d7991a845ae43ce9658d61ce15222f5f7885da7944bd16cec68f7dd640df362b469063d9bd
+EBUILD gnome-bluetooth-42.0-r2.ebuild 1602 BLAKE2B f39841ad14ab1367dd1b934109a68e76cbfb78e64a53bfbf49b562fc983d119bc6d71c71ca2c617d8080aec32d7ca96d18a1afa6f6b3bfe9ba851d260592cf75 SHA512 58a5fa6460581c00790ddcbc00d3205e1fe03af2ffbe4efa6c290ee3a6573ef5d0b31c20340793b2704e723da2b6664212bcbf129139acf3781ace20acb3dcd5
 MISC metadata.xml 373 BLAKE2B 06ad2a850886ca86649105c60fc64b5e6eb56250669a4eaa50524b500c59a39db80db85cfb7a1be7386f97e60cb758848be389b2eb3cb0a8a4cf42a95eb36c81 SHA512 976a99db6d5b42b1b2a22c59a05f44f9e5a3fee093082778e67fad2fb910c49bc7783b81bb81a6b678457ad8c1f4c3b954a906ade7913057c00def44ca4b0d13
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild
index 7b73eda902ca..553891df97b2 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version
 IUSE="gtk-doc +introspection sendto test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 45a32573b35d..69e658d432bf 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,6 +1,6 @@
 DIST gnuradio-3.8.4.0.tar.gz 3395297 BLAKE2B 454724e61306bee4991f8a44c80963080b632f767cbb70e00ee518aa096f150a9bb5c29304b9c30a84ab537b8b19ccd2955806fadb88a6cc4d24a8531e8c0127 SHA512 80d34c6351947f45decf8ba09288d4fc4c411c8d286d2765fad59da421b99c15a4c7b7c25a17c89dacfafd872f13ba8d9a8d84d89a35568e5b088f77fcaaae67
 DIST gnuradio-3.8.5.0.tar.gz 3399660 BLAKE2B 19e3eecb40d7cdafe6fe551d3d36c0fcd34bb92ceb316537f4ebdc1c90d3c649daa1383f3642e2f64bba23026ed6638168fa77da0f21db03330b066e3108c880 SHA512 9b367c8afeb278b90e8ddd835e0ba301f07a53da26791e74913c812bde251daaa8f9611f21969938b215c9a110c9e69dfb6ec8b6d0db9c64013707c57596819a
 EBUILD gnuradio-3.8.4.0.ebuild 6115 BLAKE2B 95a4129cea2b525222a8cd998765337798aceb7cdf513ddea9d79a69287bb5b9d022121d9e19cc644515616de7f64828a93654ed4e42a39a6ac623a2f416e70a SHA512 00f69d0d140312ae462b26d7deddabd262c9958f76308f3c32b2cd27d418fcb1527cc969af5cf3c0ff6124fd5ce5021c8175b687c1f1881deff4265a872b7135
-EBUILD gnuradio-3.8.5.0.ebuild 6115 BLAKE2B 5c2cd9b17cad55ca4175894f15283cfc5e992b8147e86c0163886ccf70309c5ca0637af74f65ed374fc990f4fa97fe28e09d7f6ca3699e09be1694376c22940c SHA512 61d8e65ec1ba0da2801a2d42fe00d6ba166b4cd709059494dea84dca929de0f8119d69c68be73f6d7a6a6bdc47a26f7d3e7805769eb13c1d7f0721a11d943655
-EBUILD gnuradio-9999.ebuild 5975 BLAKE2B 3d259d0839b387e8b6674ab650f2bf28d588355bb5bf031d766e8822dfb172558b46a067bb41d06f237148c34363c5542462da81ae04e3558c01eebdcaa031c3 SHA512 99c648abd0df85acceecdc90b808c86854467470af0199115e8b414ff6b82b3b38fd23ed8b35f05d1007e6218cf3bc20dd33ae50215d58ad6a21d20178059922
+EBUILD gnuradio-3.8.5.0.ebuild 6122 BLAKE2B 92fb30d18eb3d954910ff31e8fc7a098f8551230fc9a7288fdf482ff343efd689fe61d0cc857b6dc07f03078f72f9b579c07a203bb50e0f7a4196e52ef635b1d SHA512 b784ab92e33db9d71744ae901964f202468ef17103b6c98cb87aacc8c11f6b43ebdf4cc67c426895292fa7264cbe2e4b2a1a591685fe17c07cc3451708bcf93d
+EBUILD gnuradio-9999.ebuild 5982 BLAKE2B 30f570a9020f7a0684168a83ade51dd024088fefcfbc7048a35f23f4a08a8e55ecf7c1f314741081a443e7239ec0e552ece489a8b1f85c641733e48f530801ad SHA512 3199d0147dfb15218524558d11eb61566e8b8f65b547c9eb0c42b7438f8c6aa751f24a1fa281336a3d0d4dbd2e27ab40c6688b038f7000fadacff668751e0f40
 MISC metadata.xml 1676 BLAKE2B 9dc4c025e09d54b083b7681f5a06e491375d9621fbb60d0a0b8c218da0e9a3d7cc557aaac86002984bf0b7dbc82848261d3ec0cceeb0cb35ebaed92675cea2a9 SHA512 e52efa5ac1bb1dc576b2802d581741c43622aabfac2133b1e3aefdcec671e2c67631f91c1322d22a4b315e1e12c006cc696dd97aa0f18ebace534cc249251b12
diff --git a/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
index 5251885bc66b..120d4741d37c 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
 IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 5b2de67aa006..c02ce48dcda1 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
 IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
diff --git a/net-wireless/gqrx-scanner/Manifest b/net-wireless/gqrx-scanner/Manifest
index 5af29bfb050f..cd66b01c5bc5 100644
--- a/net-wireless/gqrx-scanner/Manifest
+++ b/net-wireless/gqrx-scanner/Manifest
@@ -1,3 +1,3 @@
 DIST gqrx-scanner-1.0.2.tar.gz 18068 BLAKE2B e03a25cebe40d0a27c50ce0ae18303aea9b5b4b1a429a2026884e1731566fd198cdbf00e82ba4eb1487ad81c945399593f89e96a7d04777f87a4e26fe2fe5293 SHA512 a7f6b24154bf9355080df48dddb8ea4dbf7f145aed338973b7ba06584f8576ec691cb5c0e379750cbc91c572ca94e0edd4f4e8867866352a66b9aedf61d62dab
-EBUILD gqrx-scanner-1.0.2.ebuild 466 BLAKE2B 6d3f2de7410e7366060bd15cbc642dc49710b2848d51775f4dc81fc7f06df6702aafef7b4aadb1d75ff5bf436e73eb43403bccad13f150db4b2de0b8154473d2 SHA512 7d72374134337d27e700b8351fb57b4880036f7219e918125e20306333a62bad77e3109b074bad46cd7a03f6aeb1b02e8bce154308165799ad837499677fff6a
+EBUILD gqrx-scanner-1.0.2.ebuild 473 BLAKE2B 4ba850dc2a4c3124df1c6ddead90ef9b2efa201191f69db6a4ab3e17f2fe3c78dfe7c13a4a78a09f68925076d0b3f3c0bb53526a459753ebcf4e6b5fbbdefbf3 SHA512 395b9fff08556bf262f2d4153a87c79d4a98846531d4d7ad4c8bec3e143a8004b05850acce47b66081a81435411e03d8206b5349aa16d96f3aa57f191d175c73
 MISC metadata.xml 433 BLAKE2B dcdc101b5f5a92b9a418e8048907af457323f9635881020362bf6f922d682c59b9fa59533d03bfe404833b415d18d86bdbb5404199ff70b36968d095ad00dfc8 SHA512 a2dac81fb0aa2539a49d5a30ffbdfab12721139cc514825fa135a1f09be76c1948feeb78390fb17e4ec40b2bdae53e4b67f0d04100d759c5ae33aa2f37b4c45a
diff --git a/net-wireless/gqrx-scanner/gqrx-scanner-1.0.2.ebuild b/net-wireless/gqrx-scanner/gqrx-scanner-1.0.2.ebuild
index c81e152f8c17..e4ca6e9acf0a 100644
--- a/net-wireless/gqrx-scanner/gqrx-scanner-1.0.2.ebuild
+++ b/net-wireless/gqrx-scanner/gqrx-scanner-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/neural75/gqrx-scanner/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index 3b136cc2734f..c232f2d86e40 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,6 +1,6 @@
 DIST gqrx-2.14.6.tar.gz 1346684 BLAKE2B fd31692ad0dfcb3eaa3ea0ca8a9a26282ae45c290997b016f0a9f7e750969f42b2084619efd342da8c28d608da1cd3477c2c1cb6cc334f9d53f74dbff4e5d0c5 SHA512 d8019a6094da1f6d63eda08b9f22390dd638eb191910d911437e46f40d81087b3c68f3948ccb9060025a91cd1e1d4e1be42d92ccdf8869f5588ac7d428e5489d
 DIST gqrx-2.15.8.tar.gz 3608013 BLAKE2B 242ec9fd3c99bf683d030936d14c96170a3432f13059abca3ef7ab1863ca4af0651eb2429c0703a0dd649304edcc1dc6c1fdefb2e8e7a77db1b2bfafc4a15452 SHA512 1c9236b68a3e21e9b6a67e8034652e8a8b369a9c1d41a54bb5f1ba83c398b1b12beb7dae44660e6fb35aa4649d17ea6546d9f1e72766b36eda84390d15022e58
 EBUILD gqrx-2.14.6.ebuild 1246 BLAKE2B 42eced062a641a2bf3e31c75bdf8b9e59e0ec42e091a8ea8b9d61396ecb711cacf231e1f08150b37bde095e95621a471850c69ad0cd9479e0c6cd6e792715284 SHA512 0a3731e3b7b860e25dd131aac9ffac4d58b0cf359d35abf3e93390260de5ea3a6c34bd6dd2e90015fed3b91e14b2ddb2c39bbea692ba5f29e88ed83cd71b0166
-EBUILD gqrx-2.15.8.ebuild 1246 BLAKE2B 5d74e2d791e018716ed0dda253c0b5ee666c5bb0ee1295604b186896a8b86f547f383256009fa77cc9b8eda499e8434a6d414779538f436805c98a679bda2316 SHA512 63c10fc0ec6116287af824e53f5bcab590b0b57b5ef392e9efd3300a8c7398cacd4e25f8d8c145e36f0ad841a74bf50b672e4179be74621bbb118b13a08fd7e8
+EBUILD gqrx-2.15.8.ebuild 1253 BLAKE2B 399e2a7c5142a50f5aef5a5b804729fc8efe7a9e3f7b95fd2fc358c4982cf0c020754c8e4b21d9cc9614faec7f15579a9bae94e0809c214112564822417b6cd9 SHA512 f03566968a03003f99b88376654714e4e27aec43295da5b93c7f646f518b322a6ff5bb56df3323b47513136a5dc8decb52ab7eb9e822bf054c0c1f43e3a276d7
 EBUILD gqrx-9999.ebuild 1246 BLAKE2B 42eced062a641a2bf3e31c75bdf8b9e59e0ec42e091a8ea8b9d61396ecb711cacf231e1f08150b37bde095e95621a471850c69ad0cd9479e0c6cd6e792715284 SHA512 0a3731e3b7b860e25dd131aac9ffac4d58b0cf359d35abf3e93390260de5ea3a6c34bd6dd2e90015fed3b91e14b2ddb2c39bbea692ba5f29e88ed83cd71b0166
 MISC metadata.xml 524 BLAKE2B 256e6068104715ffd4e5527f33dbd1ec0f4d8de8b1251b657cdd3a6a7d37d0375d8771223b4f6ebed4c41bef7c1e7b47c835167c3aca9d89825fae72844c489e SHA512 43f31f14d30ecc93e9fd7e22f1160ff1416950af8acb4af346bfcb8f135f017d0bca0f4220efddaadd7976619f7ab594c9883b8d75651e06730a1e70c3ec362a
diff --git a/net-wireless/gqrx/gqrx-2.15.8.ebuild b/net-wireless/gqrx/gqrx-2.15.8.ebuild
index d10ac3615b95..ec213fc9569c 100644
--- a/net-wireless/gqrx/gqrx-2.15.8.ebuild
+++ b/net-wireless/gqrx/gqrx-2.15.8.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index 8937d0159ed2..2d3180352f48 100644
--- a/net-wireless/gr-iio/Manifest
+++ b/net-wireless/gr-iio/Manifest
@@ -1,4 +1,4 @@
 DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c
-EBUILD gr-iio-0.3_p20191219-r2.ebuild 974 BLAKE2B b8daeb7a7fae88b3744fb53e123e23ff191240d14c4c24f91ed96b3aae9c5a97b2260aefa7307927acc23923bac963ddbf7f1fbcf6179ef12b11034422e5b974 SHA512 ab8c215af7f8469eb105c688c113180208efe7a41a2012f4a8fbc0c83ec1451c43fef24158377fe81eb0c57f55f41b873080e53869bd672471bf67498feb07a8
+EBUILD gr-iio-0.3_p20191219-r2.ebuild 981 BLAKE2B 3223f88b14be84c406d2e70553e07fd7d54535684578c3ac87f8b142e06a82ebee1b73bbee2e20e696eea9e6cfd9ad0b977b37d18b589ecf70aa3708edd63be6 SHA512 269553d7d7a8fd5316a3eb01717c83ea8982c9013e2439513b7eb22722b02a6de1d52878937f56e95b091b563ecdced6d21a893d005e7d8d41759e456b51dc5f
 EBUILD gr-iio-9999.ebuild 974 BLAKE2B b8daeb7a7fae88b3744fb53e123e23ff191240d14c4c24f91ed96b3aae9c5a97b2260aefa7307927acc23923bac963ddbf7f1fbcf6179ef12b11034422e5b974 SHA512 ab8c215af7f8469eb105c688c113180208efe7a41a2012f4a8fbc0c83ec1451c43fef24158377fe81eb0c57f55f41b873080e53869bd672471bf67498feb07a8
 MISC metadata.xml 435 BLAKE2B 541339a320ccf46c904046c9abe9e56738ce09cab623028f1c487445f26a41554a5726918228a6cfbf063ee42511fbbb7ed6f8ce35dfe59e87ade0683810df4c SHA512 f8700542b8e51d8316ba5f5419dbf76934098c606c35e1157b8024eb67e022b63c43603f03a0f16705390c379b0198a585f0ff3a949e85d03dcb7abac60b76ed
diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
index 0f3c49b650fd..2765cad70f80 100644
--- a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
+++ b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ else
 	COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb"
 	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index c877b05685d8..a8648717569f 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,4 +1,4 @@
 DIST gr-iqbal-0.38.2.tar.gz 106408 BLAKE2B 8c9eb0880f527708cb304d9b70d0ab46c1f430aecf520366f85f3b74e1e1e2b612360cebc0dc9d6431f42adf2602baaaf1ebbe3b58ad08791d30f9604c96fd6c SHA512 39ca96769c3d7910c6ca7da973fdfbab816b45ec339adb5bbf32d07d2e967fb3e7265e907f9abbdf4e2b754dc03e9eac970c0cef3df4f07470ec4ba947900cb6
-EBUILD gr-iqbal-0.38.2.ebuild 864 BLAKE2B 34a69b437b28302e8fa7c112786911723102030fab3a7b925e3ed3c9dc0368c02df3651ea8f529ba2eb8ac2a4fe0f50784f267bf0f62ecec39fa2fb5da269467 SHA512 95eccb916663742d87c9f48552b6ebf96e4b162f3cdfc27d6a8f0c4cf979ac9b31cfd5149b1a12cceda857f0c7089159c21bdd91a15b3ce13e55ad40f37e7f57
+EBUILD gr-iqbal-0.38.2.ebuild 871 BLAKE2B 6394fe9a8c3ef048dd7d069fb32412691f949b080e262ab1dee388f7054c659c4997a49d30ac860c8c1b70bcaa05f3809c21ae5cb0baab23131e4af28e807c23 SHA512 932f379f9183ba166e8aa862ffa93cfbd75e9cf0603f7139841bff5dfb0685f6715222ee1afe53b924c811fd32035a48ef033c3a0150527fc9256a122bfdb321
 EBUILD gr-iqbal-9999.ebuild 864 BLAKE2B 34a69b437b28302e8fa7c112786911723102030fab3a7b925e3ed3c9dc0368c02df3651ea8f529ba2eb8ac2a4fe0f50784f267bf0f62ecec39fa2fb5da269467 SHA512 95eccb916663742d87c9f48552b6ebf96e4b162f3cdfc27d6a8f0c4cf979ac9b31cfd5149b1a12cceda857f0c7089159c21bdd91a15b3ce13e55ad40f37e7f57
 MISC metadata.xml 335 BLAKE2B 4a59f01a0e3aaf3293297ab368ff1438eb9d5e5bae3edfbbb1dd9f7191ccb47e9c504fa318a1a54752bbcf507f33c96d8808343f6f77a7de7a8c1fe1d84146ac SHA512 443b02d3f3aa162d3a176ffd081f6e0ff3bdd3276b48b817a03da2f43ab360b2db99add599f501ba1efcb47a12b30cf64587c5d307dc9c3583b46265150ba2d3
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild
index 9e73538bd42b..4a7b4327adeb 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
 else
 	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index be7b52777e81..93ba759393f8 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,5 +1,5 @@
 AUX gr-osmosdr-0.2.3-use_xtrx_open_string.patch 931 BLAKE2B 21df3d2ef163f7216ad8b34c86877b65b4909523bd80bf1d1a7ab86fa1676f777a49a670a456a2b4babdcbbee7063e6fd8b6a24a025b92d43632d580fa8ab329 SHA512 0d763dbbd510f273fbe937bf51a07cda2f2d9e53dcfdb64d210f3c85c51e6995223cf13d81d94b90dc7dc0fddde8fc8ea6f30d23b652edf8945fee08c494b1f0
 DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e
-EBUILD gr-osmosdr-0.2.3.ebuild 2121 BLAKE2B 6eb8e91b6c0b430885c76eb14c9b9bf70587be05708b7aff8f78301bae00896fcc783c88c36ef5e185172973d1412f5bbf29c76a9db4cfaa2fa1ce5aff1f394e SHA512 97b732c54da626e2e373e54e6f685563cfaf54b869c48d42fcecbd04666b46ece2fe7670721cb568366029861c7913d6867fd371c35a621309e088c7bb8a4c90
+EBUILD gr-osmosdr-0.2.3.ebuild 2128 BLAKE2B 699a1088e09444abd5a5f2810e2257d0d625d2fba39c0d40c03044c1c6f9ae3e7feb55235ba24673c6f570b899b57808fc6a7e6f3a1642c7f224e7c96b7652d8 SHA512 388b4beb0e70d5c6e5af6d68f3bf3d290cb5e514404d63e2a086664354f36a1d5d92b45c9b3774cd8a11b74712d0a35aca941e2f03b0345b52a3fbf99331667e
 EBUILD gr-osmosdr-9999.ebuild 2041 BLAKE2B b7db74e84655125c662912fa83cf89423d5195c950d888a4dfce0b941e05982d3bef69a8e2eaf976b510c664f3685258ba67f01b95c54e2695355307cca4878f SHA512 095675d49a45e32f95178ad909c61bf0f811ecf01c0889f2dfe0119fe0e66416f883e64af0451b5833d64267b76bf6f0ce46e996564441d5358b1e7ff165fde2
 MISC metadata.xml 897 BLAKE2B 9554d972990777bc9798fc121954e1cb85344926791f0a53c03934b2119698b7b7343adb8170ca7353311d717a4cedcd5d59f2e3de3339461a30b1358a52426a SHA512 10e388fa02cc40378c5f168f5b7ab52b323a3cdd8b12298193119c2afabc46353fe5adf402f6e8012a35b024828b1fdc0834c58d4b6a3aff8ae436808ebfbed5
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
index f7033fd6e361..700654075138 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
 else
 	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 724d82f6ab73..c2a518007894 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,19 +1,9 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
-DIST iwd-1.20.tar.xz 973964 BLAKE2B 750368aec999b988aaaed34454a1a15a75fa9c37ce4523715156c1bc89e343aad62c0d0f0ef5f798a75b19a271175f05517e641f3e2a6e502d932da8e1cfff63 SHA512 1a272492d101bd6ec22df16d98895ce03aa8470b35a7b3c36e5431239e519f74fae81f8bee25e52ce7705459b42e37298778f671a39e98787ddb1b9881521847
-DIST iwd-1.21.tar.xz 994644 BLAKE2B d8a12463f4f6e4b5f1840625b723fbffdd67df12092a9f945240751e40af7cf1d6cab4cba2e97f4fa628f902354bf76921238107c630c9fc4b35f451ccb7456c SHA512 420e4c1f9a7a0a11f6dedff5213d4b80671747ea3d24c4d492a843e3dd9813727127f4f0930588849d4aa6e6e1ca8f8434f0b07be7da50fdd0b2ab4156725389
-DIST iwd-1.22.tar.xz 994224 BLAKE2B 537f95409f31a56c6686d943664c640f086651c35a97bdb782d14011084e76ff13660cb14961e366eec7799144801fb2b38a606838ed9267eaa25d5a757ebfd7 SHA512 62393cda6687588c0a92537517a9e7aeba5f3ebc47f2ad962d5b2ca48b15229910b9ef2c6bae5e5edbac8c188304b4573db29a696af6bccc83a1f9bb5703dac2
-DIST iwd-1.23.tar.xz 994156 BLAKE2B ced2665153db55f71cf34ceec8fd2c6f0fbc9391a8f4d3bf45e88847b89b333b87be1a2c4302076df06f3adbd64ca4891383ea00767e7895ea9e940d375fb6cf SHA512 663530e8ef494d31aa99546c9fc5b0df11846e75445820d89cf6de70a71e1135ea194afd36094b8e831fbf3f9e46697792f078824498a06ba0a25ee891be88ea
-DIST iwd-1.24.tar.xz 994308 BLAKE2B e68644dee7c6827248743c2258e911f3559d9eb8b7fc989fc19d9043d8283ef833d2562b7ad53291fae1ad65660319e9bc3cd6415cc6304adfb1156fc4dc586a SHA512 51a90f64a798b752b61dbd14cea01c635d96446e026aee93c2f58e62f28af64fc9a87c9514a8446b8ac34cbacc5486ded1c0c6ef7ae1abdaac068951899219f7
-DIST iwd-1.25.tar.xz 1002636 BLAKE2B f87f95bb7560d87918b70b19310bc126a447ea272744d2d00cac695f95941579579d99d1de3f7decc67c40a1082be14a900d250f804de30bf827313546aa0d3a SHA512 e0ea2167524f015b4d5a66d25fe5d3ae960c7ed1494889db9d899c0aa78dec07fc87c2f5eb1d3e4a92227bffed73bccb67128ca77a17880998d10d429c089cc6
 DIST iwd-1.26.tar.xz 1005532 BLAKE2B 8e12ecdf77e6d6a99477605aa727609f55a652af2d1f3a028812d352ea8aef5465c6c6063a6f9ef92ce940a34c44ce7bf77dcd6895173422d984eb3e61636d72 SHA512 b3fc002ca1da4edaeaec88142226b978991fa93dc65b7a79057514a4eb88e620e08a9ea22b49f8efe6707dcd94dd556fbaafcee46de2de19ee9163bd9e95d197
-EBUILD iwd-1.20.ebuild 4935 BLAKE2B 928a2e49188357f14a99c6abe9c60046c8e0471382215791e7a020945ffa37e0dab11e3fbc50cc79b44aadbf2cf17d3f1730300b03c6297d7ad4d39002dd33f8 SHA512 f544d5276a5782cbcefd5221972bf2c0d17a3adfd8e917ea33116dc9a6da7061fb3e96a4d830a5d9be3e1a623e85f72a728f1aa1b53960bce32bfbfb52f895a2
-EBUILD iwd-1.21.ebuild 4941 BLAKE2B 3aef789bbbb76a0089b5b9fa0ccf3e82d552729c4adb32c8298c2b7cd037212c51ccf78a6557f15f0940b27642ca200b4d06cc20abf69c8773c88cc578b3ffcc SHA512 a16c1423b0d88ad605bc374e39afc293e16e2eee2be97491d95fc36781121979bc13420dc9960961807a3d6b48ccd6ad6adc0520f020d3be042ce79795173a8d
-EBUILD iwd-1.22.ebuild 4941 BLAKE2B d90c222d125aaab976bf187ca3861259c999e80d3612374b3d7de5db2d592f2e7b8805f0d1edff17b1b84c4ca959ac6d8bf09dc3082e30615606c41c55b543b4 SHA512 c90364e5bbe6f4d6ba097313d4f384c0f6005cdd0145f1356e1128d1b98def8e95ff9eee2d430f062e5f31493dc1925c3c7e15f156b7367a9a5378d98107eee5
-EBUILD iwd-1.23.ebuild 4941 BLAKE2B d90c222d125aaab976bf187ca3861259c999e80d3612374b3d7de5db2d592f2e7b8805f0d1edff17b1b84c4ca959ac6d8bf09dc3082e30615606c41c55b543b4 SHA512 c90364e5bbe6f4d6ba097313d4f384c0f6005cdd0145f1356e1128d1b98def8e95ff9eee2d430f062e5f31493dc1925c3c7e15f156b7367a9a5378d98107eee5
-EBUILD iwd-1.24.ebuild 4937 BLAKE2B 3de353e547f8ab26cc7f6ee5d8316127e6a2b0a6e0397ac54c08e378ba49bb1ee90dfd6ed7ec6e88ef1bc2acd9455ac311c78e5d470e4acadf5ac9045c7329cf SHA512 aefcb1251edd2892b01904b802bfdf4c97511443f9eaee39f1ee6f696613b6d9fce0f2c4e429f457ff9b38ed05051b7c7e40d1b923922d37967fc343e0c28209
-EBUILD iwd-1.25.ebuild 4941 BLAKE2B 1be948fa4fbcd32983ae7f9ab28e29b3dd6f38e10fbfe87a3513d9ced39684bbf16db4ffecfea78cf605eb5f80697a67431e2d32814de771e72bf06ab87a5686 SHA512 f30c54b06f7f188c3f2c40399a6040edf14b49a3620ca33a627ac3d200ac46e5c5e95f89e03f1d3a2f270e0f311ed806502658c6f3a50e0d5d1a81f951a6a17d
-EBUILD iwd-1.26.ebuild 4941 BLAKE2B 1be948fa4fbcd32983ae7f9ab28e29b3dd6f38e10fbfe87a3513d9ced39684bbf16db4ffecfea78cf605eb5f80697a67431e2d32814de771e72bf06ab87a5686 SHA512 f30c54b06f7f188c3f2c40399a6040edf14b49a3620ca33a627ac3d200ac46e5c5e95f89e03f1d3a2f270e0f311ed806502658c6f3a50e0d5d1a81f951a6a17d
+DIST iwd-1.27.tar.xz 1007432 BLAKE2B 0df0e5a8cec660521c44ae37102465bcc45e76805e65c76e48d6325b40484cd30d436db8c656d2f9bbd937c3f614de59d3a066642aa83f48002124bf334dbd62 SHA512 9027b20e22ae89a188b428eb84c5266ae242d8cfda452ad93db0cced8713d4f861dd1daf761632d4d2e9732d754db3a708d403a57f10c9ba3d76e23b7585f0c6
+EBUILD iwd-1.26.ebuild 4935 BLAKE2B 50bb7464e3d19a7ce3ba80e4b5bb4d81077199aeb31edb622cba6914334542282be1e3111b4c85b72a62f63b319be49a14b34ef9b502b211379ebb776a6966fd SHA512 bf690f5252bbbcfdade837263efb51cc4403714c2686b71917cf7ad2ef80e48173452ae5a80b849c0303a1e37de003b1dce9826a25f46c77b3cb11918a7a69d7
+EBUILD iwd-1.27.ebuild 4941 BLAKE2B cdd43051e2432e4375bd6135500239899f16cd4b4a114452b8206a2717027076f64a7bee24a04b39990d077082f0f310894b5e8a85e7e66b98b4ff49804eb991 SHA512 0bb10695cbf539fe5bdbed4f9def3602deec66dad9fbd3682aca8078651ee10c60eda64cf8b51853ac5380b1aec779d867a935c7184f3999a0a98402e26ca3fc
 EBUILD iwd-9999.ebuild 4937 BLAKE2B 3d6b12722babbfcc1a42faba7fe80fe7a30846b24c5ec45bf51031c0fee77b866f5a89ae89d5c0b812beeb52c776c0534f30792e6754ffa8f0e8d8dc1cafd821 SHA512 30e0ca29f9de87e99dfa36a0aa072c960feb81aeee3d4146f58a307733fd56ddd52b6bc6106eca53cf847c06bb19ed9be0b473abbc97d90e59f27ce1512bad90
 MISC metadata.xml 844 BLAKE2B a0745226f5314cee29c405d53b5f03c1e2706518272a69443174123601c4b79ad5902e2f22575b46bed37c5d6ebebd1ad4cdcccbb7c40405c4d04f2b92bef17d SHA512 9997101871ad37981492b0a70150d091926ec2321f13d70d5f85f2ff5d360cc87970beb9575c2f78a909e6f3a91ef022fd7115db9ec0ec77d5d94363ed30d793
diff --git a/net-wireless/iwd/iwd-1.20.ebuild b/net-wireless/iwd/iwd-1.20.ebuild
deleted file mode 100644
index 311a92a70d1c..000000000000
--- a/net-wireless/iwd/iwd-1.20.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.46"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-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 standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~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"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	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
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake ${MYRST2MAN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${MYRST2MAN} install
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		echo "[General]" > "${iwdconf}"
-		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
-		echo "[Network]" >> "${iwdconf}"
-		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.21.ebuild b/net-wireless/iwd/iwd-1.21.ebuild
deleted file mode 100644
index a53771ed5b53..000000000000
--- a/net-wireless/iwd/iwd-1.21.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.47"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-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 standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~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"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	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
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake ${MYRST2MAN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${MYRST2MAN} install
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		echo "[General]" > "${iwdconf}"
-		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
-		echo "[Network]" >> "${iwdconf}"
-		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.22.ebuild b/net-wireless/iwd/iwd-1.22.ebuild
deleted file mode 100644
index 4e45e6a7927a..000000000000
--- a/net-wireless/iwd/iwd-1.22.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.48"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-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 standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~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"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	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
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake ${MYRST2MAN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${MYRST2MAN} install
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		echo "[General]" > "${iwdconf}"
-		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
-		echo "[Network]" >> "${iwdconf}"
-		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.24.ebuild b/net-wireless/iwd/iwd-1.24.ebuild
deleted file mode 100644
index 5a37860c1b22..000000000000
--- a/net-wireless/iwd/iwd-1.24.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.48"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-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 standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~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"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	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
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake ${MYRST2MAN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${MYRST2MAN} install
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		echo "[General]" > "${iwdconf}"
-		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
-		echo "[Network]" >> "${iwdconf}"
-		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.25.ebuild b/net-wireless/iwd/iwd-1.25.ebuild
deleted file mode 100644
index 152ed689f93c..000000000000
--- a/net-wireless/iwd/iwd-1.25.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.49"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-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 standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~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"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	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
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake ${MYRST2MAN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${MYRST2MAN} install
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		echo "[General]" > "${iwdconf}"
-		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
-		echo "[Network]" >> "${iwdconf}"
-		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.26.ebuild b/net-wireless/iwd/iwd-1.26.ebuild
index 152ed689f93c..e1cea9837ac4 100644
--- a/net-wireless/iwd/iwd-1.26.ebuild
+++ b/net-wireless/iwd/iwd-1.26.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 	MYRST2MAN="RST2MAN=:"
 fi
 
diff --git a/net-wireless/iwd/iwd-1.23.ebuild b/net-wireless/iwd/iwd-1.27.ebuild
index 4e45e6a7927a..681a104a6cb0 100644
--- a/net-wireless/iwd/iwd-1.23.ebuild
+++ b/net-wireless/iwd/iwd-1.27.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.48"
+ELL_REQ="0.50"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
diff --git a/net-wireless/soapybladerf/Manifest b/net-wireless/soapybladerf/Manifest
index 7e949deb9e0a..7a0033d1cfbc 100644
--- a/net-wireless/soapybladerf/Manifest
+++ b/net-wireless/soapybladerf/Manifest
@@ -1,4 +1,4 @@
 DIST soapybladerf-0.4.1.tar.gz 29194 BLAKE2B 11b53c6d5f824ddd1704e852a220c88ca9f69e8d4024b11c936ae325c5c4b98198f32033ed1506402ef94b87a8f8b0a0d8cfaaa55ad4b6495fe79886f1cfb368 SHA512 73cd5c56b6f2faa37fb8eb8aca359061fd2da94fb081c1eb60f61894385f5f0175c9e3955835dc38478e513b0fd5a15fd100123be89e4ad62a0b7134557ab73e
-EBUILD soapybladerf-0.4.1.ebuild 642 BLAKE2B 6a0b5d28f3d3c7d9765ba927f2abe518072d049daf4bc079871f3c905604eb4405daccfe711aaf407748147e2257e3ac7c33ea450d1cf9b3d6938f4082fb9002 SHA512 ac86f93982f453cc7663a20180d7ceef6ece60f0839d7d98706c16fde61fd76fcf8d94741d615b4fa27e4f4e88559d97c3d0d3f809a503f56288274329fe0d65
+EBUILD soapybladerf-0.4.1.ebuild 649 BLAKE2B d97f0b9c9b06d1b8292b9f385deedcf0727d6c613cacb563882e471383120a8d395205255178df1357222a95a967de5a1614b1eb9ab79762f7d5eeb0ff141188 SHA512 e670c2573775af49182488bec1da9bcaa724a6f57509c5ed8149a20d8b5053e5e1ca9aa389c7b3f21561d3c5be8995aafa244b5a1b589e79ff5c22b018f2610a
 EBUILD soapybladerf-9999.ebuild 642 BLAKE2B 6a0b5d28f3d3c7d9765ba927f2abe518072d049daf4bc079871f3c905604eb4405daccfe711aaf407748147e2257e3ac7c33ea450d1cf9b3d6938f4082fb9002 SHA512 ac86f93982f453cc7663a20180d7ceef6ece60f0839d7d98706c16fde61fd76fcf8d94741d615b4fa27e4f4e88559d97c3d0d3f809a503f56288274329fe0d65
 MISC metadata.xml 435 BLAKE2B 278a6ea9c1c3cb771138ca3ab14900e2fd852612caceb469437319a594b21d70517888495f65848c96ceb8061d85428f4310635d6fe0091fa322e1dce7cc28f0 SHA512 89074ca4121effa82f24de237d7f1531f598ff0679172a60e129851c138c8b62ccb5c58ceab99cd6fb00b497c81fbcaa188255ecc86d0897c07f815b36362262
diff --git a/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild b/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild
index 6d0f42506d10..cbaf30d96b39 100644
--- a/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild
+++ b/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyBladeRF.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 	SRC_URI="https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/SoapyBladeRF-soapy-bladerf-"${PV}"
 fi
diff --git a/net-wireless/soapyhackrf/Manifest b/net-wireless/soapyhackrf/Manifest
index d50e1da8c8fe..b09e378c1e8e 100644
--- a/net-wireless/soapyhackrf/Manifest
+++ b/net-wireless/soapyhackrf/Manifest
@@ -1,4 +1,4 @@
 DIST soapyhackrf-0.3.3.tar.gz 15853 BLAKE2B 2e4c551add132e153033197ca6dc4762bac854d0959b524de7c65cdb0371ff862a52102868a1c9a5ad730c43d09730c2093666d186b79abe0d3d74e84b76a800 SHA512 d0e6ddbb8054b11bfb121a18e435c0f0c23290e5e29e89af83f660865e1c8adf4ed38082c96ab6a3cb68a50b7379f3fe5ef171616eccabe3f67d65b71d08dba9
-EBUILD soapyhackrf-0.3.3-r1.ebuild 613 BLAKE2B c7eef0fb47b42021aae944a808bdad85a4e2524060d2a2a597d3822c35d93539088ea19682dd91e1833317fb00d722dc3c3eb3887ec20ef51769a29000097564 SHA512 c2b654eabcefaabdb12a344f9307d164ecece09e380ba337c127bbecfe26946cc783b63977f1bbe88a23481ccb3e0b6b346fbd5ca3b4bdccdceb7af3ec800831
+EBUILD soapyhackrf-0.3.3-r1.ebuild 620 BLAKE2B 69d9e3980eae2137d48cebbb5c6fabf9d5b57678e3e637a09340d043947c524e28bbce9d80b4c7b935060a536c986797828b65ecda3b57465ca628ea3fa208fa SHA512 96177c1cbad8f63f31241fed048acd95599f8b85fe4a2ad52052d11e9e38156e2ac3695c7837d0ae25a7b4d206e291eab69919a8ff0cf5255a47d55c97d06374
 EBUILD soapyhackrf-9999.ebuild 613 BLAKE2B c7eef0fb47b42021aae944a808bdad85a4e2524060d2a2a597d3822c35d93539088ea19682dd91e1833317fb00d722dc3c3eb3887ec20ef51769a29000097564 SHA512 c2b654eabcefaabdb12a344f9307d164ecece09e380ba337c127bbecfe26946cc783b63977f1bbe88a23481ccb3e0b6b346fbd5ca3b4bdccdceb7af3ec800831
 MISC metadata.xml 434 BLAKE2B 9534c7462015a343cb39e7380cdb62017b06d0618fa96fbe50b5a96a64f7bc949a9df749ab1f2288bf182ae042569a09928884c8f7f74d7031d2d8ea9e3e01b7 SHA512 5a611857cb42ae495b505d9404b8407096af882a778feeee3b2dd1edd1c770619b48b2ff12bd1f8111aecc04c9ab20519bc94899c6cd7c1257cb1b17d79d17f9
diff --git a/net-wireless/soapyhackrf/soapyhackrf-0.3.3-r1.ebuild b/net-wireless/soapyhackrf/soapyhackrf-0.3.3-r1.ebuild
index 7f6aa51fbd67..9b6e41d1c592 100644
--- a/net-wireless/soapyhackrf/soapyhackrf-0.3.3-r1.ebuild
+++ b/net-wireless/soapyhackrf/soapyhackrf-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyHackRF.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 	SRC_URI="https://github.com/pothosware/SoapyHackRF/archive/soapy-hackrf-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/SoapyHackRF-soapy-hackrf-"${PV}"
 fi
diff --git a/net-wireless/soapyplutosdr/Manifest b/net-wireless/soapyplutosdr/Manifest
index d14fa7b35f5a..5baa173d9546 100644
--- a/net-wireless/soapyplutosdr/Manifest
+++ b/net-wireless/soapyplutosdr/Manifest
@@ -1,4 +1,4 @@
 DIST soapyplutosdr-0.2.1.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7
-EBUILD soapyplutosdr-0.2.1.ebuild 694 BLAKE2B bb660e8ae096cb669eed733ff1d5886a9593011210f4062d4e27094097c5b2e18f5835accf4d51fdba7ea1313bed2bc96f3e9484203d5e85eb07929a5521b7a1 SHA512 977669a650159eea1824304c7e721b28dff8f4fb97feec866ff77a91cd73046d1e06f1a4568073180e05dc5db90b0a098a1867b8e21b919ffb80866cea362731
+EBUILD soapyplutosdr-0.2.1.ebuild 701 BLAKE2B c315ff9944cf08e5605f7ba39ccbf130a77801d1da7ce4f96bd9a207fb12b22226400dd1726fa0d9bfbedf0bc80fbac4f50dbae07c4e7447bde12b7c932516d2 SHA512 b5cb9c7e6f39bdd3f83d7176be6df7b3f5ec377f62802b639d673e2b7cffe65603d47551d63697bb9d4c49d11464618a8d000dc9a55a2e47c840ca1487544d6e
 EBUILD soapyplutosdr-9999.ebuild 694 BLAKE2B bb660e8ae096cb669eed733ff1d5886a9593011210f4062d4e27094097c5b2e18f5835accf4d51fdba7ea1313bed2bc96f3e9484203d5e85eb07929a5521b7a1 SHA512 977669a650159eea1824304c7e721b28dff8f4fb97feec866ff77a91cd73046d1e06f1a4568073180e05dc5db90b0a098a1867b8e21b919ffb80866cea362731
 MISC metadata.xml 436 BLAKE2B 8fe11a2dba0dbe5997a3683a423f9227331ed3fca8fed8a690a8a36c5e4e57323052f100762cc2c8294d4e5c609ef5f90e0692ace5debe7a27a72a9f6ce29af8 SHA512 df17955f21c6565f21e33df9cbc4fdde9880de427a16329c45a5b2f738eb4dbfb998f709df06a7bb8b5501c26621e8f206bf9afe39a0808ff3d039e5bdd74a03
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-0.2.1.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.1.ebuild
index 813d3574f115..25bda885c613 100644
--- a/net-wireless/soapyplutosdr/soapyplutosdr-0.2.1.ebuild
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 	COMMIT="782650597b18f311cc97fbb7c6813539e6adef16"
 	SRC_URI="https://github.com/pothosware/SoapyPlutoSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/SoapyPlutoSDR-${COMMIT}
diff --git a/net-wireless/soapyrtlsdr/Manifest b/net-wireless/soapyrtlsdr/Manifest
index b384a006da3b..b5db31b3f04f 100644
--- a/net-wireless/soapyrtlsdr/Manifest
+++ b/net-wireless/soapyrtlsdr/Manifest
@@ -1,4 +1,4 @@
 DIST soapyrtlsdr-0.3.2.tar.gz 16033 BLAKE2B b3a874998f99d291c8e204007fe9822285a3e56b50b36957c8f1b14c48469050bc0775f9fd0237c8cfa96fa08e88967a438fa9eb8bec0a80016b212d3b309759 SHA512 f8279afebb251d72fea14d89889835be5ed8109c1400fdcc785c1ec120e978ae7b1de53cc84d16bf609de4cca2ddbc9d432d046e4c6967e1e494fd5571d46cc2
-EBUILD soapyrtlsdr-0.3.2.ebuild 624 BLAKE2B 78ddc1d7ccef84ec113d883554e84612c01c202d07b0f45f4cfb9c6c2f0614f877ed0555a9b39b83b4df0fd294497ea8ecc74e158c6d1f36d9bb823691fe426a SHA512 2b1c7fda3d50421f00a41afb897cbd2a16ad0726a20747beff8d14288854f975ee6676f1e0e9b80a402e9a218a1d56a4066202805c0b0bc5c0e7f70ca5ec33c2
+EBUILD soapyrtlsdr-0.3.2.ebuild 631 BLAKE2B 2f93ecae04b3016aaff01d46e8800db1e442df2d4fc317c46d289e3f06f0df371a401f5a6ea13ca5f6b1469c8be3e04c13dc41d45f65f4ad8c60aa77e6dc4a51 SHA512 3050912999c356c292f7c69560a362339d5eecd0aaa38d28517b64ed140bc3dd12efb9f367aa3c3821515f09edfa70d6c1357ca97c2d84dbd8daddfa5f48d150
 EBUILD soapyrtlsdr-9999.ebuild 624 BLAKE2B 78ddc1d7ccef84ec113d883554e84612c01c202d07b0f45f4cfb9c6c2f0614f877ed0555a9b39b83b4df0fd294497ea8ecc74e158c6d1f36d9bb823691fe426a SHA512 2b1c7fda3d50421f00a41afb897cbd2a16ad0726a20747beff8d14288854f975ee6676f1e0e9b80a402e9a218a1d56a4066202805c0b0bc5c0e7f70ca5ec33c2
 MISC metadata.xml 434 BLAKE2B 14d847d55378690a52555de7889f027d7e403157c5a002ee01a7b6588e19d613137dc224da4e33ed75d72f3a9ed99bee702dad9f8b12e664861437663ef83fc0 SHA512 2811652fe1f1f0c128e4398d227b20ebaf977d8b1cf7cd6d02044232e760a7eb808be7ccdd1566fb8deef597b6942aaa0f2d42213c7f117e86a9a00504b07fe1
diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.2.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.2.ebuild
index c69214fbee0c..a7f4afddc332 100644
--- a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.2.ebuild
+++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 	SRC_URI="https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtl-sdr-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/SoapyRTLSDR-soapy-rtl-sdr-"${PV}"
 fi
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
index 402eb27c9640..34cb2afd3c73 100644
--- a/net-wireless/soapysdr/Manifest
+++ b/net-wireless/soapysdr/Manifest
@@ -1,4 +1,4 @@
 DIST soapysdr-0.7.2.tar.gz 124607 BLAKE2B 534480574e2085bddea52141f26e0da8c70157e2c89a0af1236f3d1eb5b996d4ae5231cd209c610fc22d099bd9db665c4c7aea54081eeca2bb293b9eb1fe7c8e SHA512 2454b9b6bf4542f3bce2c6a8e1c886cee9179ca0e13e3c1e22817a05ef671428a3cb8fea69e496c8b62573f360c248508edf3d0871ec5063dfac8211b122d371
-EBUILD soapysdr-0.7.2.ebuild 1311 BLAKE2B 7ecf6db0f217bd6a8cbc28d538ec986d08dbfba0515394bdbf217ac0b8d8cf92a515d11075e2d591c37d7f834d40441ffee906cffca9a09f976acc1c72a716d1 SHA512 947208cd5c1e16964af2e1e45770a1bbe936f0b98b908098da90c561e3b1c377b5b7c33a0d6ce3fad4ec28fc7618b602e65781b3d19b42d916cf96a41b343536
+EBUILD soapysdr-0.7.2.ebuild 1318 BLAKE2B 03750eb08eca4dde8ff9f6b3f3a431a604967046ad2a0e88cc02457e8e6fc4cd66a9dde1a21e93669290af0a7b96107af51be6048cd3366451df8c0152d9ff82 SHA512 3614f12c92f50047c8ac854415c8043c801ea0904f42a9a7c4eab36f501a9c436ad85587a433bf1b9e465e415314997de10c875fbe3b0ebd1b8ed4a2663ed8a5
 EBUILD soapysdr-9999.ebuild 1311 BLAKE2B 7ecf6db0f217bd6a8cbc28d538ec986d08dbfba0515394bdbf217ac0b8d8cf92a515d11075e2d591c37d7f834d40441ffee906cffca9a09f976acc1c72a716d1 SHA512 947208cd5c1e16964af2e1e45770a1bbe936f0b98b908098da90c561e3b1c377b5b7c33a0d6ce3fad4ec28fc7618b602e65781b3d19b42d916cf96a41b343536
 MISC metadata.xml 776 BLAKE2B e875dbd46723cba190cfe767f7c91518bbd73269fdef3bc64a67b1b48145f2eeb1ba6acbf258b4e1e578ad7f77225d37662ab70cb83b345c1acecbae4a113931 SHA512 4f92020b725b79bcb55b0e4fcb2f921d01fc582e53b56c333b83a3f04c24630200b7d72d49ee9d3aaa12c887c861744a660c4f0240b3c2d0ade6f29830b74de0
diff --git a/net-wireless/soapysdr/soapysdr-0.7.2.ebuild b/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
index 0d446573c63d..f9ebcebd59f1 100644
--- a/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_CLONE_TYPE="shallow"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 	SRC_URI="https://github.com/pothosware/SoapySDR/archive/soapy-sdr-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/SoapySDR-soapy-sdr-"${PV}"
 fi
diff --git a/net-wireless/soapyuhd/Manifest b/net-wireless/soapyuhd/Manifest
index f6d0092e0cad..201aef439b63 100644
--- a/net-wireless/soapyuhd/Manifest
+++ b/net-wireless/soapyuhd/Manifest
@@ -1,4 +1,4 @@
 DIST soapyuhd-0.4.1.tar.gz 33838 BLAKE2B ee5639fda7213a7e3273c6bd27366a9d9f0e7d561655d316c19f055a008f31ed4362df945823bc3b5c159362ace9a7cc9fa7f943d2d128ba2b37047a71677352 SHA512 7a78ac386d92e4b36b36710f5943623ec8742cb770df69ac0c9bbd26827567277cb3309e3ad6eb0148b1b76083f16fdd188619700d38dcc5eab362b6db65340f
-EBUILD soapyuhd-0.4.1.ebuild 637 BLAKE2B eaeddb5bd24f659dee39a1699f8828e7b2a578308b6c02b544b9809f8ff4924b29f215c551469301d1ee69b379fbf1a954a5809ff50e7b1613c0f977e0dac0ea SHA512 6a725dcbbe5445cbb38ebcd4ac0fc50975f379f5dcbbd6cacc9be5b130904d683f852140d78460bc1abd04fdde6bd7572c51f9f8dbef23f5239580d0019d9a0d
+EBUILD soapyuhd-0.4.1.ebuild 644 BLAKE2B ad90872ce7f6b4a976d577627cb791ba6b56da73c392493c2bb58c4bf7088687661596493933de10c2406be0f21e85540c0a79e8bc846a13f32fb674e222ddf3 SHA512 227c9e855eecbf2aa97cb57986b81b68e9118da730d999d53ef3e332d14438b4fa3556a13005cf3985377c58767379a86d30d81875e15ca924e969cfb929b76a
 EBUILD soapyuhd-9999.ebuild 637 BLAKE2B eaeddb5bd24f659dee39a1699f8828e7b2a578308b6c02b544b9809f8ff4924b29f215c551469301d1ee69b379fbf1a954a5809ff50e7b1613c0f977e0dac0ea SHA512 6a725dcbbe5445cbb38ebcd4ac0fc50975f379f5dcbbd6cacc9be5b130904d683f852140d78460bc1abd04fdde6bd7572c51f9f8dbef23f5239580d0019d9a0d
 MISC metadata.xml 431 BLAKE2B 12571909a1964cdf9083b47c2fd60bc267515a2fb684b472c0d5d2a701ed2c1a204308f2ed2195e274442f1c979e9020a42ee7ebc573746bccee26c884fa0c67 SHA512 59b5211d71b99fa00edeb9deb38cad6c285e28f940422abd90022dfb334b7372312273fa6f53d47b4ed9e4da511505fbb8d5fe32f8c67add9689495b826b61ed
diff --git a/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild b/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild
index dba31a72d677..9e56c6865685 100644
--- a/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild
+++ b/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyUHD.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 	SRC_URI="https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/SoapyUHD-soapy-uhd-"${PV}"
 fi
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index a4606de7ccb7..fe15032683c7 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,5 +1,8 @@
 AUX uhd-4.1.0.5-hidden-visibility-tests.patch 870 BLAKE2B 97c7e1c477d57f32cd1ed8a4c96de5761f422719783c1da247c3d00a1ddf51087484b95daa57fd3a4a417c6227a5fe2de2d7d3637575a7a5cab83a243ae270bf SHA512 017ce990463d332a5a67853dcf6362063935b10af67083c88385ef5659694e3af765349b89663b9e0f95ccd11da43f690feddbf71faa7ddcc109344c41c9dd6c
 DIST EttusResearch-UHD-4.1.0.5.tar.gz 37975618 BLAKE2B ff5b38be7ef7088168f2bf8908e59e74d2f492a860dac6b7fef48abd5d25840435a57b3ef980ceb7416efd1d3520a3f83bace3bc5bca5caaecc14088e9609fcd SHA512 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af
+DIST EttusResearch-UHD-4.2.0.0.tar.gz 38124395 BLAKE2B cbb149e6f6aaff628e40463b37b3e52ee758acaaf8e86f85586a70fb4d9744408fb2c807a491b91de64a8cb23adb566722eece99eb8bd844e704d5412372b2ec SHA512 a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c
 DIST uhd-images_4.1.0.5.tar.xz 118480128 BLAKE2B 90803ca0a7452e601481837d006dbaf0eab57070d4fccfd0576a7a7736c11fa62caf9ea141be807a5c4d65ba2bb0f7a5361833ff2afb9f732f231b2bb659f08e SHA512 fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c
-EBUILD uhd-4.1.0.5.ebuild 3582 BLAKE2B 2ba95c7c53ecedd0d02be1b0d848b18c51f436de93133c43cbb4338f1f37e6b638843649ca1e4eb33a8715716aed8c7ec4689403c457b980b5119010a176d944 SHA512 5fcedf9d592b63a87df4244abb28f8cb5e6f5da1fbf8e1fa85a2e737fa4263840687636f702df97efd13899a93d779d5fded916a45cb9e6398db93b6ee36e358
+DIST uhd-images_4.2.0.0.tar.xz 127034940 BLAKE2B ab186ad83fe607c745a56862363a8cc0566450bffc90f070714b07124f1172d09a823fa7b74c7b7cd0fe42cd00d1f0178ed63b07a7959fd59ea5cde071c639fd SHA512 b3cee57b63137e074d370eed3d1c1533627a85cd3937103721d2f4ee322c6725a38be62cd737891193fa2b4c32f32cff372fadf4f75cb3cec3f9085cdc889c8f
+EBUILD uhd-4.1.0.5.ebuild 3566 BLAKE2B 45dc4989480875a6ebdc3afd3fdc955af2cb48cf44f80dfd45289d2404a1bea6b3d7993e4976809e0a0306080acccdb79b730fffe05fd77af94b479e970a38c7 SHA512 ff76a249133c92c8365ad9ea299c2a7fa935519cd0125b4389549eff522face5aaee660d59f127e4c11586d6f80231236f96921d1e091e96dbcc57b18165f019
+EBUILD uhd-4.2.0.0.ebuild 3435 BLAKE2B e69ade2b09003b2c446b455764d72689992e21f2d44cfb59f6ab527dd25b6f2f00c9f94548d5246f705a0a06133fa42b33ecff90942f53e999a00815b52a8b39 SHA512 9d0df399c441a769ba14deaf7295456405742f141f248221835f6a2bdf0d10787dc2c3c5d49b28c87d78e5f080615a3c67cd07b7cea7f62851d2855d3f88df16
 MISC metadata.xml 1160 BLAKE2B 0bcd5e0ea7008a4847cd0ec47e900eaad894c1b37f9917197ed408edb6525f3526fce2086fa318d66f9fe3a355a8a3d5b92dcdffd2518439fb4813f9cdec5b8a SHA512 b53864ec397c266c6c914c9d7bf44eb30187585fac7d5c871b54e91e7909186c756bcd49850343a28093e77148b506bbab5583834a0a125cefe9280c2e324c4d
diff --git a/net-wireless/uhd/uhd-4.1.0.5.ebuild b/net-wireless/uhd/uhd-4.1.0.5.ebuild
index 6d285be59c72..f77c3fbc8a83 100644
--- a/net-wireless/uhd/uhd-4.1.0.5.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit cmake gnome2-utils python-single-r1
+inherit cmake gnome2-utils python-single-r1 udev
 
 DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
 HOMEPAGE="https://kb.ettus.com"
@@ -103,8 +103,7 @@ src_install() {
 		rm -r "${ED}/usr/share/man/man1/uhd_images_downloader.1" || die
 	fi
 
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
+	udev_dorules "${S}/utils/uhd-usrp.rules"
 
 	rm -r "${WORKDIR}/images/winusb_driver" || die
 	if ! use b100; then
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
new file mode 100644
index 000000000000..cc43f7cef743
--- /dev/null
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake gnome2-utils python-single-r1 udev
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+			b100? ( usb )
+			b200? ( usb )
+			usrp1? ( usb )
+			usrp2? ( usb )
+			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+	e300? ( virtual/udev )
+	usb? ( virtual/libusb:1 )
+	dev-libs/boost:=
+	sys-libs/ncurses:0=
+	$(python_gen_cond_dep '
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+#zip an gzip are directly used by the build system
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	$(python_gen_cond_dep '
+	dev-python/mako[${PYTHON_USEDEP}]
+	')
+	app-arch/unzip
+	app-arch/gzip
+"
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+	default
+	mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	gnome2_environment_reset #534582
+}
+
+src_configure() {
+	#https://gitlab.kitware.com/cmake/cmake/-/issues/23236
+	#https://github.com/EttusResearch/uhd/pull/560
+	local mycmakeargs=(
+		-DCURSES_NEED_NCURSES=ON
+		-DENABLE_LIBUHD=ON
+		-DENABLE_C_API=ON
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MAN_PAGE_COMPRESSION=OFF
+		-DENABLE_EXAMPLES="$(usex examples)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_USB="$(usex usb)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DENABLE_MANUAL="$(usex doc)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_B100="$(usex b100)"
+		-DENABLE_B200="$(usex b200)"
+		-DENABLE_E300="$(usex e300)"
+		-DENABLE_USRP1="$(usex usrp1)"
+		-DENABLE_USRP2="$(usex usrp2)"
+		-DENABLE_X300="$(usex x300)"
+		-DENABLE_MPMD="$(usex mpmd)"
+		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+	if [[ "${PV}" != "9999" ]]; then
+		rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+	fi
+
+	udev_dorules "${S}/utils/uhd-usrp.rules"
+
+	rm -r "${WORKDIR}/images/winusb_driver" || die
+	if ! use b100; then
+		rm "${WORKDIR}"/images/usrp_b100* || die
+	fi
+	if ! use b200; then
+		rm "${WORKDIR}"/images/usrp_b2[01]* || die
+	fi
+	if ! use e300; then
+		rm "${WORKDIR}"/images/usrp_e3* || die
+	fi
+	if ! use mpmd; then
+		rm "${WORKDIR}"/images/usrp_n310* || die
+	fi
+	if ! use n230; then
+		rm "${WORKDIR}"/images/usrp_n230* || die
+	fi
+	if ! use octoclock; then
+		rm "${WORKDIR}"/images/octoclock* || die
+	fi
+	if ! use usrp1; then
+		rm "${WORKDIR}"/images/usrp1* || die
+	fi
+	if ! use usrp2; then
+		rm "${WORKDIR}"/images/usrp2* || die
+		rm "${WORKDIR}"/images/usrp_n2[01]* || die
+		rm -r "${WORKDIR}"/images/bit || die
+	fi
+	if ! use x300; then
+		rm "${WORKDIR}/"images/usrp_x3* || die
+	fi
+	insinto /usr/share/${PN}
+	doins -r "${WORKDIR}/images"
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index c3ab0e8c0d0a..ee172c2f22ea 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,8 +1,14 @@
+AUX README.gentoo 356 BLAKE2B 4e184bfc2426418517b33c7b912f31bf5a332c2b82aae9fa812066f0ddbf3b11f2f1678442025950f5bf97bb5a0c4732876dd9885f4e20b445fc72274726fbc8 SHA512 5b85fb837164f4c63cca2e71f07cf350ba2510e6be99a6c06425138dafcec438f206f91baee7ebce79b9ee2f0276e07786651f072054ba43280fe2a2ca9dc5b7
+AUX unifi-mongodb.initd 515 BLAKE2B 4df073b298afe169425b911a5bbb1b8b8c5a0c5f02b7024ff9663de977449039c6b498b3d65b9e5f61de1599eba9092de129ba09faacbcb292db473bc8d499b7 SHA512 08c6bd60d48123ebdf7fc6ea83cd1526ab13b8c247d847dbae6694f347483b4c086f265c21f9fbdb2477073a318e7ab685c7991b961ad7bf907f1992bef2f752
+AUX unifi-mongodb.service 274 BLAKE2B 116b78df7e3e595ebef25af3c4be425b8706356d0013be3dd051e09813393eea307cd23455b0511ba9296195f7fc3dd82ecc552609ac28f0d8cc2758705cdba5 SHA512 1f3ff7cc02bded03d8293cc4e368baea81e932c8ec7210363cbf76d2618485238e4713676130635add661d7b1ff5459cf72130954d2eaf5156b812932e42f3c8
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fafb4f5a5671edc522fb13872ec64c168173667cfc072cd0fde5fbaa236109a4c49947ddfd3fd429f SHA512 734aa8b93e057579470e59a287d68f219f510f73479add86d3bfc32d73ca495644d40d9323e2b00a448ee7b519f9a60d3150057c00398165108b572999e70b67
 AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60badef834d6f9ec250612ea5b32724c9df28c735e22183180c9c646729e375d3e38f6a26371661af93b SHA512 cafa67126e7416c736e1ab59e8b31cd2f9ce3f8933b84985f4ba983898b664bb892255855c2fc6cbdb4519732f63e58207209d7701f908d48828dfdd399f1550
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
 DIST unifi-7.0.25.zip 160864941 BLAKE2B b38f7894484485e0f61a08d9b822efb518078f7cd3cd9b2cf33d99c97b3e0c134279272804f2fd8591f21db7e289a9532f00b4b8d4e77b499330f3d689ec52e7 SHA512 2237a9e6cd97cc22c0a21ab89c11432f1f96f2d74b121cbebe63f2d5ab6ad4cc690b058c32f21774c5def28be7f927df98e45314ab145b1f19127da9beda9fc1
+DIST unifi-7.1.61.zip 201990493 BLAKE2B 970c9966a670bdc5c3c620a9189896fa3995b1e8541a164f7553e5c4629234aeb88c89e8348c65f147787c1b1d54e2fc06498e10c5e04604054204c113101a75 SHA512 1008711dd61c412a222aff1665ef5543a5537b541ca32ed35ffd34eec98d0c27a4e0b737d3a9b12be5d97bd45f391006878c726cd60fc4f5226fd557f972e0d0
 EBUILD unifi-6.5.55-r2.ebuild 2471 BLAKE2B 85ea582f14c30db8c8fa3f02057f8ed8c506338860b1c549ce7e2192423c4be8a087c19cdec05079731b8bfa045c63edc094e740b5ad7b0fe987635319aac7b5 SHA512 395d780fa97045cadebc193ef391576c5def6f06413940857902e792b5a39dceb93f7ee8a8b2d8162df395c132bdb89490460d2fa69191f6b87cf9282b6e7f7b
-EBUILD unifi-7.0.25-r2.ebuild 2472 BLAKE2B 3d83df8b92b77f2d0014cdab28acf6f8ecd59bd07025dd5b18974c31cf0f7a52eb04b00fd64184085f4750737606a65a2db19e62f305f76f5a99eb2f5d73890e SHA512 8e8faa25ba0f99d7bb1c48bc66c4bd6102708c3484ae9507db0a434b44ce7622aec3c644838ee22a9aab504904d62906e23f53b170237f65f53f95b7a0905289
-MISC metadata.xml 579 BLAKE2B 4c18ad9f1d440c5d2fcb1460666ba738b04108d14f30d47b046213412ad324e6d942971959b98f8eaad08485fef2e441d89cc5b77e3a6696f8f339e7822b9f1b SHA512 6a562914d527a80b5737b1e121f21a71b086612b876274b38bbf6ceeb2aee94983327c84c23ffaf7a738cce0cd20f16581c0b99f5448105269302a1ebc3b8c3c
+EBUILD unifi-7.0.25-r2.ebuild 2471 BLAKE2B d916bd9ec02cb7d2c729d5ca69d9eb6130796b4c0acb01b00dee6163a58880ca0c71ddea54614acb40a2535ea9ff30795cded16ff6746494227300fe1755f8e5 SHA512 5abb1a19700b56d1507280e1f9775dcbdee4a15dc04e5c0215827cb15bc35615bfdfafdf3e35f226c62f4e1743a6fd5d1b8ebe30bb6413cb674f7269a0760757
+EBUILD unifi-7.1.61-r1.ebuild 2770 BLAKE2B 478aeed3129bc21e095e3af3e3aa14a63f6de384aa1dc53b74728e80ab1a34cd7ad24a3ffc8088fde457a25eb5508ae4c04fc15d6e22f2d3e9c7a02882350aa9 SHA512 520c0475921bc736d506d40217e89a88105c6fcd9981e861ef075a3781eff74956885c7577983dcedef4b52c6d9b85a1a24a3c0c69497337f74a32e2399debdc
+EBUILD unifi-7.1.61.ebuild 2472 BLAKE2B 79b89d8e3ef90795294f33612814059ea508a058d43a21e585ba7191de24a7946ef85dc8bef5279055acad0fde6b6787c21518d7f3401b44f8c9890270830a43 SHA512 8453423b0d9ea9e035734913d1905bce3bc0dd83159e64ee1c5b7bc87955a717518a765a11ce00ffc983e43e80ff19c3581a88146fe5c1cb1be48c7916f5d469
+MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/files/README.gentoo b/net-wireless/unifi/files/README.gentoo
new file mode 100644
index 000000000000..b6284b3017ea
--- /dev/null
+++ b/net-wireless/unifi/files/README.gentoo
@@ -0,0 +1,11 @@
+System MongoDB
+==============
+
+If you want using the system-mongodb systemd service instead of the started
+mongodb from the unifi service please add to
+"var/lib/unifi/data/system.properties" the following properties:
+
+db.mongo.local=false
+db.mongo.uri=mongodb\://127.0.0.1\:27017/ace
+statdb.mongo.uri=mongodb\://127.0.0.1\:27017/ace_stat
+unifi.db.name=ace
diff --git a/net-wireless/unifi/files/unifi-mongodb.initd b/net-wireless/unifi/files/unifi-mongodb.initd
new file mode 100644
index 000000000000..fb55027eb149
--- /dev/null
+++ b/net-wireless/unifi/files/unifi-mongodb.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+unifi_exec="/usr/bin/unifi"
+unifi_path="/usr/lib/unifi"
+
+unifi_user="unifi"
+unifi_group="unifi"
+
+name="UniFi Controller"
+
+start_stop_daemon_args="--chdir ${unifi_path}"
+
+command="${unifi_exec}"
+command_args="start"
+command_background=true
+command_progress=true
+command_user="${unifi_user}:${unifi_group}"
+
+pidfile="/run/${RC_SVCNAME}.pid"
+retry=TERM/60
+
+rc_after="mongodb"
+rc_need="mongodb"
diff --git a/net-wireless/unifi/files/unifi-mongodb.service b/net-wireless/unifi/files/unifi-mongodb.service
new file mode 100644
index 000000000000..6d9b9d55ee2e
--- /dev/null
+++ b/net-wireless/unifi/files/unifi-mongodb.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=UniFi Controller
+After=mongodb.service network.target
+Requires=mongodb.service
+
+[Service]
+Type=simple
+User=unifi
+Group=unifi
+WorkingDirectory=/usr/lib/unifi
+ExecStart=/usr/bin/unifi start
+ExecStop=/usr/bin/unifi stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-wireless/unifi/metadata.xml b/net-wireless/unifi/metadata.xml
index d81a3fef9a30..4835f95389c4 100644
--- a/net-wireless/unifi/metadata.xml
+++ b/net-wireless/unifi/metadata.xml
@@ -11,4 +11,7 @@
 		Also all kind of statistics are collected, which can be accessed through UniFi.
 		There is also an internal RADIUS server, which can be used for WPA2-Enterprise.
 	</longdescription>
+	<use>
+		<flag name="system-mongodb">Using <pkg>dev-db/mongodb</pkg> systemd service instead of the bundled one</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-wireless/unifi/unifi-7.0.25-r2.ebuild b/net-wireless/unifi/unifi-7.0.25-r2.ebuild
index 3466b4b1d3b2..88d448766424 100644
--- a/net-wireless/unifi/unifi-7.0.25-r2.ebuild
+++ b/net-wireless/unifi/unifi-7.0.25-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 S="${WORKDIR}/UniFi"
 
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-7.1.61-r1.ebuild b/net-wireless/unifi/unifi-7.1.61-r1.ebuild
new file mode 100644
index 000000000000..1db40a1dd013
--- /dev/null
+++ b/net-wireless/unifi/unifi-7.1.61-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set this var for any releases except stable
+RC_SUFFIX="-c7eb1400e2"
+
+inherit java-pkg-2 readme.gentoo-r1 systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+S="${WORKDIR}/UniFi"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd system-mongodb"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Mac and Windows
+	rm -r lib/native/{Mac,Windows} || die
+
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
+	fi
+	if [[ ${CHOST} != armv7* ]]; then
+		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == armv7* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+	! use system-mongodb && doins -r bin
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
+	java-pkg_dolauncher unifi --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' --jar ace.jar --pwd '/usr/lib/unifi'
+
+	if use system-mongodb; then
+		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
+		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
+	else
+		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
+		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
+	fi
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-wireless/unifi/unifi-7.1.61.ebuild b/net-wireless/unifi/unifi-7.1.61.ebuild
new file mode 100644
index 000000000000..381eb27e03dd
--- /dev/null
+++ b/net-wireless/unifi/unifi-7.1.61.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set this var for any releases except stable
+RC_SUFFIX="-c7eb1400e2"
+
+inherit java-pkg-2 systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+S="${WORKDIR}/UniFi"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Mac and Windows
+	rm -r lib/native/{Mac,Windows} || die
+
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
+	fi
+	if [[ ${CHOST} != armv7* ]]; then
+		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == armv7* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
+	java-pkg_dolauncher unifi --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' --jar ace.jar --pwd '/usr/lib/unifi'
+
+	newinitd "${FILESDIR}"/unifi.initd-r2 unifi
+	systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index e85e16896c13..381009d1657a 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -3,5 +3,5 @@ DIST wireless-regdb-2022.02.18.tar.xz 25908 BLAKE2B 1237537a5d9ed249cc53b838b65e
 DIST wireless-regdb-2022.04.08.tar.xz 26308 BLAKE2B 30d3be06709c9dac3c034ded733f24a2261be06adfb9723cfb5bfec79439b89383be8b2d2acb41ea98c2138532b227b8fc14ba92512fa40b61ae7c3294d9a284 SHA512 328ccd6df67241faf03674820e4f799572764af580254b3aa4c834a9535a2732d303bcfe3ce503404f608074849424f1f8599b0f567dc00d7393dbcff7f07cf8
 EBUILD wireless-regdb-20210421.ebuild 1092 BLAKE2B 903e8f7006cc68a0db74946817b0feb50a892a7bcfadccd089007d8675a192bdb3bbf5425eb93cd9a944f609a8c1536077c7b037879ea51b6fdd0ad765ab96d3 SHA512 f18b62524a6605b58df9cd4d30e856ebf45a9148ef8d2a53f76481412b7e832a8c956ed10ba6dd62af469e5f97ff6bcca9de5b7e369108f7460cb956de98da61
 EBUILD wireless-regdb-20220218.ebuild 1092 BLAKE2B 5a8e4d26468e69a0901fd938bf6681afb86d50c74af038afb57fd992db0359bc748e24bbcb3e2d9997300df62cdaf83a6aff9d73435f1938f1dd84e93947c992 SHA512 849fa96f1cc4ebfe66604af7ab1647846bc9f45c2c4056dbe278c42e9e003a694aad4c6ed0de366e4ca996a18e3cadcece569516f0d5a2cc705130c189b2c4cb
-EBUILD wireless-regdb-20220408.ebuild 1092 BLAKE2B 5a8e4d26468e69a0901fd938bf6681afb86d50c74af038afb57fd992db0359bc748e24bbcb3e2d9997300df62cdaf83a6aff9d73435f1938f1dd84e93947c992 SHA512 849fa96f1cc4ebfe66604af7ab1647846bc9f45c2c4056dbe278c42e9e003a694aad4c6ed0de366e4ca996a18e3cadcece569516f0d5a2cc705130c189b2c4cb
+EBUILD wireless-regdb-20220408.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db
 MISC metadata.xml 272 BLAKE2B 2a42142ca287ab19668cc11278dac4d0f16bf5b183646b0f06317a6e60568d9328d42baa986af6c692a256b28fdef32f24442faf69ae9b8305d625a3265df298 SHA512 4595277c33cd3d565c652cae1644c4ba131dea25899984629a48dc9a679441c95a7d26527c6fe4578a3e6f616e6f8c25580ee9f785fdcbd699bd43bacd846dd3
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild
index 050550bee28b..3f15ef755143 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+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."
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index b5751ec95996..c1ff7ca3d097 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -4,6 +4,6 @@ AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f64
 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-r1.ebuild 12638 BLAKE2B 06f09ea1018674c498e7c34a083e1aa5c59ebf5334434f1baa1024a19b924208a054cb96b3260a0fc9c2a6cf6bd07f24615d2259e44f34ffe2f27b304e8b0313 SHA512 cbe2f62ba221757f704d0d38f46e6ccc27f637bb8e14a64c6ca341df315012f6ef34fef302f5941ba88a6532f229b184864e0a2f3f8af037b70be2e08381610d
-EBUILD wpa_supplicant-9999.ebuild 12644 BLAKE2B 9d1f49d1944419ab19c7c25744b9d53c281c47955d0541e11fc087349214ed8a111775a692761bed50854eabbf16023a22470d8e754f8d9f38257a9a43533552 SHA512 1b19f8d84799a894bdd5c5943b7b6271545e78d12d63d36b22c4aa6ee8e2b96a10aec286709900797422080d56accd292da7c290f72c12af456286048fedce43
+EBUILD wpa_supplicant-2.10-r1.ebuild 12645 BLAKE2B e2a3495ac110d3538661c397adeea7b36185283914d9b0a630f468dc394e9ae00f27a290365b9f0ddc380c550da727701613479685438eb7586a3d2e14576bf4 SHA512 0fa97f2d5137aa629c112886ba7e7099566c578d46d66ec386d4076f90fbbec0c2ad69e271cd18c99e50766c515ccfc9c7c22e3b041f641b7f6d4659ebfe1881
+EBUILD wpa_supplicant-9999.ebuild 12651 BLAKE2B 954981209e7e68210650dd5904bd7fdcffac5d5537a4e7c4975f4cd0f10c0d65ad7fe6e374f556f0a2895565ac6480cadaba0ef1df567c7a4c8cb20d0f17eed1 SHA512 13f79a34f8c547a7f94370adc5a763675db0df015d2fd7ffaef8fbf03d9da0628d964678f6e1207f4a57a633127fd0cce09e01bfa48a14e2cdb6d12054e2ef44
 MISC metadata.xml 1959 BLAKE2B 0f5445382157d69d59ecd66b601ba8c1bc5049a6b0c63cc2de84ac25752d3cfc3bd84d52f5ed3a21f2256e1360af21f58fc750f2df6853e1c8df6b0a35f74ae0 SHA512 9adb7d9d19beaec1662ad44450c84f850598726c05739f5b76f55387739466be26d9f983317580b9543b85b2614c1e0d138c5beabc0b8d7ddda4c60a4f9d3884
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
index 0430cf11a777..b7a623182f1f 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index d0aba4022747..abd50f99a8df 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi