15 files changed, 200 insertions, 153 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index bd34f56f6d93..3a931f021424 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 987eb2bd2194..10df9f47a05d 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -2,6 +2,6 @@ AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db7
 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 2995 BLAKE2B a0bd88c70fb1eddc6a00ebc7948a0a48610ad28f743e420bdd09790fcfdb883c99d780ac9fb29a918ef409ac67ec02c8206a18f66fbf42adf7713d1353d24d39 SHA512 e1b045eabd8b17776a5984376cfc3890723d699fda38005a7c5dd27d9850005403820442a28d906528cc662d73b246d6cd134314a4e5513158ea8348c1f2d80c
-EBUILD blueman-9999.ebuild 2988 BLAKE2B 4a25165e3c62bc0abff00d937dd9bcc0dde7ab9bf315ba9763fb827d1dbdba8d0c28e5bbb1614a55d9c3fa76c36e90100ee617c5f98aa8702cebd1588e5d3ac8 SHA512 a35a3639be307edd0df2b3a9cf1f101941953561e04fa71d24960b9edf8a07e67ab8c23e07286cb290e1906143a9f58c6a15d4b7487eba8034be6572fefb2004
+EBUILD blueman-2.2.3-r2.ebuild 2977 BLAKE2B 72d5b1d9c8454f281da76ad4bc368e39c66edbbb1a98d1f31feb7b1370bc7ffc5723fbca400a7b96f0d09bf0e639e93440e8979f666a7dfe59233145aba9ad57 SHA512 09a067b43613edd5b156f363bdd838d5a9c4f623899d622992fdd3f9450b5b0ef1adaff34a564ef323c22a09e3215bfeb77ce697447e668a82c10f1fc312005c
+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.3-r2.ebuild b/net-wireless/blueman/blueman-2.2.3-r2.ebuild
index d76266468173..24a8732bed40 100644
--- a/net-wireless/blueman/blueman-2.2.3-r2.ebuild
+++ b/net-wireless/blueman/blueman-2.2.3-r2.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 		dev-python/cython[${PYTHON_USEDEP}]
 	')
 	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
+	nls? ( sys-devel/gettext )"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/pycairo[${PYTHON_USEDEP}]
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 93256bfb360b..090a7032ac19 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 		dev-python/cython[${PYTHON_USEDEP}]
 	')
 	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
+	nls? ( sys-devel/gettext )"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/pycairo[${PYTHON_USEDEP}]
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index a66a43605635..e90936aa650e 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -7,12 +7,12 @@ AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7
 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-5.63-use-queue_push_tail.patch 938 BLAKE2B 2fc40087e8b362a331e0df9ba4c364a4f61b282ae8c7e51c6251a5550cc3df7f44b19e57e6ea4d80f536b718c6c5b73a93a385feff7382e9d6f0041827fc8442 SHA512 807a4b340df65b49a6e9ce5a2f7be6d84ec3588d13475f9607706cd8f6f6851ed9752357fd844aab28a18beaf2dd0ededfff05ff64d159613f2395a398de85a1
 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.63.ebuild 9861 BLAKE2B 3e86ee3508fa787d0fc6deb115f50eafd0cebfde6f0685a0a443c318bf43d137a09d5f1d9f055987c646c55c1181145a81fccfcd20e1dd0ec9d8b2062e4e4aa4 SHA512 3a47f1e70463b54c62cbbdbfb100682926728ab950820c90fb41498758570b548202c81a2349e3321b8148ddb75e6a00850b7333e19229279e5450ae4d144a67
