gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-wireless
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
62 files changed, 904 insertions, 278 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7a89e381ec44..56ac70d3482c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/b43-fwcutter/Manifest b/net-wireless/b43-fwcutter/Manifest
index fdf461cc74f0..7fdc140149e0 100644
--- a/net-wireless/b43-fwcutter/Manifest
+++ b/net-wireless/b43-fwcutter/Manifest
@@ -1,3 +1,3 @@
 DIST b43-fwcutter-019.tar.bz2 46769 BLAKE2B fc67d285ee1caa4cb17584cfbae21ff5852282a3565a8a21d5775b4ca734bec4c9e62281dffeaac884a85530b2ba70479620b8425abd73ce1e502ab032aaed42 SHA512 2a439d1583d1ee7b13dd6a7526b78b216073e044c3934adf6615b8d2ca9a4b8c74db9791182d27baf1690b5c5ff6ce1a9c8dd4fb796e47939d055fef5bb37960
-EBUILD b43-fwcutter-019.ebuild 668 BLAKE2B 3d1459773395b18463e91fffe263c30379be9505e289d5b34c1323a0139c764228c8bf56f1ff239087a55beab1e2d5b4c78005d7aa8197e73de2089985d924ae SHA512 6017b69787ad34a184f911f41d9e8085d3eb9cfc1a89f90502d19670a0290f4111d342cf633a00a8d8fda87faa3ae9b1ee8402d9040da666608c9f6ca98409a2
+EBUILD b43-fwcutter-019.ebuild 675 BLAKE2B bc86089548ec0ed942f96c91c1f9c63c2e46d8b01c11d55b19a063cd6d6dc34bc26ae0e1b73b5d8349773398d4407ec8d4a51c14e8e52b0a9a9eb0da43eb2ed7 SHA512 68fcf79257aae39e3382c5290ac242f527175159c354628181678a1f80912076e6ecff1b81e601dffc7e1c52d6e0d68ba64c553f26a3e46f659beb638edd1a65
 MISC metadata.xml 246 BLAKE2B 95cfdcb4a584ad781b369d357984936986e3137fd43cb136c5b7b451e3e013f9ec88f9487480ea56c221bf7143150edb0b6b43061cf8460dbb83b83bc75558d4 SHA512 3aef85872e7d1b0069ccc833bc58cbaaa21233d317a18eb18e0ef0bf1d6fc9555a1759ecb374d49ef1dff2b0f05e9967911afe17edd91c1e54c74d61bf0e47c8
diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild b/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild
index 10a4760079ce..52a67071ac0b 100644
--- a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild
+++ b/net-wireless/b43-fwcutter/b43-fwcutter-019.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
@@ -11,7 +11,7 @@ SRC_URI="https://bues.ch/b43/fwcutter/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)" V=1
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index 48e386c08070..a944bacc9ec6 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,3 @@
-DIST blueberry-1.4.6.tar.gz 1415484 BLAKE2B 2b0a737d6e9e10f4f8502ab6af5e90b35e2eb651a48b431a0738cf06817ca49f12e9cdf6e0a3221b42370a00cca23c7da54d75c1f801968f1ee6d87dc3523590 SHA512 580b0a0434bb3c980158361a22ad0d8a502cb8b9c5d92adf4e97fdc28405bd5422709d4c605923371284457389f68aebce3e4599b7dd0c35866b65bb4fc2355a
-EBUILD blueberry-1.4.6.ebuild 1278 BLAKE2B 37ed69c445baebcf5b5ef167a97b9ff3122f9caeb9c7c1b2a3b4cfbc01986f9943163b199b6249706c18b33be6a65683ec65f15c1529d7d61e77101687e63fa0 SHA512 71e7be2decf92521d06308b28bbbac9b4e96030d24636ab70fe04e149eea4b2b8ec9bb57f2366337b34e84a6e9635ffdd79327c502df999aa462c421b2e30f83
+DIST blueberry-1.4.7.tar.gz 1415642 BLAKE2B 59b419d73416105d3d853cc8c5f6cba3f1171f441478ec7f3bdfaaeea22ce07afef3da372a1f993345a7fb38621d0d163ebb4a4d9e8b9e919d71af47e79dfb98 SHA512 2562017da0a102d5fde2905aa4d76cbcd761eeb5e17b137bb6a0bd22d518dfb677bb6ce1e05eb109a1b8ae35588f56f0d42b56f455aaec174155614966551eee
+EBUILD blueberry-1.4.7.ebuild 1283 BLAKE2B 8a5884f8ee0ac39e7c9a809c075cd4f5250e0d09fd1f758799dc3d74d4adf3bd3cc218494f14483000eec402c886026b6462117a2a7d1585653ee8bc1c67ecc7 SHA512 3d35f50355933a5fa1efdb56f71e4995c59f3e9b772e69300cc09200830b9abd17af3878c89b3d7d0a8a0c15b90d5b528c720585a92b66821f439e080d1f7135
 MISC metadata.xml 494 BLAKE2B a25e54118f511c2d8d7077d2f6f7a21f5bf7a7edf03cde26561a147136868e3dbcbce27fe6628cb5637dbb728762dec841bfe0fa21e03adc34b49eb8c64722fa SHA512 9b9f58c5a954d69028c79611e11670e205366505626236895dae550faf672868ac6c778a7bd6f864ee20a29fc2f9c192065871ad28bcf2e3a7e16cb0d6cb39cf
diff --git a/net-wireless/blueberry/blueberry-1.4.6.ebuild b/net-wireless/blueberry/blueberry-1.4.7.ebuild
index 15ace7d83475..0f483c473ace 100644
--- a/net-wireless/blueberry/blueberry-1.4.6.ebuild
+++ b/net-wireless/blueberry/blueberry-1.4.7.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit gnome2-utils python-single-r1 xdg-utils
 
@@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/python3-xapp[${PYTHON_USEDEP}]
 	')
-	>=net-wireless/gnome-bluetooth-3.14[introspection]
+	>=net-wireless/gnome-bluetooth-3.14:2[introspection]
 	net-wireless/bluez[obex]
 	net-wireless/bluez-tools
 	|| (
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 977e7f4d6f3e..7934f8043e8e 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,7 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.2.3.tar.xz 1587268 BLAKE2B b3a2d275904959437a47eec32b16f9ebd945bf49705d4f4752d9bfa40d7764b73d373225875773491432cf5b72319eba51a7206cccf10dcf6033a98f584a0504 SHA512 ccaf624bdea116c70b375ae62c1b477452207e8df0fa0941b0e80ac9fa9fbf760fa0bd0db1e7dc1e63f6010323c4b0bb228e315a0cb8f6a4283cd9da6cfa012b
+DIST blueman-2.2.5.tar.xz 1575260 BLAKE2B 9e26b3406114b1dd3257bcfd0850bf16385ac3eb2fcd89097e3a0464099b7c64eb4cf1f5cd7630a8387fd258b4b0bf8bc52f01c5da480e543bd11346995392c2 SHA512 265a9286ac943a41f78b587a93e8759ca87b49fcda5a7b34ce520d9e0aee8e6335a1219f46d1c3d9bd3f07be15913b5c4bc101daaa5e9e5b380703733c021a35
 EBUILD blueman-2.2.3-r2.ebuild 2971 BLAKE2B 16fb956ccc94c0b06d25309c9d040fc68a50a8ef0d990fe04be85f0f168243e803ebde4336d94ca2e33b92dddfb1236daf30eec82089918fce849edd23c67051 SHA512 980bfa2a3f77434c310907615fba64a4a83f5d5b28079f8e8a3fe4a9b77b23b73df97228b1012fe87b0ed6af960d1f83ce2227dccdb424d16a000d48075d7b8b
-EBUILD blueman-9999.ebuild 2970 BLAKE2B f3b366b000991df89f191c290c55ea3817f765d0c92df63b65813f0a1891cb3a9eec2d37af40e6ff3b53dba4083db9d4977da9c2a869a786219800d2cc791214 SHA512 3dc045260205dddfa04f54379386956b1f17659ec4670b8d3f1690e2c6546a695ef63455edf34088a9c0e2b61b3b2e9b7de95c58822af638470bc1e30a047e58
+EBUILD blueman-2.2.5.ebuild 2956 BLAKE2B 9f42425773862dada62e095243b308a65f397e952357042bf5f63695b6fac80c727c2532bb36906ef37b74fc34e59689995c0e1e00450b9d95fee67a6c62da38 SHA512 ce5457a1ef67d34f5db4401593ef10094cf25cf8924130feca63be4e3b396a4c3158ecd1824c8b7b7fc571085203db5a6f165b2dba339e921916cac065f0d384
+EBUILD blueman-9999.ebuild 2956 BLAKE2B 9f42425773862dada62e095243b308a65f397e952357042bf5f63695b6fac80c727c2532bb36906ef37b74fc34e59689995c0e1e00450b9d95fee67a6c62da38 SHA512 ce5457a1ef67d34f5db4401593ef10094cf25cf8924130feca63be4e3b396a4c3158ecd1824c8b7b7fc571085203db5a6f165b2dba339e921916cac065f0d384
 MISC metadata.xml 499 BLAKE2B 54e6fc4cc7b9922abf5a8bae572c282bded5bce21add03e418effeb5009ce7700a3fbede5f132638aa934b71b0898310e1b8315c48a76216045d56e53c7cf1dc SHA512 30e120ce07c4b4bfc278dfcfcad987bf878ed1ebc0ec92d859cf943270c439cdf717b5a9f01ee36399a64743c98aa73f9cd91db4fc85e0c0cf6b73c75d62a817
diff --git a/net-wireless/blueman/blueman-2.2.5.ebuild b/net-wireless/blueman/blueman-2.2.5.ebuild
new file mode 100644
index 000000000000..14d5a18e335a
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.2.5.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+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/blueman/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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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? ( 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-video/pipewire[bluetooth]
+			<media-sound/pulseaudio-15.99.1[bluetooth]
+			media-sound/pulseaudio-modules-bt
+		)
+	)
+"
+
+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
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+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-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 090a7032ac19..14d5a18e335a 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
 
-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"
+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"
+	SRC_URI="
+		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
+	"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 # icons are GPL-2
@@ -23,6 +26,7 @@ fi
 LICENSE="GPL-3+ GPL-2"
 SLOT="0"
 IUSE="appindicator network nls policykit pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	$(python_gen_cond_dep '
@@ -48,7 +52,9 @@ RDEPEND="${DEPEND}
 		x11-themes/faenza-icon-theme
 		x11-themes/mate-icon-theme
 	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	appindicator? (
+		dev-libs/libappindicator:3[introspection]
+	)
 	network? (
 		net-firewall/iptables
 		|| (
@@ -61,7 +67,9 @@ RDEPEND="${DEPEND}
 			>=net-misc/networkmanager-0.8
 		)
 	)
-	policykit? ( sys-auth/polkit )
+	policykit? (
+		sys-auth/polkit
+	)
 	pulseaudio? (
 		|| (
 			media-sound/pulseaudio-daemon[bluetooth]
@@ -72,12 +80,14 @@ RDEPEND="${DEPEND}
 	)
 "
 
-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"
+		local CONFIG_CHECK="
+			~BRIDGE
+			~IP_NF_IPTABLES
+			~IP_NF_NAT
+			~IP_NF_TARGET_MASQUERADE
+		"
 		check_extra_config
 	fi
 }
@@ -88,8 +98,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	# replace py-compile to fix py3
-	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
+	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index ae220792fcfd..b5eb04194966 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -2,12 +2,13 @@ AUX dump1090-5.0-32bit-fix.patch 610 BLAKE2B cca8cab42380856503831c59cfec13f9961
 AUX dump1090-5.0-further-32bit-fix.patch 1742 BLAKE2B 2cc502d6a88f4dd79a70efca538a8daaf9bbfa0cb122f7ae562943112b635ce19ca01197a4dce79bf0f81bbc5339f340534cfc6e7223510b6877c38f513212b1 SHA512 b3c3d3c8f63a1c3c149f5e44164c43b00d56829fe89a51ecbffc07fe201b7e88df9a49499c0d52add2f2a5d15f3ee80e7c4d287e863ca34453966487f2f7a587
 AUX dump1090-5.0.confd 927 BLAKE2B 144a8c2f51ba714b7c41a50ae58e893c1cfa2e9494a962c9033201c09fc889411b4b868b16934521709fe7402e593767be77ad6c43c0a4b4a9fba8b231756f58 SHA512 930267650aedb8012c2a92c1555d318789cf29ab42568109a9935a7d83a13fba4482cffff91b27062f74d9fde514e95060e0a53cb9438d39ede292ea9ca15b90
 AUX dump1090-5.0.initd 372 BLAKE2B f4e1ca0db565f56c104401b221af77966f499ad00f1fba5c804ee529fbc61fd75149c3d2d503d4a5e119784fcc10998ebbbad80cb09c1a27dba804a0d8a86c24 SHA512 0f9717d3f161658aefcd29f135bd3401bb539a0e83f40fdacf7326b48a96782d211dde1fc9237a822ee3d09a8b5b17ab22da63f6e93aceb526ff22c02eaa300e
+AUX dump1090-6.1-libdir.patch 586 BLAKE2B 20d358289b55e9f1ae11904b74035b8f1ba61061c741e7b71bf449350b255a630c1468b604f1ac98e02632346f26c5f8d7f34a00765e1b1a73dd232ab0a39e6d SHA512 470d8840b3da26f2bbb8be24f36ba17457a28d9b63080ea1483693b78e86ca38f69687a45209baf6767bac1e206bf62bd392024e9963926d4044fcf88e1fc5c6
 AUX tmpfilesd-dump1090-5.0.conf 212 BLAKE2B 081b8340377a40adbb3a9dfa87ede06729979ad50a138cb3caf6b0dac55203222df6c71714103c096b6fbdcd2b115dd2c40bd767b7e5ff1dd0360addc021882a SHA512 d44170620addbc3590d524ae540c38be31115d22f69fd55a075877ab482c0bbcdfe86e2eac3c3007c5476408c18623a0e179fadd2247beab01d1df296d7467b6
 DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95
 DIST dump1090-5.0.tar.gz 10124422 BLAKE2B d6b26a444f73cccd002558b6863431537078e1fe9f61e4e240d4a5f06181b9ff713387aad623c2ee8257c2568bd4dd373746606c356ac3ff0f27f411d4949997 SHA512 1104982308db788993bf5dc130a5ca369c8bfaaae56cd5a435bbd22ed99b0633594789334d7f256bad2b288c4906923baf8bc73e2f7b7f9f52f7068b9b519142
 DIST dump1090-6.1.tar.gz 9879362 BLAKE2B 716c1abe6df7958fb5ec94c35ed6af75fdb6180a56cdfba72443a7b34d1614cede6ec29aaac22a1e15f31d05bf1d1971eebccdff21cf9442ae69617e7c535ae6 SHA512 5f20d52f1fda754e33774faab852252d802ae5da8694e768cbf92df56f7693cd2da788df9e0a422f1801603e62498fb0af0143f5ea3292e9d607296cd5983dc2
 EBUILD dump1090-4.0.ebuild 1250 BLAKE2B acd1dc457eced589b99528333cdbfa5bb0c29bacac3cb0eb18c6daaa902f3c5f498c7c6a6810c83f92155b87f6e3511fd87d1dff51fb46e462b48af47fa66948 SHA512 27c238ddb2d0d2223f1cbc286c0bf6860706d6ef6c76902af25c3c542deb6382ac71c5ab2f9b8576b2d0906633bd1acb72b6ba870f8cb62b9b353d96818cc5d9
 EBUILD dump1090-5.0.ebuild 2626 BLAKE2B dececa48e1b48005a4855cd056977490a1e0d6bdc412463b777ad006e3c96f74648e17362801b74ee9b751e38d58ff184390bd3c1142f8699b909677fc25c73d SHA512 36765019ee228703a9fc6798323323cf685a5647c8bac66557e095203b7e3ea3042ef8e7ee62f0d8897a53d09e5f90120a4a642ed4a2c0fb1e6b434a4dd513c1
-EBUILD dump1090-6.1.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
+EBUILD dump1090-6.1.ebuild 2586 BLAKE2B 8360ea1d8c8dee1320b39b9433c41c7a290f702f7ed32c4efd70cd0394eb98eef1c30068cf5f88aa27b7fde8a9829cb0e6b83e8a2733ef26ff55459ef1fae39b SHA512 4cfc533960815cdd2bae4c858be7788e2823a44c5d430f144bf3feebcdb43cab3dd9052c7d7e5ce866b3d5bcb749a768cf80f7df65bc217577a5f75a24846810
 EBUILD dump1090-9999.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
 MISC metadata.xml 658 BLAKE2B 6dd0aec90915a420b69849188a8b29211db8cad5824442d4c1d1c07cf1bd88c4d477a3fa35481b745c2dbfd7ea1c8459751cc2c037932430d230a6f24ccfbb64 SHA512 fb0c280c0bf81c614f91ff9a4dad532ac61db9419c48e335e86ed37a592183fd8181fe0f6ade7e165a16e734b1be50b05db57efc1f1b27c01ec38be68565a61d