+EBUILD bluez-5.64.ebuild 9326 BLAKE2B f5bc3babf4f8fc536cb442a3b3782dc2c142a9405cb14db90ef81c71df374dc5b29dbf0603695b6f1652db891c435bfbc99de38bb0422feaff4c2316e4948e84 SHA512 9839ea395fac81ee4886f784f85e86983c85ef79a531682215d1ae6d336e65e3750e78132dd8ddf2057ef07aeeb550200eab75493f4708dee6bca8f4df4f061e
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.63.ebuild b/net-wireless/bluez/bluez-5.64.ebuild
index b2c07f35899e..4a2ade79d8d9 100644
--- a/net-wireless/bluez/bluez-5.63.ebuild
+++ b/net-wireless/bluez/bluez-5.64.ebuild
@@ -72,14 +72,6 @@ PATCHES=(
 	# 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
-	# Instead of reverting, try another fix that seems to work as
-	# reported in upstream bug
-	"${FILESDIR}"/${PN}-5.63-use-queue_push_tail.patch
 )
 
 pkg_setup() {
@@ -113,9 +105,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# Skip test failing due to fixes for https://github.com/bluez/bluez/issues/220
-	sed -i -e 's:unit_tests += unit/test-hog::' Makefile.am || die
-
 	# 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
diff --git a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch b/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
deleted file mode 100644
index 6644e250cc48..000000000000
--- a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7b41f0c38ab34c9a5eec1a70669d183535e86287 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Fri, 17 Dec 2021 14:05:50 +0100
-Subject: [PATCH] DRAFT shared/att: Use queue_push_tail for
- BT_ATT_OP_READ_BLOB_REQ
-
-As repoorted by Christopher Schramm [1], this is supposed to fix #220.
-
-1: https://github.com/bluez/bluez/issues/220#issuecomment-996669412
-
-Suggested-by: Christopher Schramm <git@cschramm.eu>
----
- src/shared/att.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/shared/att.c b/src/shared/att.c
-index 169f726e4..5ce735a07 100644
---- a/src/shared/att.c
-+++ b/src/shared/att.c
-@@ -1653,7 +1653,6 @@ int bt_att_resend(struct bt_att *att, unsigned int id, uint8_t opcode,
- 
- 	switch (opcode) {
- 	/* Only prepend requests that could be a continuation */
--	case BT_ATT_OP_READ_BLOB_REQ:
- 	case BT_ATT_OP_PREP_WRITE_REQ:
- 	case BT_ATT_OP_EXEC_WRITE_REQ:
- 		result = queue_push_head(att->req_queue, op);
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 81641fe6a971..724d82f6ab73 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -7,11 +7,13 @@ DIST iwd-1.22.tar.xz 994224 BLAKE2B 537f95409f31a56c6686d943664c640f086651c35a97
 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
 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.26.ebuild b/net-wireless/iwd/iwd-1.26.ebuild
new file mode 100644
index 000000000000..152ed689f93c
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.26.ebuild
@@ -0,0 +1,182 @@
+# 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/unifi/Manifest b/net-wireless/unifi/Manifest
index 0dd34787f114..a1fd5156731f 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,12 +1,10 @@
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
-AUX unifi.initd-r2 480 BLAKE2B 9ff5b854bbf831a47485f20a1893bc10ee28fad118e429f0cf057a2182d44259148cbefc05fb9d860c4060110404e4864db678bdfc519155a83cf2dbe8015a8d SHA512 970aee9cb04115c1efcba212949c1e68bb99d838f1cc5360873b13c5e97a60ca45db34f122c2a2e634770256e5a167796db2d15420d6e201df8403cddf3a8c52
+AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fafb4f5a5671edc522fb13872ec64c168173667cfc072cd0fde5fbaa236109a4c49947ddfd3fd429f SHA512 734aa8b93e057579470e59a287d68f219f510f73479add86d3bfc32d73ca495644d40d9323e2b00a448ee7b519f9a60d3150057c00398165108b572999e70b67
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 AUX unifi.service-r1 237 BLAKE2B 19d38b04924c9236a104323b18d423484a16159d123d573a85ec9fb4749b7c5a0b5926430f5477ab32929b7bf9bbb458e1c683ac64ab799d438791cb7e742001 SHA512 2fd33d12b95057446641d3e5cb9bba332f6089fc0019706758b47d24cda16254750d69dc76794a3b58de4cc160070f559294285c4be2829df101c670db9b39d6
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
-DIST unifi-7.0.23.zip 160854754 BLAKE2B efbca0e4157f2399046bca1de985b44793392e9cb24e07e9bb9af63380f06fa88f4317688ddb4a11a9b3c925a525282c980c5e84e4cb89e9a7c00c7dd6175d4e SHA512 9f1762e82a51cccc48e7742cf3ddb62cc2cd3718166d495a2d47c80f7a36444646c85d1efdafb805a76b7c2e0318802b1ccaee6ec7f378371a85ff51ef49392c
 DIST unifi-7.0.25.zip 160864941 BLAKE2B b38f7894484485e0f61a08d9b822efb518078f7cd3cd9b2cf33d99c97b3e0c134279272804f2fd8591f21db7e289a9532f00b4b8d4e77b499330f3d689ec52e7 SHA512 2237a9e6cd97cc22c0a21ab89c11432f1f96f2d74b121cbebe63f2d5ab6ad4cc690b058c32f21774c5def28be7f927df98e45314ab145b1f19127da9beda9fc1
 EBUILD unifi-6.5.55.ebuild 2224 BLAKE2B 30612188b7ed5e51f00ef64bed1679d20db432e929f753374d5b71fd39e6f950a4d4a2f8299d353eb54fac00a49a5baaa91c9a89d47926a86ed48c4f039707d3 SHA512 1b43d2cf6a80ee306f8388d38d160aaa979ed43009cbb8e57e983a73122d9c277cafe9efb67e5937676e95eb808facad1de89f2f66748d1b9eb491c75e320a6d
-EBUILD unifi-7.0.23.ebuild 2457 BLAKE2B 72814f7f3282ccbc2bf8ebc2f8bdb1ae29cc3cab29dfc3b7aebce5fec94408524e77f0ec1c2a769c9ab2c09253617966cf481f05e60a53b8325fb244ad466f62 SHA512 5f85def426858772e60b04f11c05c5a4859422570f8fd49609a2c1a420ca6635911eb776f2ecaa07db619569705594d25cd9c9e2ddb17428f3a29aa5049b6e4e
-EBUILD unifi-7.0.25.ebuild 2457 BLAKE2B b0af9968c5acbf3e191f7afb321fa88da8d66c0b604b5b78c893a83f8987921c8242971230aed8b607811ee5ed61e61e4203b2b0226e0a9c20b3d79cc3eb5f88 SHA512 83091a137a4d663bbc3e13ce6dc5c09448e2a03c859a43fb898692f902556699c6c33fb7ea62a0e82976039cacb73c4455cf44725a9c41d00727d4558fad8f81
+EBUILD unifi-7.0.25-r1.ebuild 2472 BLAKE2B bbc925dbfdc96c33c5cef1f11e59b6170c8026660c96bec5282336d9c0601febdbf658c9d652b928739bbabb3aed5ecdb0f6fbfd709f024cf4a1c8aa421f5bf6 SHA512 0f28c97f18d1ab089a21530f0c0da39214a3d2518169363f61482f5ced49268fddf338bae26d67d2458ecc1d607b8f82f2190117251dec7383b8b0a6b64564b0
 MISC metadata.xml 579 BLAKE2B 4c18ad9f1d440c5d2fcb1460666ba738b04108d14f30d47b046213412ad324e6d942971959b98f8eaad08485fef2e441d89cc5b77e3a6696f8f339e7822b9f1b SHA512 6a562914d527a80b5737b1e121f21a71b086612b876274b38bbf6ceeb2aee94983327c84c23ffaf7a738cce0cd20f16581c0b99f5448105269302a1ebc3b8c3c
diff --git a/net-wireless/unifi/files/unifi.initd-r2 b/net-wireless/unifi/files/unifi.initd-r2
index ccab8df7fd7a..a92172fffb97 100644
--- a/net-wireless/unifi/files/unifi.initd-r2
+++ b/net-wireless/unifi/files/unifi.initd-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 unifi_exec="/usr/bin/unifi"
diff --git a/net-wireless/unifi/unifi-7.0.23.ebuild b/net-wireless/unifi/unifi-7.0.23.ebuild
deleted file mode 100644
index ecf6140adc85..000000000000
--- a/net-wireless/unifi/unifi-7.0.23.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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="-5eeb859f85"
-
-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_dounit "${FILESDIR}"/unifi.service-r1
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-7.0.25.ebuild b/net-wireless/unifi/unifi-7.0.25-r1.ebuild
index 32242007eae1..24936b556d77 100644
--- a/net-wireless/unifi/unifi-7.0.25.ebuild
+++ b/net-wireless/unifi/unifi-7.0.25-r1.ebuild
@@ -85,7 +85,7 @@ src_install() {
 	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_dounit "${FILESDIR}"/unifi.service-r1
+	systemd_newunit "${FILESDIR}"/unifi.service-r1 unifi.service
 
 	newconfd "${FILESDIR}"/unifi.confd unifi
 
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 8e76652ee9f3..7ba25b27ffe8 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,5 +1,5 @@
-DIST wireless-regdb-2020.11.20.tar.xz 24840 BLAKE2B b2db70097db43710cc2b6d8966b5c6d4d910a704a87a0bc979667bfd293d8baa402677b5e5bc0fcc4f49647ede4cd6bc3e17d41288f41e58c5c6cf3b968489a9 SHA512 93764e677c4d5cdcb4e927bff206c646061fe1e65896dd63f683e145d45917545b4e08caa14bfb3ea04ffb85438935503bbde386cbabfef2804905e508ecf7a0
 DIST wireless-regdb-2021.04.21.tar.xz 24944 BLAKE2B 4af782ceefe67c311cb90d1f64d830d9e5d2ccb7bc1aebcd8a176079522c21f1d8ef70cad0bd7223e9d56d46e6d20030af2349da9944d7ee3590bad28aeba467 SHA512 0ffbee04ec08c2025a34b60adc11198d64cb258a6ce53caf758667d25b733a242ca592d76ebd08e5692047917f5f42bb67a176f67a7d6bd11ad9178378cd0d26
-EBUILD wireless-regdb-20201120.ebuild 1086 BLAKE2B 0e5bf6a57dc56c9dcb93be6d789a37493aeef6481ef84e922fc78b5f8844c1ad5bd9f8a89ffb555c252fb42be83e470bb3961a7b01df9ccb2b52db9fe7bc1c2e SHA512 05abfc850d4c87c819ee5a124afeccb00f681546884fb33b4546f9e262861a5eae54f93857714c4031c1ccf048c0105dc9184136ca15a04d69fe8a37aa421cca
+DIST wireless-regdb-2022.02.18.tar.xz 25908 BLAKE2B 1237537a5d9ed249cc53b838b65effa83ceecd06bb76b11388a6c7673cd61322026617f033bea53d024f15a58ca19c4ab51bb624f2ee8fb1f2233b8e99140d4a SHA512 133fadd331dc0bd3f23e7dab54c3dfb1c55d8271bdaf9f393207fccd6c4d1d3d8f6428c1bebad54b2f3fd4837c4b6930b2fb33b3dc07abb53e41bdc8a54d8de4
 EBUILD wireless-regdb-20210421.ebuild 1092 BLAKE2B 903e8f7006cc68a0db74946817b0feb50a892a7bcfadccd089007d8675a192bdb3bbf5425eb93cd9a944f609a8c1536077c7b037879ea51b6fdd0ad765ab96d3 SHA512 f18b62524a6605b58df9cd4d30e856ebf45a9148ef8d2a53f76481412b7e832a8c956ed10ba6dd62af469e5f97ff6bcca9de5b7e369108f7460cb956de98da61
+EBUILD wireless-regdb-20220218.ebuild 1092 BLAKE2B 5a8e4d26468e69a0901fd938bf6681afb86d50c74af038afb57fd992db0359bc748e24bbcb3e2d9997300df62cdaf83a6aff9d73435f1938f1dd84e93947c992 SHA512 849fa96f1cc4ebfe66604af7ab1647846bc9f45c2c4056dbe278c42e9e003a694aad4c6ed0de366e4ca996a18e3cadcece569516f0d5a2cc705130c189b2c4cb
 MISC metadata.xml 272 BLAKE2B 2a42142ca287ab19668cc11278dac4d0f16bf5b183646b0f06317a6e60568d9328d42baa986af6c692a256b28fdef32f24442faf69ae9b8305d625a3265df298 SHA512 4595277c33cd3d565c652cae1644c4ba131dea25899984629a48dc9a679441c95a7d26527c6fe4578a3e6f616e6f8c25580ee9f785fdcbd699bd43bacd846dd3
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20201120.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220218.ebuild
index a79ca195cab7..050550bee28b 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20201120.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20220218.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
 DESCRIPTION="Binary regulatory database for CRDA"
 HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
 SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 src_compile() {
 	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."