diff --git a/net-wireless/dump1090/dump1090-6.1.ebuild b/net-wireless/dump1090/dump1090-6.1.ebuild
index 04ee546dcf91..0d8aaf94604b 100644
--- a/net-wireless/dump1090/dump1090-6.1.ebuild
+++ b/net-wireless/dump1090/dump1090-6.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
@@ -28,6 +28,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-libdir.patch
+)
+
 src_prepare() {
 	default
 	sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die
diff --git a/net-wireless/dump1090/files/dump1090-6.1-libdir.patch b/net-wireless/dump1090/files/dump1090-6.1-libdir.patch
new file mode 100644
index 000000000000..b55fa95d2ea3
--- /dev/null
+++ b/net-wireless/dump1090/files/dump1090-6.1-libdir.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index d4a5ff6..5d69505 100644
+--- a/Makefile
++++ b/Makefile
+@@ -99,9 +99,9 @@ ifeq ($(RTLSDR), yes)
+   ifdef RTLSDR_PREFIX
+     CPPFLAGS += -I$(RTLSDR_PREFIX)/include
+     ifeq ($(STATIC), yes)
+-      LIBS_SDR += -L$(RTLSDR_PREFIX)/lib -Wl,-Bstatic -lrtlsdr -Wl,-Bdynamic $(LIBS_USB)
++      LIBS_SDR += -Wl,-Bstatic -lrtlsdr -Wl,-Bdynamic $(LIBS_USB)
+     else
+-      LIBS_SDR += -L$(RTLSDR_PREFIX)/lib -lrtlsdr $(LIBS_USB)
++      LIBS_SDR += -lrtlsdr $(LIBS_USB)
+     endif
+   else
+     # some packaged .pc files are massively broken, try to handle it
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index a922bd8b5f2d..e2fc7294b41a 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -2,6 +2,8 @@ AUX 61-gnome-bluetooth.rules 399 BLAKE2B ba3dd9fdc3834ce6a3460d8abff179d08c1258f
 AUX gnome-bluetooth-3.34.5-meson-0.61-build.patch 549 BLAKE2B 85812555ab5cc25ae3b766455934f8760c6002cf6426265c1a464086330627e9985345fbccecd9cbc8026a90468eebfde4a0d32c716a8f5d0ba56e64f68a9449 SHA512 727bcf24e07f92c7705f1fcc11e56d52dac7aa2826b7b9e39a3df87ee79c253aeb98dbebc998eada2fc346a086dece16c9029ecec2b114f939e917e3b099ad00
 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 1602 BLAKE2B f39841ad14ab1367dd1b934109a68e76cbfb78e64a53bfbf49b562fc983d119bc6d71c71ca2c617d8080aec32d7ca96d18a1afa6f6b3bfe9ba851d260592cf75 SHA512 58a5fa6460581c00790ddcbc00d3205e1fe03af2ffbe4efa6c290ee3a6573ef5d0b31c20340793b2704e723da2b6664212bcbf129139acf3781ace20acb3dcd5
+DIST gnome-bluetooth-42.1.tar.xz 302148 BLAKE2B 480456f3944ffdc4a6a10b099f4e2ec04b8e0c916dbe1e595733e45b0b781fa22852646d1e6def69cc86efa66020fa2d845027d6f7e2f137c10478cfd9b6af5a SHA512 05fc7076e707c447cd786fbaf8536c754b00972c450f8743dcd79f73f747e16eb0c9321dafc1deeef8d2bdcbfcbcbbf15156543d7b3bc696cb34d57ce5bb24fb
+EBUILD gnome-bluetooth-3.34.5.ebuild 1870 BLAKE2B 5b2fa57a3a3c1cdff733a175121ba1f6cec1265f54386b4b3834b52b7bb211f09466985b94590c7aea43b1e71b6994ada5c5b275c4aab29e4f48173f6fcb59ff SHA512 0245c183613908511f38b2a3977a2247b6605f1c5e85fb62260467d89acc9f02731b88c120bae2980d1d4c80d1a7a3e73fbdfa1a8c1ded9bd370d7a7c660d3e4
+EBUILD gnome-bluetooth-42.0-r2.ebuild 1599 BLAKE2B d6cd5b2b3c22952556c3162585be6cc3dcdd21271349144e1e17ee2be74fdbc757322aefb23eb33d535a384eac11d1f19be1e16ba60fec028d6c192d8a3fb614 SHA512 4109becf8b787938de229cd87cd7138a1bbd5c251c94e3d84c3c56456b003cac03fd869cacdf7fd017dd3a0edacec1f912df83cb25e2596b44d564daafa79486
+EBUILD gnome-bluetooth-42.1.ebuild 1602 BLAKE2B b316f1196208371ab77b19358f0ff0e45c98bda7a878de635f6a31f34e0605fc3b91ee44822fd67bcf00246dd594f83b6a2433ff9b3b46a930ff65520bce534c SHA512 9b5789facc6d0d69c6ce8d0ee3dd8c4c6779f4dc794cc736391984e16a5b903b2f1fa96b0bafb8bb2cdbb5e25ee14a1009751d30a42b5615b4a3fe754d587ce6
 MISC metadata.xml 373 BLAKE2B 06ad2a850886ca86649105c60fc64b5e6eb56250669a4eaa50524b500c59a39db80db85cfb7a1be7386f97e60cb758848be389b2eb3cb0a8a4cf42a95eb36c81 SHA512 976a99db6d5b42b1b2a22c59a05f44f9e5a3fee093082778e67fad2fb910c49bc7783b81bb81a6b678457ad8c1f4c3b954a906ade7913057c00def44ca4b0d13
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
index e6e7a267cbfa..a74636e59115 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
 
 DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
@@ -71,9 +71,14 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
 	xdg_pkg_postinst
 	if ! has_version 'sys-apps/systemd[acl]' ; then
 		elog "Don't forget to add yourself to the plugdev group "
 		elog "if you want to be able to control bluetooth transmitter."
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}
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 553891df97b2..16063fda9f67 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 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.1.ebuild
new file mode 100644
index 000000000000..5e6406f5bbce
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org meson python-any-r1 xdg
+
+DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
+
+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 ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2
+	>=gui-libs/gtk-4.4:4[introspection?]
+	media-libs/gsound
+	>=gui-libs/libadwaita-1.1:1
+	>=x11-libs/libnotify-0.7.0
+	virtual/libudev
+	>=sys-power/upower-0.99.14
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	acct-group/plugdev
+	virtual/udev
+	>=net-wireless/bluez-5
+	sendto? ( !net-wireless/gnome-bluetooth:2 )
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.9 )
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep '
+			>=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	if use test; then
+		has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]" &&
+		has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use sendto)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 69e658d432bf..71d84e92de5a 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,6 +1,7 @@
 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 6122 BLAKE2B 92fb30d18eb3d954910ff31e8fc7a098f8551230fc9a7288fdf482ff343efd689fe61d0cc857b6dc07f03078f72f9b579c07a203bb50e0f7a4196e52ef635b1d SHA512 b784ab92e33db9d71744ae901964f202468ef17103b6c98cb87aacc8c11f6b43ebdf4cc67c426895292fa7264cbe2e4b2a1a591685fe17c07cc3451708bcf93d
-EBUILD gnuradio-9999.ebuild 5982 BLAKE2B 30f570a9020f7a0684168a83ade51dd024088fefcfbc7048a35f23f4a08a8e55ecf7c1f314741081a443e7239ec0e552ece489a8b1f85c641733e48f530801ad SHA512 3199d0147dfb15218524558d11eb61566e8b8f65b547c9eb0c42b7438f8c6aa751f24a1fa281336a3d0d4dbd2e27ab40c6688b038f7000fadacff668751e0f40
+EBUILD gnuradio-3.8.5.0-r1.ebuild 6179 BLAKE2B 0a80d18deaf566e360a3ac27f9f9be82b1ca77f863e55f63d33e2db2963be501fbb48ff40d803f517ab9d1d6942f70e1308403283ba02994869c583ce8a798cf SHA512 2cb684eb7e6ed1720789adb1a856b0b789d78973f288c02288ecfce734118f7d5d27feda40816981e9633ee925d23d4252317587941983ef1e6829654ffe4b7e
+EBUILD gnuradio-3.8.5.0.ebuild 6125 BLAKE2B 80ff9f450051087bf7d4801115097ca83423c9bb30149c416141bd09fd6b054d6c19a477a09dac84cbfecda14b731d48265e6be0ad50173bf8f47868b4025eab SHA512 5ec39ebc2b28a720a1c19573ad20ff2e7c4a992e3467c7ac999d47044ad212d6ef88f840dcc5cdf7526153656eba58c159c47a2e13c3c61459170788b9e7c74d
+EBUILD gnuradio-9999.ebuild 5985 BLAKE2B 93ab02962149379a688c3db4db570cddb1da16d87fc4955327a22550f1a17eca6b034a69e28d92bafb1915427d659e4292883b231315ce8ed4f002bc35409465 SHA512 3de04e75f3d94d03d21f353ffcf4d8100520772d1864e4f814a6056cd6a5b10abcf3ee6077d28c6dc3126e6989b7993686a279780c2d3a75ceb66c84c9f07dad
 MISC metadata.xml 1676 BLAKE2B 9dc4c025e09d54b083b7681f5a06e491375d9621fbb60d0a0b8c218da0e9a3d7cc557aaac86002984bf0b7dbc82848261d3ec0cceeb0cb35ebaed92675cea2a9 SHA512 e52efa5ac1bb1dc576b2802d581741c43622aabfac2133b1e3aefdcec671e2c67631f91c1322d22a4b315e1e12c006cc696dd97aa0f18ebace534cc249251b12
diff --git a/net-wireless/gnuradio/gnuradio-3.8.5.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.5.0-r1.ebuild
new file mode 100644
index 000000000000..a8da90f2bd12
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.8.5.0-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1 virtualx xdg-utils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.8"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~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"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp:=
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	sci-libs/fftw:3.0=
+	sci-libs/mpir:=
+	sci-libs/volk:=
+	alsa? ( media-libs/alsa-lib:= )
+	ctrlport? ( $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') )
+	fec? (
+		sci-libs/gsl:=
+		dev-python/scipy
+	)
+	filter? (
+		dev-python/scipy
+		$(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]')
+	)
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	jack? ( virtual/jack )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( dev-python/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1:=
+	)
+	wavelet? (
+		sci-libs/gsl:=
+		dev-libs/gmp:=
+		sci-libs/lapack
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11:= )
+"
+
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
+DEPEND="${RDEPEND}
+	!!<net-wireless/gnuradio-3.8
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_CTRLPORT="$(usex ctrlport)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	#if use grc ; then
+	#	local fd_path="${S}/grc/scripts/freedesktop"
+	#	insinto /usr/share/mime/packages
+	#	doins "${fd_path}/${PN}-grc.xml"
+
+	#	domenu "${fd_path}/"*.desktop
+	#	doicon "${fd_path}/"*.png
+	#fi
+
+	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+pkg_postinst() {
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
index 120d4741d37c..6512288c30b9 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 CMAKE_BUILD_TYPE="None"
 inherit cmake python-single-r1 virtualx xdg-utils
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index c02ce48dcda1..78f7c917fedf 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 CMAKE_BUILD_TYPE="None"
 inherit cmake python-single-r1 virtualx xdg-utils desktop
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index 527031ef0a5f..150caba3029f 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,4 @@
 DIST gr-ieee802154-0.0_p20200812.tar.gz 94491 BLAKE2B bfea628afb191fa88b2ffba7b99bccb05c5bc22e4799db85082ec5d0f1ccb98826a1aca728e8e5c096cd78d11ea7cf2b8ddf46b1783b33f2bd87da75d8f25c84 SHA512 5e012980436b7fff7226bbd9897b0eeceff60fa678fb41c4a83e59cd10b8d441eda2b378fa5d5767e0f24980863a6a756f5457e5cae346827481eb089fa719a9
-EBUILD gr-ieee802154-0.0_p20200812.ebuild 1404 BLAKE2B 389de76b31ba32d07a0ba071a5e8fdf6e1a175ac3a26df2fd9493b549c2fc8df6cb90bcbe21be5661b72363094473bf62339fc28a3a1038c11626fd78d09a452 SHA512 7de3085c26ccccce865117266fce2734b40183186c69f338e854d0cc81698a56670498227f4a17d7cd23e96c9106a74dffbffef014e353652ed9df4a578c8d18
+EBUILD gr-ieee802154-0.0_p20200812.ebuild 1406 BLAKE2B 5d4c3ca51054754733df35d33fff2547c92d9f10b6b0ad6222d02436bb61a4b2a7c607d895dfcd1865f8de49fbfeee3aca6ec221eadf743eb843c37b87a6c536 SHA512 15307a39d39759d2df744f4c19dcc648826edd06496056e09a167b24c390990ceff2c4334a29076ee406b58b1c4e416bf7046a30c8ebc89fbe2664c4450add95
 EBUILD gr-ieee802154-9999.ebuild 1404 BLAKE2B 389de76b31ba32d07a0ba071a5e8fdf6e1a175ac3a26df2fd9493b549c2fc8df6cb90bcbe21be5661b72363094473bf62339fc28a3a1038c11626fd78d09a452 SHA512 7de3085c26ccccce865117266fce2734b40183186c69f338e854d0cc81698a56670498227f4a17d7cd23e96c9106a74dffbffef014e353652ed9df4a578c8d18
 MISC metadata.xml 327 BLAKE2B 2c9e8d4809ade74a47f5ec1e0f208345c49edc0a994226a8a29739643b1558fa3fe426ce64636742708b32a5a2ac0e9472fbd91545d30d18d0e8755d2743c483 SHA512 dd940d9241b852de89bfcb8f921663ec946f2833c2741ddf39ab6cffcbb275c63e7407a97f8c650135d79351f26622c2a23b05251ca2d9b61eb5a64108ad0200
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
index f58d5031539e..c8d81337e5ad 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index 2d3180352f48..85558f8dc595 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 981 BLAKE2B 3223f88b14be84c406d2e70553e07fd7d54535684578c3ac87f8b142e06a82ebee1b73bbee2e20e696eea9e6cfd9ad0b977b37d18b589ecf70aa3708edd63be6 SHA512 269553d7d7a8fd5316a3eb01717c83ea8982c9013e2439513b7eb22722b02a6de1d52878937f56e95b091b563ecdced6d21a893d005e7d8d41759e456b51dc5f
-EBUILD gr-iio-9999.ebuild 974 BLAKE2B b8daeb7a7fae88b3744fb53e123e23ff191240d14c4c24f91ed96b3aae9c5a97b2260aefa7307927acc23923bac963ddbf7f1fbcf6179ef12b11034422e5b974 SHA512 ab8c215af7f8469eb105c688c113180208efe7a41a2012f4a8fbc0c83ec1451c43fef24158377fe81eb0c57f55f41b873080e53869bd672471bf67498feb07a8
+EBUILD gr-iio-0.3_p20191219-r2.ebuild 984 BLAKE2B 08ac55f27e6e634cc72f1c62c1c4197e0a3178cee1f3a9615f3a32440aee0aa30a63719a3b574a3c20bc93e5c09eadb70faa52b6525f5aaddfa3f9c29159c13e SHA512 3044365785dd76965b9c51c6c44e0274aa145932da86c7381a1d07542a64473674ee21d317623f689b43adc7ae2390ffcaead4dfe483079cf70424dd76a8edbb
+EBUILD gr-iio-9999.ebuild 984 BLAKE2B 08ac55f27e6e634cc72f1c62c1c4197e0a3178cee1f3a9615f3a32440aee0aa30a63719a3b574a3c20bc93e5c09eadb70faa52b6525f5aaddfa3f9c29159c13e SHA512 3044365785dd76965b9c51c6c44e0274aa145932da86c7381a1d07542a64473674ee21d317623f689b43adc7ae2390ffcaead4dfe483079cf70424dd76a8edbb
 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 2765cad70f80..ded3f63256e6 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,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit cmake python-single-r1
 
diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild
index 0f3c49b650fd..ded3f63256e6 100644
--- a/net-wireless/gr-iio/gr-iio-9999.ebuild
+++ b/net-wireless/gr-iio/gr-iio-9999.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit cmake python-single-r1
 
@@ -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 a8648717569f..2fde7a8a26f9 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 871 BLAKE2B 6394fe9a8c3ef048dd7d069fb32412691f949b080e262ab1dee388f7054c659c4997a49d30ac860c8c1b70bcaa05f3809c21ae5cb0baab23131e4af28e807c23 SHA512 932f379f9183ba166e8aa862ffa93cfbd75e9cf0603f7139841bff5dfb0685f6715222ee1afe53b924c811fd32035a48ef033c3a0150527fc9256a122bfdb321
-EBUILD gr-iqbal-9999.ebuild 864 BLAKE2B 34a69b437b28302e8fa7c112786911723102030fab3a7b925e3ed3c9dc0368c02df3651ea8f529ba2eb8ac2a4fe0f50784f267bf0f62ecec39fa2fb5da269467 SHA512 95eccb916663742d87c9f48552b6ebf96e4b162f3cdfc27d6a8f0c4cf979ac9b31cfd5149b1a12cceda857f0c7089159c21bdd91a15b3ce13e55ad40f37e7f57
+EBUILD gr-iqbal-0.38.2.ebuild 872 BLAKE2B 0637daabebc2441668308038a6dba79bd8fe84c21c6da980ceea0232926bcdc21bbee901aece27780bbef1e36dc0b666110254f13e7c0ea3c9a5e737ebeea8d8 SHA512 7b821312faa706061cdbbd7ad290ce0c695599b272f42f2ba0552b1666e1ee16e9eac82d018172c7ca3281c55429ddf69bc4bb37dc7764492430267eb6f4ead0
+EBUILD gr-iqbal-9999.ebuild 872 BLAKE2B 0637daabebc2441668308038a6dba79bd8fe84c21c6da980ceea0232926bcdc21bbee901aece27780bbef1e36dc0b666110254f13e7c0ea3c9a5e737ebeea8d8 SHA512 7b821312faa706061cdbbd7ad290ce0c695599b272f42f2ba0552b1666e1ee16e9eac82d018172c7ca3281c55429ddf69bc4bb37dc7764492430267eb6f4ead0
 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 4a7b4327adeb..ae04e944ba3b 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index 9e73538bd42b..ae04e944ba3b 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
@@ -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 93ba759393f8..d6ac9a2f2254 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 2128 BLAKE2B 699a1088e09444abd5a5f2810e2257d0d625d2fba39c0d40c03044c1c6f9ae3e7feb55235ba24673c6f570b899b57808fc6a7e6f3a1642c7f224e7c96b7652d8 SHA512 388b4beb0e70d5c6e5af6d68f3bf3d290cb5e514404d63e2a086664354f36a1d5d92b45c9b3774cd8a11b74712d0a35aca941e2f03b0345b52a3fbf99331667e
+EBUILD gr-osmosdr-0.2.3.ebuild 2131 BLAKE2B baca917e56f5bfd373cfe22fc0d8295c78171066639c48684591a8c5072e9ea5dc66de15b8ce039f438ae4d544b943f842b7d2e952fefdcc66f0733b1476c938 SHA512 81de3fa634b823cb14fc69b3955b79bc1f4a59a173d21ec91cf44a85f6217a51cd749ccd1e05d3d3a2786460d09a16e75744ee6d10226a84643a5ef66fb53061
 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 700654075138..3f5284e25139 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit cmake python-single-r1
 
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index 967ece787431..16c89530eed4 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,4 +1,3 @@
 DIST gr-paint-0.0_p20200517.tar.gz 1588114 BLAKE2B dffae6fdd6832ef7a39911b5f20d385e1691021e49659c36244c4aa1086fa74f4f59aceb4f208a24dd76854455183644c8f7db7e6ed0600664dc02f08e6682c5 SHA512 00b508b08baafd02e69197028a6408da81f5d1bf3dfe6d3229f248d60503ccec48f3fa0491bb785ed1ece40ea90d34544bc3b62e4506459488d56540b9d519c2
-EBUILD gr-paint-0.0_p20200517-r1.ebuild 1215 BLAKE2B 2347a73a629950690c73f75d1109b57ce8cb6021f7a3f0a6fdfbbd2f818248eb9e4c9436a20c1912acf2d84ccb4b9988ae96fab50fde30c2059a9acdd831fc1e SHA512 19a03122b29777231f3654cd1c048b9c7a086d530e0ada160bc59b71fbd70e1fe24ebfa2acb3ffef12756bc2f555672e637d2109839c8d5d5d41aef70d5dbdc7
-EBUILD gr-paint-9999.ebuild 1215 BLAKE2B 2347a73a629950690c73f75d1109b57ce8cb6021f7a3f0a6fdfbbd2f818248eb9e4c9436a20c1912acf2d84ccb4b9988ae96fab50fde30c2059a9acdd831fc1e SHA512 19a03122b29777231f3654cd1c048b9c7a086d530e0ada160bc59b71fbd70e1fe24ebfa2acb3ffef12756bc2f555672e637d2109839c8d5d5d41aef70d5dbdc7
+EBUILD gr-paint-0.0_p20200517-r1.ebuild 1218 BLAKE2B 344f5286fe19450909ac69c8c5860cf556a554c10083dea24239ab71b179fe799fc7abd2f78cbc7167c1a530b1ecfccb94554f643d9ccb9ecd3e491fcc9ceb5f SHA512 1689c034fc09e496398fd4083ab05c7e86c9c86c188c109333c3427d2bd8e8aaecce8bee1a9a96ff216e5193968513142b0c50ad4d70b160daed31dbb95be761
 MISC metadata.xml 427 BLAKE2B 1a5880d32b5456304e782a308f10c9d3a566d660cb77aa7434fb9ddead7c20ab83824dd4a723221bec93adb2d700c1ae88726ad1dc28f3134570e312cbfa781e SHA512 decc8d4245a466a7517ffafdfabf1f62c747e40bc8df140c9fed39cf387cb64a183a3c97a128a0db101fa4a485331f086bebff46f92321fd0ed1ac0b9e433729
diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
index aad1eb07b45d..29e3d30c09af 100644
--- a/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
+++ b/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
diff --git a/net-wireless/gr-paint/gr-paint-9999.ebuild b/net-wireless/gr-paint/gr-paint-9999.ebuild
deleted file mode 100644
index aad1eb07b45d..000000000000
--- a/net-wireless/gr-paint/gr-paint-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint38.git"
-else
-	COMMIT="9cb4eabe3b570ccd1f53837681607d73501b5c1e"
-	SRC_URI="https://github.com/drmpeg/gr-paint38/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}38-${COMMIT}"
-	KEYWORDS="~amd64"
-fi
-inherit cmake python-single-r1
-
-DESCRIPTION="Paints monochrome images into the waterfall of a receiver"
-HOMEPAGE="https://github.com/drmpeg/gr-paint"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-#< drmpeg> What tests?
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_USEDEP}]
-	')
-	dev-libs/gmp
-	sci-libs/volk:=
-	=net-wireless/gnuradio-3.8*:=[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	media-gfx/imagemagick
-"
-BDEPEND="
-	dev-lang/swig
-	dev-util/cppunit
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOXYGEN=$(usex doc)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-}
diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest
index 89b339588e47..ccf3699fdd54 100644
--- a/net-wireless/gr-rds/Manifest
+++ b/net-wireless/gr-rds/Manifest
@@ -1,4 +1,4 @@
 DIST gr-rds-0.0_p20200807.tar.gz 210730 BLAKE2B be2ded79a744d97572f754458fbab6c4091eb9096fa01238e09cfb1703d50fc1f228000b973826456fe4fae7577ef4dcc871edb4f72bd4e2daacdf3d01330d03 SHA512 d04944db7c02d3a004beae5be96a42274dcc4503d94bd22b726c664fb49103c41479ce49f7b4f2e6fb86d7b6bdd01873375fd6a7a7cc4b04ec9bf033235743a2
-EBUILD gr-rds-0.0_p20200807.ebuild 1400 BLAKE2B 7b75c0ccd1471688d1924d03d5897e9cdf34abf54338cd21001c78c62d7edd767be57e56e879aed87db67cc2165af350a07265f54836484e86a2c73cea2a6a94 SHA512 928941a5dcef6a4dbbdf75e59929e8ed17fedbd130a24499f11794211f9f9f7717e5641e153d4afac5e85f277dbe3a3eb4be1bf044cec67db0f7a0dbcdcc602a
-EBUILD gr-rds-9999.ebuild 1400 BLAKE2B 7b75c0ccd1471688d1924d03d5897e9cdf34abf54338cd21001c78c62d7edd767be57e56e879aed87db67cc2165af350a07265f54836484e86a2c73cea2a6a94 SHA512 928941a5dcef6a4dbbdf75e59929e8ed17fedbd130a24499f11794211f9f9f7717e5641e153d4afac5e85f277dbe3a3eb4be1bf044cec67db0f7a0dbcdcc602a
+EBUILD gr-rds-0.0_p20200807.ebuild 1402 BLAKE2B 2efdbe01f9d9d67a8fcfb046da10dd0bf7a65e1bd02111126090df4da7a6660b8af6fa524847b5bfaf98772047f182e1c948e6d2c62aabb3d331292e1f8a6309 SHA512 ac5cd7087da3e031061b09f22ac9ee1e061fa806e276beb70d46220b21ca2498a89baa211dcadd8d35a6b236e1af963519f770e1ba5a3e77473e5ddcfea29d0e
+EBUILD gr-rds-9999.ebuild 1402 BLAKE2B 2efdbe01f9d9d67a8fcfb046da10dd0bf7a65e1bd02111126090df4da7a6660b8af6fa524847b5bfaf98772047f182e1c948e6d2c62aabb3d331292e1f8a6309 SHA512 ac5cd7087da3e031061b09f22ac9ee1e061fa806e276beb70d46220b21ca2498a89baa211dcadd8d35a6b236e1af963519f770e1ba5a3e77473e5ddcfea29d0e
 MISC metadata.xml 318 BLAKE2B 4eb17bc98ea42ef37762bf7d0017492b32e7c8837065ffbc615597e3153e20baea76501b2a43635abab8ef542f55ddde1f5bd30331741c19c9814ac8d58e6d87 SHA512 c6f75244cdb565c0d0b8653ffa05b5d4cf9af8faf56c54ee9e4fa2a8f45a031b28bdef22a52bd66f0b26f9cb2dbedafb4ca0ac3d5a6c3f8a11f6b39f4ea37a30
diff --git a/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
index 2f2eb3797c78..8006fb8a3380 100644
--- a/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
+++ b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild
index 2f2eb3797c78..8006fb8a3380 100644
--- a/net-wireless/gr-rds/gr-rds-9999.ebuild
+++ b/net-wireless/gr-rds/gr-rds-9999.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
diff --git a/net-wireless/gr-scopy/Manifest b/net-wireless/gr-scopy/Manifest
index e599b52b4a1b..dd9eaa292f5a 100644
--- a/net-wireless/gr-scopy/Manifest
+++ b/net-wireless/gr-scopy/Manifest
@@ -1,4 +1,4 @@
 DIST gr-scopy-0.0_p20201005.tar.gz 204034 BLAKE2B 17d797822c7920186a6d875119d582fda7b74f9c23248d9821ba172f59b1df1433520e723e4dc6b1eca1f08fb7256893767794b584d7c0bd53aa2ede80cd2b92 SHA512 12c0e76008b0a7570a85707afe28a102541e02f10a55346c76cb7984e8435e20281e6406c86ee22e8b4fbe0211bb6657f88f36bdf6b3b76d4e24b2a3f12e6350
-EBUILD gr-scopy-0.0_p20201005.ebuild 837 BLAKE2B 0f47f5356fee552c1b2cc9b1804d0b3f9e98019449544dd045e368a39e1b09a0e6ff4ef1b11e5ef4cf7d554a2089dac68779d2e32a136e4e81d2575a637439f8 SHA512 11970dda24f28b31be6c24b705a1764f319be09924ad3831ef63403a0f93ab6d8520cf6d92b80879c3b60133bed0e1b182a50690ae2da8f7e3daa0da305ee178
-EBUILD gr-scopy-9999.ebuild 837 BLAKE2B 0f47f5356fee552c1b2cc9b1804d0b3f9e98019449544dd045e368a39e1b09a0e6ff4ef1b11e5ef4cf7d554a2089dac68779d2e32a136e4e81d2575a637439f8 SHA512 11970dda24f28b31be6c24b705a1764f319be09924ad3831ef63403a0f93ab6d8520cf6d92b80879c3b60133bed0e1b182a50690ae2da8f7e3daa0da305ee178
+EBUILD gr-scopy-0.0_p20201005.ebuild 840 BLAKE2B a154cc758d473c91c3bfa6a7c9827b8acf85030c09e8b0bde55380daec3e42fb02d714c4c39032b2c1ccb462db385c3d1c0368401906b17665d3e8121c21aa9f SHA512 752d45d8e611d775f9ec2e6194f44b616c1b30efb563059dbca9e1ffd7e5287e011fc2fc74d63b2c1ef986740e20a77c085ec5849106fc701601eb4fb52dc1a0
+EBUILD gr-scopy-9999.ebuild 840 BLAKE2B a154cc758d473c91c3bfa6a7c9827b8acf85030c09e8b0bde55380daec3e42fb02d714c4c39032b2c1ccb462db385c3d1c0368401906b17665d3e8121c21aa9f SHA512 752d45d8e611d775f9ec2e6194f44b616c1b30efb563059dbca9e1ffd7e5287e011fc2fc74d63b2c1ef986740e20a77c085ec5849106fc701601eb4fb52dc1a0
 MISC metadata.xml 437 BLAKE2B 4a35ba663d2d8461738010b5f761fe998cbd778a39570ef834dd9ce758eb53b54abca782ef218fa89f536ebb1bf8e0de398b3e6711651d4df4aa0f32a27e4481 SHA512 2a44d3f8c5c72c69572e78427ee8ffd4bfc202a63e159e82c0b3f393d80176f473caf69d5460c217e602b44f92dd05a008c340014b518afeded662baf01c90ba
diff --git a/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild b/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild
index c81545717d41..f633fe307051 100644
--- a/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild
+++ b/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit cmake python-single-r1
 
diff --git a/net-wireless/gr-scopy/gr-scopy-9999.ebuild b/net-wireless/gr-scopy/gr-scopy-9999.ebuild
index c81545717d41..f633fe307051 100644
--- a/net-wireless/gr-scopy/gr-scopy-9999.ebuild
+++ b/net-wireless/gr-scopy/gr-scopy-9999.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit cmake python-single-r1
 
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 84a7e4af60d2..20f3681d6c71 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,5 +1,5 @@
 DIST iw-5.16.tar.xz 149548 BLAKE2B f5c27cd92c0a5404b73992c178d611e3c78b71369f97fab1b617cc83a9951cdcbcc00bfb20cc6a8f8d08a6bef16cef7d042fc5ed3139e2fd40aa3392f66e37a6 SHA512 4537a7844b652b890bdafd21ff087137e04cb1b8c9c352c33ef15476c08d02fb530b7a2d920c6c581529bba6a62a9eb5460d04db8917426fb5d759033fd55408
 DIST iw-5.9.tar.xz 145296 BLAKE2B d7abe6c65d408a7570227dbe69fe11e1d72a1f502de21d1fcb7dcff6bfe229804020d5c1ebdda42a3694e31cf87c631faf089746f8df4733b0b1a459c185e2af SHA512 08b0c8d92c7e695bb2a107b89c3cc406e8386393b65ecbf96ded6fd757043ccd12bedaa90c14138e03e53f107365d04e229633c1cfa024ecab5fe993578491be
-EBUILD iw-5.16.ebuild 875 BLAKE2B 06bea5f4f42997c5f740bf6f44f31d58568ba2abd2a0251d1ca95891412c80866c212f120453933ed81083bfef8ed3b5a4c60c868609891b4949e12cd969810b SHA512 d587e51049500a78c8b1f2a836eb4e2d1f0432f117793fb622412b3e29d2cfd21d0b3e7f2de0d42f746e5e6c4d2d085c3f277c5c050bf73512291fbd7f2dee41
+EBUILD iw-5.16.ebuild 882 BLAKE2B 0960690c6e96d3c6b0a00d343e48ef473f1adeb6dedece98b7162cafa80060ce679e625753fa2199f07571102ceab9cf565c27f66b01c74e5d2855e05ed73bde SHA512 8c0b2c9bbfc41cb48d99b6581905299fcec993be08982a385339c267095bcf2011a6854e26a1d6a8d23d0753525c88a7fb620bed765417a293052669b86bdedd
 EBUILD iw-5.9.ebuild 862 BLAKE2B 22b2c65957b58261c1ae778d5b901bcd69eb96e58d2f381c6c538f5973c55f0383a530f2fb1a207e0fb72a6e99aa53c4e30fed547a61c42a32f40e69ab47800f SHA512 ca57a9d4623eb36b98bcfa82384b68ab811c1ae85c407b14ec2eadec8fc4e6833e4143e53d89a9469fc8a2b5ec0ebc991a22c905b2680920b6c1a8ec8aeb674b
 MISC metadata.xml 326 BLAKE2B b542a288462866aab338ad36546026aa12ce0c8b0e8abf2eff3cbff0bd591c6402379d68df77686b36524f1127ed0c061f57f223f4559f4456728009226a663c SHA512 32b6a69e2ad35466321ffa8ae5a9ffde83f99b64b91e65ffca3662fb7dc3c6c2d7d46acb0d8da40e46de3c1b9764abb836bdb0934d727837c4c7d5bacd501a0b
diff --git a/net-wireless/iw/iw-5.16.ebuild b/net-wireless/iw/iw-5.16.ebuild
index 64bfb8cfa1dc..d7698616f612 100644
--- a/net-wireless/iw/iw-5.16.ebuild
+++ b/net-wireless/iw/iw-5.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/libnl:="
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index c2a518007894..ea7bc886b0ec 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -3,7 +3,9 @@ AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.26.tar.xz 1005532 BLAKE2B 8e12ecdf77e6d6a99477605aa727609f55a652af2d1f3a028812d352ea8aef5465c6c6063a6f9ef92ce940a34c44ce7bf77dcd6895173422d984eb3e61636d72 SHA512 b3fc002ca1da4edaeaec88142226b978991fa93dc65b7a79057514a4eb88e620e08a9ea22b49f8efe6707dcd94dd556fbaafcee46de2de19ee9163bd9e95d197
 DIST iwd-1.27.tar.xz 1007432 BLAKE2B 0df0e5a8cec660521c44ae37102465bcc45e76805e65c76e48d6325b40484cd30d436db8c656d2f9bbd937c3f614de59d3a066642aa83f48002124bf334dbd62 SHA512 9027b20e22ae89a188b428eb84c5266ae242d8cfda452ad93db0cced8713d4f861dd1daf761632d4d2e9732d754db3a708d403a57f10c9ba3d76e23b7585f0c6
+DIST iwd-1.28.tar.xz 1014588 BLAKE2B 2ca8edf3b9e038cf8a7549d76253bce42f66b4f63644433b84dad75cd51a817efdbf1437ec9c65731619d48d549cd1e89396a2609a9e31b5c73f6a16fb73e104 SHA512 adde7772787840e0a46e0068fe0bf5f22191fd32b2f16bcb10dbaf5e9c410ae1caa1479a9851bfefe264a8b29ca24ed6d58457b9351316afea62244de2d6e08a
 EBUILD iwd-1.26.ebuild 4935 BLAKE2B 50bb7464e3d19a7ce3ba80e4b5bb4d81077199aeb31edb622cba6914334542282be1e3111b4c85b72a62f63b319be49a14b34ef9b502b211379ebb776a6966fd SHA512 bf690f5252bbbcfdade837263efb51cc4403714c2686b71917cf7ad2ef80e48173452ae5a80b849c0303a1e37de003b1dce9826a25f46c77b3cb11918a7a69d7
-EBUILD iwd-1.27.ebuild 4941 BLAKE2B cdd43051e2432e4375bd6135500239899f16cd4b4a114452b8206a2717027076f64a7bee24a04b39990d077082f0f310894b5e8a85e7e66b98b4ff49804eb991 SHA512 0bb10695cbf539fe5bdbed4f9def3602deec66dad9fbd3682aca8078651ee10c60eda64cf8b51853ac5380b1aec779d867a935c7184f3999a0a98402e26ca3fc
+EBUILD iwd-1.27.ebuild 4936 BLAKE2B 23b35872c6dd7e18728050f418fdc572a241b001f64984c043ea111b240b1a64eefdbdf1f28764957d69ea4ec4160bf13a360ab1a912c76e0c2c042116887bce SHA512 2d64db8a88992734ff8432cb1804c01667ec48e59fc5babea41c59b92d5fdd950fe6b4a2b83ef526be2bd252b4923bf97339ee2471e68e31b7b9af322a7a8c43
+EBUILD iwd-1.28.ebuild 4941 BLAKE2B 8b4bf0350810881b6bc332ed014aad1564b3adc7f3940ea66a5141262daebf7793cfe5b97a6b1056599e0546d96af04866367863d43f82f2f8fff669c94c6834 SHA512 a62f56496aa610443e995bbcaa97530906889334096058fb28823f1061a1859998442e5ccf07cf75129b6c7de0b6cb27c348f7e960b1071981c04389cce69797
 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.27.ebuild b/net-wireless/iwd/iwd-1.27.ebuild
index 681a104a6cb0..60cd4904ce15 100644
--- a/net-wireless/iwd/iwd-1.27.ebuild
+++ b/net-wireless/iwd/iwd-1.27.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.28.ebuild b/net-wireless/iwd/iwd-1.28.ebuild
new file mode 100644
index 000000000000..be875f7b5a74
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.28.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.51"
+
+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/iwgtk/Manifest b/net-wireless/iwgtk/Manifest
index 129f3a30cc18..28a48c6152fe 100644
--- a/net-wireless/iwgtk/Manifest
+++ b/net-wireless/iwgtk/Manifest
@@ -1,3 +1,3 @@
-DIST iwgtk-0.4.tar.gz 103988 BLAKE2B 0a848f805509507066e9eb97c1a3ccd1f3e441a6a01789b7ec291a12f67a619227b7845249342c15301c755dd6e3594379a888d278dc71c20cf377322f9969a5 SHA512 7a6d55493fe7cad57dc8338aafe48236c1ececb688a64cbdeb5748c60f5d109ae7912182c6d4df094588baee2aff3bd5481f82a80c4c267283a5067a0127f9e0
-EBUILD iwgtk-0.4.ebuild 828 BLAKE2B 02a2666efee59ffd6324f87a84165e50ea36cd6e7a8780db9fb5e9a09e61063ba8dfa3ded0b651e35945fae3a98b59f514096ffa196ae61f34dfae46e2de14a1 SHA512 b23ccbd8fe802913fdd1d5597f2b810b37aa3161b04e0f88ec19b1c650bc1c488cd54787eac3dd8b154ef4e14bbcd0a8c824612bedbe12d628d9faca1c94acef
+DIST iwgtk-0.6.tar.gz 112522 BLAKE2B 8366b79d4d3b386187815ba787340d2e90d1a94779ec88a4fa807fbd310a77acf6651e49f4bfd6bbae76ca99765678bd643eaf9bb584b8fc75c812216d45aaa9 SHA512 79874e65d7673100f9156e183387ed0e744de153f8ab3aa3295347ed263b53cd6109e1b7e2d32e7b735a4d09d60235a1124fa244beb989fa4e86044cf7547fb1
+EBUILD iwgtk-0.6.ebuild 837 BLAKE2B 64bf4b4b2ea4680877e95b3fc35f798c57c77a64fc0811a97a606824359f2a13165941f8962d4715993a21456948983f9ef6dab4721ad09a5ea77ed5d17cdd6b SHA512 ea0768894c6eb56ae879b979a675bc3c06a32a11b4d429f3c677bc27814fb3c550fbf3fb216b2fcb807916b0ad52e74986a2835ad879286903accd4f7638db79
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/net-wireless/iwgtk/iwgtk-0.4.ebuild b/net-wireless/iwgtk/iwgtk-0.6.ebuild
index eb3eb819b7af..acd1ec9a8514 100644
--- a/net-wireless/iwgtk/iwgtk-0.4.ebuild
+++ b/net-wireless/iwgtk/iwgtk-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DEPEND="
 	dev-libs/glib:2
 	x11-libs/cairo:0
 	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
+	gui-libs/gtk:4
 	x11-libs/pango:0
 "
 
@@ -38,6 +38,6 @@ src_prepare() {
 }
 
 src_install() {
-	emake prefix="${ED}/usr" install
+	emake DESTDIR="${D}" PREFIX="/usr" install
 	gunzip "${ED}/usr/share/man/man1/iwgtk.1.gz" || die
 }
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index 5b70a4d60a6e..e5567d29c5a4 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,5 +1,7 @@
 AUX no-newline-in-description.patch 747 BLAKE2B bae0c3b6cf3997c98571f404e323a4eb0a2f47b030ade62a775414b061b4f3541701999418b4b81302905e1720ef8711c9b4f2d62fe89281f17ce7d8300d285d SHA512 20555c3bde0bd0a2aabef3c2fee44b453f89eac16820442aecb92f58a3e786821b56aab1730b2669b0500302c4bca4f56200c292cfe86ca282f40d38550646c8
 DIST nanovna-saver-0.3.10.tar.gz 477821 BLAKE2B c41889c1421642c7df55e470b7a45acdf17483203a133d909ca3323150bdf1b712af42c1c28981c8171535fa13dc3573218a4872139f72a447ce29a1f7921b35 SHA512 47a13673aa5639bb3eabbf55a183a19b611144710041a7a4dac4782b4f022f0a316453169a210123c4f26dab1a19af27be37cddcf641d8aecc266396b8fa6eff
+DIST nanovna-saver-0.4.0.tar.gz 488898 BLAKE2B 3c986dc9bb128f21e9bfb7cf28e12df1603168755dc4d44df8699a2e6ccd9343a6526583e48ad514a0d24cad9712d160c3c2570d743bb0f4dbdb0782f6a4f263 SHA512 24ada3374e9ccaf3b07efea09e1b4a2fcb1da54949b5d53dfd2798b9d296c1e05710085821fc52d7c1842a485d78a6bf8a7e85436ce93ad95c1b28fbd544f132
 EBUILD nanovna-saver-0.3.10.ebuild 988 BLAKE2B ce6f3e8c44d22f328f46a31f32e891012a707259927ee5eb8fc444dc8fe0251b85a9253ae42f7082de9024414eba46f76e8b4aa36408e36dc099f9d120488c09 SHA512 79f0393c182da6e55427043e6154795d64686eaad186bc8760a38f1e7fa12df26e59753ee87af3f9bd00e7e977d94c51fa85c38191c70764aff9bb42252b3cb0
+EBUILD nanovna-saver-0.4.0.ebuild 929 BLAKE2B fa1f78236545297df2c3d8bf6a0b7f486920a698041bdfd9dc1768540d781643fcde695497308056854c8f4b7e19155d252244ea7d7749b1227ab50a7464fbf7 SHA512 def742148f2b5a2c3041dc210f928bcf30646ec85f4fd9f694fed0349bc18c475cabdc1e3d41b45347de010b5b5efbb29f101fe1f9106497970d6aff41f066be
 EBUILD nanovna-saver-9999.ebuild 988 BLAKE2B ce6f3e8c44d22f328f46a31f32e891012a707259927ee5eb8fc444dc8fe0251b85a9253ae42f7082de9024414eba46f76e8b4aa36408e36dc099f9d120488c09 SHA512 79f0393c182da6e55427043e6154795d64686eaad186bc8760a38f1e7fa12df26e59753ee87af3f9bd00e7e977d94c51fa85c38191c70764aff9bb42252b3cb0
 MISC metadata.xml 543 BLAKE2B 04c50e81948a367bbe842cc1471471c482a5f813c90d7f98fb5af27868700496d4edc08aabd9d4a0674c556a467ab03a83f7b356039b1fc92e41e301e682f739 SHA512 e250acfe7bae2e5673270f4af746aca72a3d50b5b248cd70cf2a2f87aa30ce74d505fbf806cf5f7809be1aafad631f4e68a83aa13622dfdbbf498107f888bcab
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.4.0.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.4.0.ebuild
new file mode 100644
index 000000000000..e39815a71fc2
--- /dev/null
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
+HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
+SRC_URI=""
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+python_install() {
+	rm -r "${BUILD_DIR}"/lib/test || die
+	distutils-r1_python_install
+}
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 9d587d84050d..6c001aaa4423 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,6 +1,8 @@
+AUX rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch 423 BLAKE2B 885b014e776f0342d147e066b879d251a99850f86c907f573e7c89364bf04b2103de95c66c866dd6572c71ab91506760e72e9fb5a7777dcb637c3062562c061c SHA512 f559e5d72b36f9abe689e4726fb6b0b1ab571796acbca02d8b49d5e568f567fbd73579c3b8f0cfe343cd442dc7141d7743f9ba0a795f66e791239f65cb4859d0
 AUX rtl_tcp.confd 138 BLAKE2B 04df300f0add96490ab861d99301b53ae45d414891f808780f79ef7c6c1cd7b0a48696510933b0cb8fc04c65ef4b2cd23109bcf266472225a8ee4a2ff430d404 SHA512 48324164cc7adab2e7c7f44b45a3a590ef9bcb161b4f6b22a94b4c4abf989b353a37c7b28ad1d81ffdff96dda84c10ba36bc9948f70a6b1f1c767394dc03ab77
 AUX rtl_tcp.initd 483 BLAKE2B 1e2feb9f481677792319b60fa99d0a2ed5c4a489c85c97a3a0e54e65fc8fe0c4b1ed8c1c6d4ea5991736fa232d26bb17b3e31fa8e6d01c111ec4ccae4c9df924 SHA512 7ac01b0568b1c12e906ae0d102708070b9aacca97d590b61d80125dac9f84587438fe5b582765552d37b0a9b730e00fca8894f8d5ff0c6a518fa2fb5dd4fb407
 DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25
+EBUILD rtl-sdr-0.6.0_p2020802-r1.ebuild 1583 BLAKE2B 13adcf9c4fd65c18800e0177fb4be3c20721d4b8b1705db6e6ab092cfae23aefca0b7e7b228c935f06d39e933c7d682564dc3cc27a8d0187527fde52f196080e SHA512 b921b52eacca787c5fc5add6d1a5e31b2cc58d5a57bc0a2a863d7f7c35e27f5b6748600cba28dd4241ce4fcb8651b19ef596568bbc5d07093f81d8b690c2d0c5
 EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1597 BLAKE2B bacdcdada679b958ec906cce9e50d79007a247bbec5a4222aa51d57b453de3c6516e95b07b9996057371522ac9ef04c51a021ce4cedb5dfd54a987f108c34ff8 SHA512 66509ad51b2ac62490257901eb919a50617204f158bb21fe5b0370e194232e9b2ed2c11f8af3b96d5b23111f6e516c46dfcbcc135bb5f6d740c42485100935a7
-EBUILD rtl-sdr-9999.ebuild 1603 BLAKE2B 33a129066b5b6b9c137f49b43912f81a5c477d443cf7fd58f3f6a3181689c421080960a4cd30ada8f77a2682011e9f2af022871d49445fd3b858b85f8f68f3f2 SHA512 17aea001e8fe4a4259161051f7125daefaaa13da4b77c0e10a8696874c390415fda5de68cb7e2f145d5fb0eaf1d91204982736325124021cdb5ec38693bc61d7
+EBUILD rtl-sdr-9999.ebuild 1583 BLAKE2B 13adcf9c4fd65c18800e0177fb4be3c20721d4b8b1705db6e6ab092cfae23aefca0b7e7b228c935f06d39e933c7d682564dc3cc27a8d0187527fde52f196080e SHA512 b921b52eacca787c5fc5add6d1a5e31b2cc58d5a57bc0a2a863d7f7c35e27f5b6748600cba28dd4241ce4fcb8651b19ef596568bbc5d07093f81d8b690c2d0c5
 MISC metadata.xml 327 BLAKE2B c850854368e94999292623351c2b09508b49ff74cf8a3cde1872340347a07766ead3427ab6445fde90788e1a0b264a53829114633c515d4b0b30713a65a3739e SHA512 7770f1736d4207f81194646409e8a971c4ee97a9b2285eb67aef37bc7ec1002191e775ee7b489726580f86b5be8d8d8d8f82e84b37fb480c364c29e5e77f683c
diff --git a/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..b71454b87828
--- /dev/null
+++ b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc39bc3..4833602 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -160,7 +160,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix \${prefix})
+ set(includedir \${prefix}/include)
+-set(libdir \${exec_prefix}/lib)
++set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
+ 
+ CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/librtlsdr.pc.in
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
new file mode 100644
index 000000000000..b00901863baa
--- /dev/null
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
+else
+	#git clone https://git.osmocom.org/rtl-sdr
+	#cd rtl-sdr
+	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
+	#SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+
+	COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5"
+	SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+zerocopy"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
+)
+
+src_prepare() {
+	sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_configure() {
+	#the udev rules are 666, we don't want that
+	mycmakeargs=(
+		-DINSTALL_UDEV_RULES=OFF
+		-DDETACH_KERNEL_DRIVER=ON
+		-DENABLE_ZEROCOPY="$(usex zerocopy)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp
+	newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp
+}
+
+pkg_postinst() {
+	elog "Only users in the usb group can capture."
+	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
+}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 4f87f3a82cdd..b00901863baa 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -1,11 +1,11 @@
-# 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
 
-inherit cmake multilib
+inherit cmake
 
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
 HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"
 
 if [[ ${PV} == 9999* ]]; then
@@ -31,13 +31,9 @@ IUSE="+zerocopy"
 DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
+)
 
 src_prepare() {
 	sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
index 34cb2afd3c73..97a33facd091 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 1318 BLAKE2B 03750eb08eca4dde8ff9f6b3f3a431a604967046ad2a0e88cc02457e8e6fc4cd66a9dde1a21e93669290af0a7b96107af51be6048cd3366451df8c0152d9ff82 SHA512 3614f12c92f50047c8ac854415c8043c801ea0904f42a9a7c4eab36f501a9c436ad85587a433bf1b9e465e415314997de10c875fbe3b0ebd1b8ed4a2663ed8a5
-EBUILD soapysdr-9999.ebuild 1311 BLAKE2B 7ecf6db0f217bd6a8cbc28d538ec986d08dbfba0515394bdbf217ac0b8d8cf92a515d11075e2d591c37d7f834d40441ffee906cffca9a09f976acc1c72a716d1 SHA512 947208cd5c1e16964af2e1e45770a1bbe936f0b98b908098da90c561e3b1c377b5b7c33a0d6ce3fad4ec28fc7618b602e65781b3d19b42d916cf96a41b343536
+EBUILD soapysdr-0.7.2.ebuild 1321 BLAKE2B 438276e9bfd37cf5635ac13997fed7af76ffc2723fcf7f3d3a132b8097d74cc8a249e54aea68330a156184eceb2bac3ba561bbba834153f90b15a5bfa1c9ed72 SHA512 da6a3e665a8c0f5b6a6d9ba1c309e4d69845975ae56bbab96ebeae3f4701d04f21ce489c28c7763ef627421e650db82fb5e4ef35b5b559f6598678ac154b1b30
+EBUILD soapysdr-9999.ebuild 1321 BLAKE2B 438276e9bfd37cf5635ac13997fed7af76ffc2723fcf7f3d3a132b8097d74cc8a249e54aea68330a156184eceb2bac3ba561bbba834153f90b15a5bfa1c9ed72 SHA512 da6a3e665a8c0f5b6a6d9ba1c309e4d69845975ae56bbab96ebeae3f4701d04f21ce489c28c7763ef627421e650db82fb5e4ef35b5b559f6598678ac154b1b30
 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 f9ebcebd59f1..7c13d7f933c0 100644
--- a/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit cmake python-r1
 
diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild b/net-wireless/soapysdr/soapysdr-9999.ebuild
index 0d446573c63d..7c13d7f933c0 100644
--- a/net-wireless/soapysdr/soapysdr-9999.ebuild
+++ b/net-wireless/soapysdr/soapysdr-9999.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit cmake python-r1
 
@@ -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/unifi/Manifest b/net-wireless/unifi/Manifest
index ee172c2f22ea..e1a74cefb7ca 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -5,10 +5,9 @@ AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb857
 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
+DIST unifi-7.1.66.zip 202065717 BLAKE2B afab055746e961b648405519f3ebd339e103e212e552843f453923237408a5e19f4d7041576eb0eb7ffa6fbdbd929975e54984f70bb037bca8c5ea4229c34677 SHA512 3e3cef3a2bde99f6172ae17499d2ce2ca69143ebaefc22d91129f2fb61a44d620485008763de3775a125dfb1244891e704b4b265bf7db36491700c0b5b47ba70
+DIST unifi-7.1.67.zip 202078626 BLAKE2B 3fb7c2fa877ea61e44d2a455494d47099282c91e9bb515a9995d526ea5624d893e09534f305c5c72e011a98075990fcf1323e6bf1fc1949ef0d663c94f019a59 SHA512 3926d0c56f6b5e16f8da98fc1b049e0382c0cc785158955ca2b5ffed0fd464985bbc551694dc2b037b3fccc2867f2e875842791e541daf51b9f52678594ff359
 EBUILD unifi-6.5.55-r2.ebuild 2471 BLAKE2B 85ea582f14c30db8c8fa3f02057f8ed8c506338860b1c549ce7e2192423c4be8a087c19cdec05079731b8bfa045c63edc094e740b5ad7b0fe987635319aac7b5 SHA512 395d780fa97045cadebc193ef391576c5def6f06413940857902e792b5a39dceb93f7ee8a8b2d8162df395c132bdb89490460d2fa69191f6b87cf9282b6e7f7b
-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
+EBUILD unifi-7.1.66.ebuild 2769 BLAKE2B 7c2326a144174dc42118eeabc337c6f815608de4333e08fba6b2d66c6b7a5acbe5711e6e3fe06175c571961d23fed7ece194af9c97f31eebe9686b3750eed8ed SHA512 41f186f8dfaa426496e1ccfb2a7c7e8ccf0e11c56172e1806fe2ba503fd93470f37f092d0fa4c6f3cff5b8af072049d0c5d3c571f56a2bf1e418438bf7a4e50a
+EBUILD unifi-7.1.67.ebuild 2770 BLAKE2B f4caf4508d33257d3aade6c9e2865512c8de037f7e468b51979e521bc6280abb62f6ec9589c02549fff2738e9f0f976e572f1224607869f29b00823b152db0c2 SHA512 d896c1cdb8540ba6b018108f619c7b7e36a201fbcfcde52790e56d20ee858f1df8853e2916796447def7fa907219564828ac0a784a2a3128f2aaa3ea194531a3
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-7.1.61.ebuild b/net-wireless/unifi/unifi-7.1.61.ebuild
deleted file mode 100644
index 381eb27e03dd..000000000000
--- a/net-wireless/unifi/unifi-7.1.61.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="-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/unifi/unifi-7.0.25-r2.ebuild b/net-wireless/unifi/unifi-7.1.66.ebuild
index 88d448766424..73094f66635f 100644
--- a/net-wireless/unifi/unifi-7.0.25-r2.ebuild
+++ b/net-wireless/unifi/unifi-7.1.66.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 # Set this var for any releases except stable
-RC_SUFFIX="-43e7fc6711"
+RC_SUFFIX="-c70daa41cf"
 
-inherit java-pkg-2 systemd
+inherit java-pkg-2 readme.gentoo-r1 systemd
 
 DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
@@ -16,7 +16,7 @@ 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"
+IUSE="systemd system-mongodb"
 RESTRICT="bindist mirror"
 
 RDEPEND="
@@ -71,7 +71,8 @@ src_compile() {
 
 src_install() {
 	insinto /usr/lib/unifi
-	doins -r bin dl lib webapps
+	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
@@ -84,8 +85,13 @@ src_install() {
 	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
+	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
 
@@ -93,4 +99,9 @@ src_install() {
 	doenvd "${T}"/99unifi
 
 	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
 }
diff --git a/net-wireless/unifi/unifi-7.1.61-r1.ebuild b/net-wireless/unifi/unifi-7.1.67.ebuild
index 1db40a1dd013..ce8c0ede1d75 100644
--- a/net-wireless/unifi/unifi-7.1.61-r1.ebuild
+++ b/net-wireless/unifi/unifi-7.1.67.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # Set this var for any releases except stable
-RC_SUFFIX="-c7eb1400e2"
+RC_SUFFIX="-c58de44a45"
 
 inherit java-pkg-2 readme.gentoo-r1 systemd
 
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 381009d1657a..6a0b68cb01b8 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,7 +1,7 @@
-DIST wireless-regdb-2021.04.21.tar.xz 24944 BLAKE2B 4af782ceefe67c311cb90d1f64d830d9e5d2ccb7bc1aebcd8a176079522c21f1d8ef70cad0bd7223e9d56d46e6d20030af2349da9944d7ee3590bad28aeba467 SHA512 0ffbee04ec08c2025a34b60adc11198d64cb258a6ce53caf758667d25b733a242ca592d76ebd08e5692047917f5f42bb67a176f67a7d6bd11ad9178378cd0d26
 DIST wireless-regdb-2022.02.18.tar.xz 25908 BLAKE2B 1237537a5d9ed249cc53b838b65effa83ceecd06bb76b11388a6c7673cd61322026617f033bea53d024f15a58ca19c4ab51bb624f2ee8fb1f2233b8e99140d4a SHA512 133fadd331dc0bd3f23e7dab54c3dfb1c55d8271bdaf9f393207fccd6c4d1d3d8f6428c1bebad54b2f3fd4837c4b6930b2fb33b3dc07abb53e41bdc8a54d8de4
 DIST wireless-regdb-2022.04.08.tar.xz 26308 BLAKE2B 30d3be06709c9dac3c034ded733f24a2261be06adfb9723cfb5bfec79439b89383be8b2d2acb41ea98c2138532b227b8fc14ba92512fa40b61ae7c3294d9a284 SHA512 328ccd6df67241faf03674820e4f799572764af580254b3aa4c834a9535a2732d303bcfe3ce503404f608074849424f1f8599b0f567dc00d7393dbcff7f07cf8
-EBUILD wireless-regdb-20210421.ebuild 1092 BLAKE2B 903e8f7006cc68a0db74946817b0feb50a892a7bcfadccd089007d8675a192bdb3bbf5425eb93cd9a944f609a8c1536077c7b037879ea51b6fdd0ad765ab96d3 SHA512 f18b62524a6605b58df9cd4d30e856ebf45a9148ef8d2a53f76481412b7e832a8c956ed10ba6dd62af469e5f97ff6bcca9de5b7e369108f7460cb956de98da61
+DIST wireless-regdb-2022.06.06.tar.xz 26636 BLAKE2B e7695b1d4173ec239645a1f9c0bdd8f9cef92da86d918f3b2a7904487787b1a8b6fce5a75d0b7fad7d8a25f1419a4771e509977a5e3b13dff03bc53e976609f6 SHA512 ee6e79eeef3bf995120d31741bac9592771cbf918401f83d0ee059ba4119f7d9667607c5218bd9eeb0011dd7083264cf39a1a0ad3ebfd37dcfd957b01f248e0d
 EBUILD wireless-regdb-20220218.ebuild 1092 BLAKE2B 5a8e4d26468e69a0901fd938bf6681afb86d50c74af038afb57fd992db0359bc748e24bbcb3e2d9997300df62cdaf83a6aff9d73435f1938f1dd84e93947c992 SHA512 849fa96f1cc4ebfe66604af7ab1647846bc9f45c2c4056dbe278c42e9e003a694aad4c6ed0de366e4ca996a18e3cadcece569516f0d5a2cc705130c189b2c4cb
 EBUILD wireless-regdb-20220408.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db
+EBUILD wireless-regdb-20220606.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db
 MISC metadata.xml 272 BLAKE2B 2a42142ca287ab19668cc11278dac4d0f16bf5b183646b0f06317a6e60568d9328d42baa986af6c692a256b28fdef32f24442faf69ae9b8305d625a3265df298 SHA512 4595277c33cd3d565c652cae1644c4ba131dea25899984629a48dc9a679441c95a7d26527c6fe4578a3e6f616e6f8c25580ee9f785fdcbd699bd43bacd846dd3
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20210421.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220606.ebuild
index 9b1cae71b9ea..3f15ef755143 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20210421.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20220606.ebuild
@@ -1,7 +1,7 @@
-# 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"
@@ -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/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index 3e28b29c670a..5e76e2a3fa9d 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,4 +1,4 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
-EBUILD wireless-tools-30_pre9-r1.ebuild 1775 BLAKE2B 9278afd1fa2d93cf373fa0b967b80d0df9d5b043373f5eeab2596f3964478e8483478b219edce3cdf8ec17eaa2ad8cde812aa9f0391c4c622186e76044914c0f SHA512 a2d528033815a89b815cac3521fafeee77be062f1a94dfac2b6a55239a36599f584018cc0f5b7646583a82bfba3145f986b8fffc54dbe3c117459cb57e6e75ba
+EBUILD wireless-tools-30_pre9-r1.ebuild 1782 BLAKE2B 8d54d20e26ce3d488711a0bad71fe67f664bedba443afdc81d55e10b3322d8b632e771cd9752bb6dc1deab7cbad8923055c627b0293db1e52aa51a74f9fd754a SHA512 628317fc715422f3df3013e2af566453900bfafda2b310ef5c5606914aea393a011c4f3d0b0569563e5178e08f09899183aaf056fec210530a5aeee739563496
 MISC metadata.xml 697 BLAKE2B 49b4a8fb43270acb9e9e935a31ba670c60cba6ade3cbe51de2ea1a7165e3886ea0c5666e1973868bb46b5aefef1d943c61eec679fc6144deabc6d50f6c0927e5 SHA512 1da3440c13f6bcf3553b24e5902eb763b0422fe94a8c7d1729708c49fda1fb765a2abca702a26896f66f80fd1b5072d61aefc6d4b9060d50e56c5d4209e80c8d
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
index eab11bb62017..a3ab61e504e1 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="multicall"
 
 BDEPEND="sys-apps/sed"
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-wireless
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)