gentoo resync : 16.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-16 13:07:24 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-16 13:07:24 +0100
commit: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch)
tree: 464c922e949c7e4d5d891fb2cdda5daee5612537 /net-wireless
parent: e68d405c5d712af4387159df07e226217bdda049 (diff)
50 files changed, 115 insertions, 781 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3a931f021424..505f292e2865 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index e90936aa650e..6ccc2e812c96 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -14,5 +14,5 @@ DIST bluez-5.64.tar.xz 2175148 BLAKE2B 828c620330d1993d5c5c2a865f2d27a29425e3583
 EBUILD bluez-5.62-r2.ebuild 9103 BLAKE2B cf83b34b46fcbaecb4d1a2d2e583b34d67534d18bf7ceeacbee589fda4d2d3bb9be4aa6bde8cbbce3311106c55e14d3eb7136c1c86cf4943dc3b8b8e9d161963 SHA512 750e391d3dc10225288037537624bd53aea605581a3a0124979d846e7e54147b72913e2c182a4e571699c33246473a42f5e56e6af578db38e256248954a9ee66
 EBUILD bluez-5.62-r3.ebuild 9518 BLAKE2B 6094902d7b691ee93c3d45b808cd3af6967f870188cbef2dcf509880a53ae08a343255535876af6162eb4cdda610c8f8672e803cb665d015c4c22a2e5e4937ea SHA512 4e552fde3a2350bf26aceea56f79881d8d7b751d723c70e29618cf6b81a0ffe12fa2aa9ecfeebcdda6fe24a322c0425ab232c715e7081eb8a976dbd983d3b133
 EBUILD bluez-5.63-r1.ebuild 9528 BLAKE2B f34f340268f324dc3de2a96acc32c1407d933e5186a2987072bb7afb412ce3fead50378805dc0b27d9c7cd427ce0fe0131fb5101c219c1af4d62db4a98816691 SHA512 5b2ed09edb772f167266f56cec1850d0bd926b3723be88c7dc97d8d5c093aff540324a45fa04252c5b2fd35938ce12947718dae04635b8bef3dcfc2fd1774f08
-EBUILD bluez-5.64.ebuild 9326 BLAKE2B f5bc3babf4f8fc536cb442a3b3782dc2c142a9405cb14db90ef81c71df374dc5b29dbf0603695b6f1652db891c435bfbc99de38bb0422feaff4c2316e4948e84 SHA512 9839ea395fac81ee4886f784f85e86983c85ef79a531682215d1ae6d336e65e3750e78132dd8ddf2057ef07aeeb550200eab75493f4708dee6bca8f4df4f061e
+EBUILD bluez-5.64.ebuild 9320 BLAKE2B ece8e614fe4b8f2d0b295b9800a98870a561659bfe4c1bd9f7e00acce49715a39de6664bd564b7fbd63a389ffdc6223a101026592429b32195a49fc89a19bc94 SHA512 aff581a7111b617070e7514d1f288a7f10a909cdd4f693a96f02392aa64b53021e96457efdc7acbc61bae7d16675c57fa7e10246e0acfece3e0bcf6926f22574
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.64.ebuild b/net-wireless/bluez/bluez-5.64.ebuild
index 4a2ade79d8d9..9b4e71de94ac 100644
--- a/net-wireless/bluez/bluez-5.64.ebuild
+++ b/net-wireless/bluez/bluez-5.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
 IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/gr-m2k/Manifest b/net-wireless/gr-m2k/Manifest
deleted file mode 100644
index 9d94a40c892e..000000000000
--- a/net-wireless/gr-m2k/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gr-m2k-9999.ebuild 1011 BLAKE2B b2a17e24c00a4b101343abbc200591ad8ec3b9b156cf68b4e65374e6a278f85fb9822d18bb4fc44e72bea993fb0ac712b0491c901acd9a252742b70f54205ed4 SHA512 ebe4c281958a93e064bbb4b1271b61e043ef2d434bd6d101e0eced27da6cfe5e02c5ec3fd43a543f685e3c9c6e1a264b1e57b7c2749f1d6b5e6a0d9c34d6a96b
-MISC metadata.xml 435 BLAKE2B 74405fd1b2c178fc81274ae042057037bcf601001d21742818a366d7fbb0b5eca1a0810890265d98ef62bd9908e56a555bbd3ce10105d3c066c043d4bbd1123b SHA512 600ce5f28395ebf776c0135191fe4e5743b52ee40656f18f8468dde717890617447948568b0b2d5ccb6260ebb23746e8b7f208a5d0b541e4e25add0843cbc5a9
diff --git a/net-wireless/gr-m2k/gr-m2k-9999.ebuild b/net-wireless/gr-m2k/gr-m2k-9999.ebuild
deleted file mode 100644
index da37a557cf45..000000000000
--- a/net-wireless/gr-m2k/gr-m2k-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="A C++ library for interfacing with the ADALM2000"
-HOMEPAGE="https://github.com/analogdevicesinc/gr-m2k"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-m2k.git"
-	inherit git-r3
-else
-	COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4"
-	SRC_URI="https://github.com/analogdevicesinc/gr-m2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	=net-wireless/gnuradio-3.8*:=
-	net-libs/libiio
-	net-wireless/libm2k
-	"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_SKIP_BUILD_RPATH=TRUE
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	#this seems to not compile things
-	python_optimize
-}
diff --git a/net-wireless/gr-m2k/metadata.xml b/net-wireless/gr-m2k/metadata.xml
deleted file mode 100644
index 652cb6b13447..000000000000
--- a/net-wireless/gr-m2k/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">analogdevicesinc/gr-m2k</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/gr-scan/Manifest b/net-wireless/gr-scan/Manifest
deleted file mode 100644
index 29aaeb1c1252..000000000000
--- a/net-wireless/gr-scan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gr-scan-20160211.tar.xz 17872 BLAKE2B 4dc4d579e4ac3b6e713f577201fb5a0fdedceff98464cebaa4188a3d4c719660dbebbd5a2167fda6a30f3cd82a209699e4be438406bd150fc5e18119cf36599e SHA512 218c39f2143050a7315b01cac723880ef9153165bf2257ec1cb2df4837920f2609d6de98a9dd28b058528a598c4fd1f60c14d0e4ff44f021742e55c9ad50e890
-EBUILD gr-scan-20160211.ebuild 733 BLAKE2B e03c659751421054bbed7e09e6b8023873cc9d8889330633cfc5845e90f9f19100e9bda90b94380c468b404db1dc95221c4476d7ebcb54f99ef6a8e5d5c768a9 SHA512 4fd0562a0a74c1a6e14c905779b7c9d6e188b5c470a3229103aa3edae0dde33b1d169acf00f716061f234199ddffac6a205643379f2de1a4e4f80b0eaa033d97
-MISC metadata.xml 239 BLAKE2B 8a5d257499b7178bea8d035ab855e235ebbc400424ef2b15910592d72c39ccbd31f0aa62d966799ef867c5478da8a172d4f02ebdeb483333de2561af62a11705 SHA512 1b66fb2d49901d2a3c6a23d60e9f6f4d861870d49441ac076f0f150b8f918da2bf6c4bb2fa1d57a56e4067c65718ce2688496d8b4e06edbd2f65bd267495697a
diff --git a/net-wireless/gr-scan/gr-scan-20160211.ebuild b/net-wireless/gr-scan/gr-scan-20160211.ebuild
deleted file mode 100644
index 8ac634e2728f..000000000000
--- a/net-wireless/gr-scan/gr-scan-20160211.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Frequency scanner for GNU Radio"
-HOMEPAGE="http://git.zx2c4.com/gr-scan/about"
-#SRC_URI="http://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz"
-COMMIT="25030f6063e796e5cb048ffc1ec7e1914192146b"
-SRC_URI="https://git.zx2c4.com/${PN}/snapshot/${PN}-${COMMIT}.tar.xz -> ${P}.tar.xz"
-LICENSE="GPL-3"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-wireless/gnuradio:=
-	net-wireless/gr-osmosdr:=
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	sed -i 's#install -s#install#' Makefile
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/gr-scan/metadata.xml b/net-wireless/gr-scan/metadata.xml
deleted file mode 100644
index 807ec69d81bc..000000000000
--- a/net-wireless/gr-scan/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 99df9b57a2a6..84a7e4af60d2 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 868 BLAKE2B 638865456990ce2147efcef25d21a994406de9b2c45c539670278cd49a137114495d4685a88d33e2d8a7507c93d3a46ab8e262f3e186e08e2198507dd3045811 SHA512 a9c6c4cb8de76ab1d2a1f53da6c4438fb6323befb8ec73562023febb46c46c367b29aee4b47e53d458b194a562495024b2bf4b5215c300b1845b2e5cd084f44a
+EBUILD iw-5.16.ebuild 875 BLAKE2B 06bea5f4f42997c5f740bf6f44f31d58568ba2abd2a0251d1ca95891412c80866c212f120453933ed81083bfef8ed3b5a4c60c868609891b4949e12cd969810b SHA512 d587e51049500a78c8b1f2a836eb4e2d1f0432f117793fb622412b3e29d2cfd21d0b3e7f2de0d42f746e5e6c4d2d085c3f277c5c050bf73512291fbd7f2dee41
 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 7b6694fea2ec..64bfb8cfa1dc 100644
--- a/net-wireless/iw/iw-5.16.ebuild
+++ b/net-wireless/iw/iw-5.16.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=8
@@ -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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/libnl:="
diff --git a/net-wireless/libm2k/Manifest b/net-wireless/libm2k/Manifest
deleted file mode 100644
index 4ae80994e17d..000000000000
--- a/net-wireless/libm2k/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libm2k-0.0_p20201005.tar.gz 590923 BLAKE2B 47b018ca8524a30d2d22c387c45361a3765ef356a481ff144783e459f673f3c00ba122cfc086b4f7d3cef2f6847b9adee3bc1eec4f6ee52eb355a9625b29b7c6 SHA512 60ca79048408e3ee6b09978f417cc8a0b67982fe9ac62563331c96fb503af22b050803f9d10598e9edd02eb3af396c1ad0d16772ae3cd3d16c251bd588a682c8
-EBUILD libm2k-0.0_p20201005.ebuild 991 BLAKE2B 7fb9738d11e0bf13c0b85bf68ecf2a6b01bd509b1309c41355bc2774e784059fbfef64cee3a5fbec63599b6f85f1c8ca0ed13b338194c89ddf2e7845399a29ca SHA512 e2cab4bbe2ac2eb1bf492a711231ef884ca091a89a90cd68d99f5ef6a49857aab09552be8928a4ae5277f2dead3afd8d1acc0a4afbe61edb78c1db1e2b1e1168
-EBUILD libm2k-9999.ebuild 991 BLAKE2B 7fb9738d11e0bf13c0b85bf68ecf2a6b01bd509b1309c41355bc2774e784059fbfef64cee3a5fbec63599b6f85f1c8ca0ed13b338194c89ddf2e7845399a29ca SHA512 e2cab4bbe2ac2eb1bf492a711231ef884ca091a89a90cd68d99f5ef6a49857aab09552be8928a4ae5277f2dead3afd8d1acc0a4afbe61edb78c1db1e2b1e1168
-MISC metadata.xml 435 BLAKE2B 25c65807abad358dce63ae56c80f9de19d124e60dc40fcb6d36a1513e3c2f264227cbb7a88eee26d705827608747199c3f8e68ffb5dfef3e22de11873d35145a SHA512 6b6da11fe875a37d4408a649ecdd512e42d2c1818fc0a03a36c931e6897b61f0cbba1fdbcb2d6b1c5a23b1d995a672116f6bb85e0adc73778cf29729ae023ea4
diff --git a/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild b/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild
deleted file mode 100644
index c5b966c0b7f4..000000000000
--- a/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1 udev
-
-DESCRIPTION="A C++ library for interfacing with the ADALM2000"
-HOMEPAGE="https://github.com/analogdevicesinc/libm2k"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/analogdevicesinc/libm2k.git"
-	inherit git-r3
-else
-	COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4"
-	SRC_URI="https://github.com/analogdevicesinc/libm2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libiio
-	"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
-		-DCMAKE_SKIP_BUILD_RPATH=TRUE
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	#this seems to not compile things
-	python_optimize
-}
diff --git a/net-wireless/libm2k/libm2k-9999.ebuild b/net-wireless/libm2k/libm2k-9999.ebuild
deleted file mode 100644
index c5b966c0b7f4..000000000000
--- a/net-wireless/libm2k/libm2k-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1 udev
-
-DESCRIPTION="A C++ library for interfacing with the ADALM2000"
-HOMEPAGE="https://github.com/analogdevicesinc/libm2k"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/analogdevicesinc/libm2k.git"
-	inherit git-r3
-else
-	COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4"
-	SRC_URI="https://github.com/analogdevicesinc/libm2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libiio
-	"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
-		-DCMAKE_SKIP_BUILD_RPATH=TRUE
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	#this seems to not compile things
-	python_optimize
-}
diff --git a/net-wireless/libm2k/metadata.xml b/net-wireless/libm2k/metadata.xml
deleted file mode 100644
index c8ced3b22ea1..000000000000
--- a/net-wireless/libm2k/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">analogdevicesinc/libm2k</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index bcc97fc16624..a169ef7e40ab 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,6 +1,6 @@
 DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
 DIST lorcon-2020.06.06_p20220216.tar.gz 506368 BLAKE2B 2881af0130f331b2f648c0d29b0d70516770b833ba18b5f9bf6d4eb9eaab2192034ecc840f5e2b323c0e0fb8737dd1e29525b237d95825d60e78e3200f4ac929 SHA512 3f7d5967a1af840f8f6f05872c06d908ce426e7827046b8d86267770da044b48973554ff7a0415756522332055496f00ad078fa6a25a1898d640c925834111ef
 EBUILD lorcon-0.0_p20200214.ebuild 1499 BLAKE2B 746e351e041ac2682ae9bcd220ad89c5d2f76ae4f08e0fe416c7c3717b77cfebf91a2f71154beb29eb9b097b0966d1bfad89f25dfd818090ed620f5274c51ea9 SHA512 da76811fe82e0dc5cee248a4ddb40f696089dc01e53d4640bfc8c720a4d4c6fd98927ca57783718cfd8032964ff1244ba29395752fbb2614248e6d529cbace73
-EBUILD lorcon-2020.06.06_p20220216.ebuild 1482 BLAKE2B c39ae2808e96ffb42f8e43edaf73b10f067fc6578e450e39a55aeb7faa2726b91441a3363bfe40818bba552e1ad684f760c6d8630a118916d9dd71e45c027c10 SHA512 9d49fd630a0a3737477da5959c104fa4b4212d45589982c809491ce0945a370e2875fa5cdd0eeca5907d3499a398dac4d4d8e68858e3d64664ffead1faf43f23
-EBUILD lorcon-9999.ebuild 1482 BLAKE2B c39ae2808e96ffb42f8e43edaf73b10f067fc6578e450e39a55aeb7faa2726b91441a3363bfe40818bba552e1ad684f760c6d8630a118916d9dd71e45c027c10 SHA512 9d49fd630a0a3737477da5959c104fa4b4212d45589982c809491ce0945a370e2875fa5cdd0eeca5907d3499a398dac4d4d8e68858e3d64664ffead1faf43f23
+EBUILD lorcon-2020.06.06_p20220216-r1.ebuild 1554 BLAKE2B c07db289a84cc8664e7669abe1b4563a6abd4d09e00b50d7140b5efaecb7bba614b7557431c14576ee81c58f0e4b0fed190dc67245da736807b83db0c9aca005 SHA512 9a06fab4efc2fb6c4b6ffda43e6cc8232dabddb06c05e8692bdea3c8e46ffef8e0c3020b14e5770b897f2cd19398d85b937336f3e8ecafdb910e93719ba78c88
+EBUILD lorcon-9999.ebuild 1554 BLAKE2B c07db289a84cc8664e7669abe1b4563a6abd4d09e00b50d7140b5efaecb7bba614b7557431c14576ee81c58f0e4b0fed190dc67245da736807b83db0c9aca005 SHA512 9a06fab4efc2fb6c4b6ffda43e6cc8232dabddb06c05e8692bdea3c8e46ffef8e0c3020b14e5770b897f2cd19398d85b937336f3e8ecafdb910e93719ba78c88
 MISC metadata.xml 242 BLAKE2B 759698f297aa1433159cc8d44fc0f8e77e3b9d1e812a023acbd581f105ed1e9d69eb5117e3da5961fb59e9120af6e584b92b0ae554518a6c4cfc171ae16ad48e SHA512 f80486dfc128933ad7de3d0105385fad5cc3566b4f901c3faa58168fcfef2d2827c9599e5b4d1fd164ee61609a9ec20730c8e11fa1ae010ee5862e6e5510e5dc
diff --git a/net-wireless/lorcon/lorcon-2020.06.06_p20220216.ebuild b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r1.ebuild
index 36ede49a82fc..b19aa50f2fba 100644
--- a/net-wireless/lorcon/lorcon-2020.06.06_p20220216.ebuild
+++ b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 
@@ -30,10 +31,11 @@ SLOT="0"
 IUSE="python"
 
 RDEPEND="
-	python? ( ${PYTHON_DEPS} )
 	dev-libs/libnl:3=
-	net-libs/libpcap"
+	net-libs/libpcap
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
+BDEPEND="python? ( ${DISTUTILS_DEPS} )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index 36ede49a82fc..b19aa50f2fba 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 
@@ -30,10 +31,11 @@ SLOT="0"
 IUSE="python"
 
 RDEPEND="
-	python? ( ${PYTHON_DEPS} )
 	dev-libs/libnl:3=
-	net-libs/libpcap"
+	net-libs/libpcap
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
+BDEPEND="python? ( ${DISTUTILS_DEPS} )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest
index 5eff176c9e04..99f0fb027ffd 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,6 +1,7 @@
-DIST qdmr-0.10.0.tar.gz 5819245 BLAKE2B 5beb4cb876742911d00f34953d30c6e26ba41db3e6bf653bbde57d003fee712e2d5652cf9fba15332629491f8b3c43da7408094e187d47532976c088dc38046d SHA512 1764b6af3e90744ebe8300fd8e46038bca0ff1ba6ac0789a2b947ed9310efa8ca867a10a50f12a41cb150728a7b88c129df03e806d95b48533356b8142e2ada9
+AUX qdmr-0.10.2-musl.patch 1192 BLAKE2B 8426b283ca468f16af35a36efe9dd5a73fff1caa4d3fa14ebfbce03c611f9c02400eb3c00374ee358fc9892d5a907f1de3c8770736c2b7806c3c607b38457a3b SHA512 773f6788c570cf60eabcb1b04b69be71f9ad875a59baa05b06892b690d1b01ca0390fc4618a7fe534d186e676be54b50f3b86342f208f9b75fb285f47a1af0b0
+DIST qdmr-0.10.2.tar.gz 5903169 BLAKE2B 1ef4e9846dd4206d1eae3cfb5562fccec24b156bfd77a82e801e8d1194b969bbda0f14e99c1b6505d18abba4a79d87c5eee2232110969faf4c078c1fe781a8ee SHA512 96a3fd22be2b8f77a4925cfb426de12a55b29ee73eaf78869091fd0ecd36d2df51195f2ca70689857e190767c4651d3d4915a0b7aa9f5c6e429f46a53edb991c
 DIST qdmr-0.9.1.tar.gz 5629155 BLAKE2B 7ffa285c784af1416361c8c2fd74c976c490854d24f348983a0a8c294f8213bfa48a768c9148d40d3e71b7347b908960ed6dbf2ca54bfae155414e9a2254c32d SHA512 7df32462fd7555c791fe643f2632f218aef85614bee442422bf542910cb3c48b0d8606fc1797bbd02b16c7c30825cad51774bd4bd2ed1d89446d672b874dd2b1
-EBUILD qdmr-0.10.0.ebuild 1338 BLAKE2B b39f547f3d89dc38f369731545f2512cb0c82cad3783e6db12e2567b2aaf48a22a614df58e2039c387ec72a0103d40ac6202b7598af0496309f3482c140c5423 SHA512 abb0c74ab4736b8812d67e06d9318c0dae8debdbe45327b3f5804566929b6bd8346632080ece67a4ced62fc9132dc7a2d281778e1de7cdb87016030b204e2388
+EBUILD qdmr-0.10.2.ebuild 1381 BLAKE2B 425c3f9ed095d48caec232cfb8da59c85ce9b34aad6af91b8ec2a701aab46a4fbd0087cc68d9ffbb9c4752df5962fb7a96ad25776fe6bf0b1ce71a464b4bb7ed SHA512 e48a7843293e418ffd770b9ffea6e9dfa2942fd53896191330e95b0d521eead6b0cf15881ab88235fa4dedfa20ebe6349a33671919422a0d785c244085c465bc
 EBUILD qdmr-0.9.1.ebuild 1331 BLAKE2B e8fdd54df680b737bfe10ce343ecb044ffe798685cc521ad89be0ebec2242c3c0a5ee2a11d00dff87784c9a71f2ab71785536c6f654d5e253a63b5d4389d0898 SHA512 529fe241cee0626936f237e709ebaf5214f561f5306648e3340ab81e7087374024a14616093962324f48e51520a1372e511b00a6e2e35d3e6397c93b046ddd37
 EBUILD qdmr-9999.ebuild 1338 BLAKE2B b39f547f3d89dc38f369731545f2512cb0c82cad3783e6db12e2567b2aaf48a22a614df58e2039c387ec72a0103d40ac6202b7598af0496309f3482c140c5423 SHA512 abb0c74ab4736b8812d67e06d9318c0dae8debdbe45327b3f5804566929b6bd8346632080ece67a4ced62fc9132dc7a2d281778e1de7cdb87016030b204e2388
-MISC metadata.xml 319 BLAKE2B 1ce9d4701527c9ba9f8d990413aa07b22bea984360611162da0baa235a71fffcd16fe13cd5ce6c8f4192e9533e0886358f40890756d9220cae5a6d6af7e903fb SHA512 b59a65526d21586cc142876a59fea232d8d8e34cc9faf85a05b17b45ea3e98383e3e4be92d639e489ec5c62c74c53253a4de26adf4151b877135c754cb08de70
+MISC metadata.xml 427 BLAKE2B 0435094250074437ba1f88146a4a0b7d109b473311316840f498c5c7e0f7386b17e6f2bddcda187e586bb766b81374296d27c8cf273e3baeb7d2c1d65dfd359e SHA512 9a6aa1424549762fab24407eace1ebac36564e46dbcdf17dbe7ba3853a552763dbf765c67ce20e6a536ce1ee063ac1932bc1426a1061f697c6f0bc462a017125
diff --git a/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch b/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch
new file mode 100644
index 000000000000..21673cb4ebb2
--- /dev/null
+++ b/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch
@@ -0,0 +1,34 @@
+From eca81fba54b156707545967b78c823cc38b1b53f Mon Sep 17 00:00:00 2001
+From: Hannes Matuschek <hmatuschek@gmail.com>
+Date: Wed, 6 Apr 2022 15:29:02 +0200
+Subject: [PATCH] Fixed compilation issue under Genoo. Addresses #216.
+
+---
+ lib/radiolimits.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/lib/radiolimits.cc b/lib/radiolimits.cc
+index b883cc8..eb72166 100644
+--- a/lib/radiolimits.cc
++++ b/lib/radiolimits.cc
+@@ -3,9 +3,10 @@
+ #include "logger.hh"
+ #include "config.hh"
+ #include <QMetaProperty>
++#include <ctype.h>
+ 
+ // Utility function to check string content for ASCII encoding
+-inline bool isascii(const QString &text) {
++inline bool qstring_is_ascii(const QString &text) {
+   foreach (QChar c, text) {
+     if ((c<0x1f) && (0x7f != c))
+       return false;
+@@ -205,7 +206,7 @@ RadioLimitString::verify(const ConfigItem *item, const QMetaProperty &prop, Radi
+         << ") is shorter than minimum size " << _minLen << ".";
+   }
+ 
+-  if ((ASCII == _encoding) && (! isascii(value))) {
++  if ((ASCII == _encoding) && (! qstring_is_ascii(value))) {
+     auto &msg = context.newMessage();
+     msg << "Cannot encode string '" << value << "' in ASCII.";
+   }
diff --git a/net-wireless/qdmr/metadata.xml b/net-wireless/qdmr/metadata.xml
index d03ef4bc4f35..e6c5a00f9bfe 100644
--- a/net-wireless/qdmr/metadata.xml
+++ b/net-wireless/qdmr/metadata.xml
@@ -5,6 +5,10 @@
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>anarchy@gentoo.org</email>
+		<name>Jory A. Pratt</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hmatuschek/qdmr</remote-id>
 	</upstream>
diff --git a/net-wireless/qdmr/qdmr-0.10.0.ebuild b/net-wireless/qdmr/qdmr-0.10.2.ebuild
index f46aebabe549..6297f6df454e 100644
--- a/net-wireless/qdmr/qdmr-0.10.0.ebuild
+++ b/net-wireless/qdmr/qdmr-0.10.2.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 BDEPEND=""
 
+PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+
 pkg_setup() {
 	CONFIG_CHECK="~USB_ACM"
 	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"
diff --git a/net-wireless/rtl_power_fftw/Manifest b/net-wireless/rtl_power_fftw/Manifest
deleted file mode 100644
index ca134bdba079..000000000000
--- a/net-wireless/rtl_power_fftw/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rtl_power_fftw-0.0_p20180528.tar.gz 37927 BLAKE2B da496c3700df5c2c2104c93c7137bda2f23982fc9a80498b02ccbe57f47c118c766523e33841abd1add60d230e9e10be378eadb3ec03f1ce43a09c0e808f11d4 SHA512 2d097bd1f72c421d54a8081da02fd0410d7749141286db21c350e5a2694cf5f04d61d7dea989a1ce6749e7a03543e264bc837600cbc4a6b58d3ad45d009eb8b3
-EBUILD rtl_power_fftw-0.0_p20180528.ebuild 692 BLAKE2B 708f7ef598cd906c679c051452551d7dc5852f76a14ac579289e460a524cd815ae9acecb5e37f30fec62913ea92674449bc7d9ad7b95a3cd6fd0a1bfbfc43a30 SHA512 8fa2cb3fcb883fcc96f801b53fd4ecdb4029ba32fafef33c6d9a7380d7368e1fdc91fb7c5f32dfd7fc05b373da9f060f998aa25cf1e372b7ba18353431284cdf
-EBUILD rtl_power_fftw-9999.ebuild 692 BLAKE2B 708f7ef598cd906c679c051452551d7dc5852f76a14ac579289e460a524cd815ae9acecb5e37f30fec62913ea92674449bc7d9ad7b95a3cd6fd0a1bfbfc43a30 SHA512 8fa2cb3fcb883fcc96f801b53fd4ecdb4029ba32fafef33c6d9a7380d7368e1fdc91fb7c5f32dfd7fc05b373da9f060f998aa25cf1e372b7ba18353431284cdf
-MISC metadata.xml 239 BLAKE2B 8a5d257499b7178bea8d035ab855e235ebbc400424ef2b15910592d72c39ccbd31f0aa62d966799ef867c5478da8a172d4f02ebdeb483333de2561af62a11705 SHA512 1b66fb2d49901d2a3c6a23d60e9f6f4d861870d49441ac076f0f150b8f918da2bf6c4bb2fa1d57a56e4067c65718ce2688496d8b4e06edbd2f65bd267495697a
diff --git a/net-wireless/rtl_power_fftw/metadata.xml b/net-wireless/rtl_power_fftw/metadata.xml
deleted file mode 100644
index 807ec69d81bc..000000000000
--- a/net-wireless/rtl_power_fftw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-wireless/rtl_power_fftw/rtl_power_fftw-0.0_p20180528.ebuild b/net-wireless/rtl_power_fftw/rtl_power_fftw-0.0_p20180528.ebuild
deleted file mode 100644
index 1ab71952dffc..000000000000
--- a/net-wireless/rtl_power_fftw/rtl_power_fftw-0.0_p20180528.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="power spectrum for RTLSDR dongles"
-HOMEPAGE="https://github.com/AD-Vega/rtl-power-fftw"
-
-LICENSE="GPL-3"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/AD-Vega/rtl-power-fftw.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	COMMIT="d567a454a6c96a67c61242178363e29d4cc84d64"
-	SRC_URI="https://github.com/AD-Vega/rtl-power-fftw/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN//_/-}-${COMMIT}"
-fi
-
-IUSE=""
-
-RDEPEND="dev-cpp/tclap
-	sci-libs/fftw:=
-	net-wireless/rtl-sdr:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/net-wireless/rtl_power_fftw/rtl_power_fftw-9999.ebuild b/net-wireless/rtl_power_fftw/rtl_power_fftw-9999.ebuild
deleted file mode 100644
index 1ab71952dffc..000000000000
--- a/net-wireless/rtl_power_fftw/rtl_power_fftw-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="power spectrum for RTLSDR dongles"
-HOMEPAGE="https://github.com/AD-Vega/rtl-power-fftw"
-
-LICENSE="GPL-3"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/AD-Vega/rtl-power-fftw.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	COMMIT="d567a454a6c96a67c61242178363e29d4cc84d64"
-	SRC_URI="https://github.com/AD-Vega/rtl-power-fftw/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN//_/-}-${COMMIT}"
-fi
-
-IUSE=""
-
-RDEPEND="dev-cpp/tclap
-	sci-libs/fftw:=
-	net-wireless/rtl-sdr:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/net-wireless/soapy_power/Manifest b/net-wireless/soapy_power/Manifest
deleted file mode 100644
index bd37c51264b9..000000000000
--- a/net-wireless/soapy_power/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST soapy_power-1.6.1.tar.gz 14672 BLAKE2B 7cc16fed02a02f91cb62d3937a1cf73144f8a427acbba1bacf4c8949f8d270d7bf5a443ddd227b0a53183d79f62fa2fc5e13f67ac188dfc3a2a385d22634076a SHA512 19aa0e80a7b67cb29d842343c09b8ca2e3068583c8117a8151c5b47f1a34369f0ec833f038595323712986c9348b14a43dc1fdc6516adb40de6b42a281d782e1
-EBUILD soapy_power-1.6.1-r1.ebuild 799 BLAKE2B b842a9f6c31bfbfc250cfe882983ab06d635263608f86ffb61c9ea459bc4eecd15767f9ebb0b5d988da8be52b1c9649edbe6e111ab3e2c4da562f003e99bdab6 SHA512 1d42a36864f4bd30180c111435b328d30327de7407826f4344fa2b5b624383671b420b837715bccccf475e0c9dca1a4ff4da8e66260addc0e068fdef926a0b41
-EBUILD soapy_power-9999.ebuild 799 BLAKE2B b842a9f6c31bfbfc250cfe882983ab06d635263608f86ffb61c9ea459bc4eecd15767f9ebb0b5d988da8be52b1c9649edbe6e111ab3e2c4da562f003e99bdab6 SHA512 1d42a36864f4bd30180c111435b328d30327de7407826f4344fa2b5b624383671b420b837715bccccf475e0c9dca1a4ff4da8e66260addc0e068fdef926a0b41
-MISC metadata.xml 612 BLAKE2B 52da2a56792279fe04a1fc5392532b49b911fae568df6550566efaddd0862b3a98f12e4d3ef9f592d9ba9f1c4587ea8bde6590dd690eb5712f669b36b45de125 SHA512 479f685272903d04ee22d29fd57215052d234c0f11c7fffd20be0ba711d8b9bca33f902f8122be6e76295fc5e3525346a03294c7229e4cd2e313c1dc6a684ce1
diff --git a/net-wireless/soapy_power/metadata.xml b/net-wireless/soapy_power/metadata.xml
deleted file mode 100644
index 9513772a9873..000000000000
--- a/net-wireless/soapy_power/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="faster">Use <pkg>dev-python/scipy</pkg> to speed up drawing</flag>
-		<flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">csete/gqrx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
deleted file mode 100644
index 8cae7f1477bc..000000000000
--- a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Obtain power spectrum from SoapySDR devices"
-HOMEPAGE="https://github.com/xmikos/soapy_power"
-
-LICENSE="MIT"
-SLOT="0"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xmikos/soapy_power.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xmikos/soapy_power/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="faster +fastest"
-
-DEPEND=""
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/simplespectral[${PYTHON_USEDEP}]
-	>=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}]
-		faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
-		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
diff --git a/net-wireless/soapy_power/soapy_power-9999.ebuild b/net-wireless/soapy_power/soapy_power-9999.ebuild
deleted file mode 100644
index 8cae7f1477bc..000000000000
--- a/net-wireless/soapy_power/soapy_power-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Obtain power spectrum from SoapySDR devices"
-HOMEPAGE="https://github.com/xmikos/soapy_power"
-
-LICENSE="MIT"
-SLOT="0"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xmikos/soapy_power.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xmikos/soapy_power/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="faster +fastest"
-
-DEPEND=""
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/simplespectral[${PYTHON_USEDEP}]
-	>=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}]
-		faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
-		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
deleted file mode 100644
index 9dbf461e9d6b..000000000000
--- a/net-wireless/srslte/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX srslte-20.10.1-add-missing-include.patch 617 BLAKE2B 26b371dafafcf1f0620b66ac9ce0e4b8f79dfc609803170f4038a8ed7486496b260cf048d0703f64419a1f6f4fc965ccf4dcf5c19215c3220ed49174674d76bd SHA512 f81038b45859fb861bf49e4068603d1ef4d3ac80268a0420937e4b00b16293cf4368eefb4da0d7f5411431425108ab858fc94c1bfe680cb893cdc3bc4083d446
-DIST srslte-20.10.1.tar.gz 8098321 BLAKE2B 713cbe45c49baa416b96dc432982656fef92082f026392c890f447d09588a48aafab32f94a4d7ed982814d2d838224303895a0bd0276a90f5815f6d0707d9732 SHA512 a6e38ccdb02a7e129f51fbad258722f5cd1f568541627c3e9e70f9e92491279cb55c18ab0463bce94b0f5fc62f0868027a83beffc483bb3689f0838fbea91186
-EBUILD srslte-20.10.1-r2.ebuild 1371 BLAKE2B 364f811a06925cca50d1b576fbca91569e8704733923bd554926cce4bbf583d6442fb7b28b38e947c6e222e2111e865fed4f2b0e61a788b90f7e3206ffd7b9d4 SHA512 183c0c3ef2d580e1218845663a26b1611b1bc1f3aeb17d100543d8afa73a7a0337776361e0615739391b35dd09f0b8ae373aa31df1b96824ad3b11e3605e8d0b
-EBUILD srslte-9999.ebuild 1303 BLAKE2B fe172c59869c9caec4d45431d51f7efc48b7808072a99022706355f9fc1cb6d5f3588772e5a2fca71eabfbd8680c1516bba0a7826444d38028af76499459f050 SHA512 408e8e29ab0b17e3e111fa1966a414dccc50606074ed1750c45f2fe9cc85802a8e1c4807eea7acd6bfaf4b2cfcd0e65b3bbcc1c4828ec4659055ced61a90fc87
-MISC metadata.xml 639 BLAKE2B 045fc8d7bdf770186dd16eb93f73e7d17d7fc37bd26c0027b1089862fb0797127d93aa7b3683da4f6c54fe96bad4fd14794edc6bab9da4d2ec39a1d02b37b7f5 SHA512 4f403086548168ab0eded0c9ca6e15008d0cf78bad24850b2095e041782c14deaab34ebc6fe27663c5b16c57825bb5d6608f0a67ee49fb30b04ac4d9a743e4c4
diff --git a/net-wireless/srslte/files/srslte-20.10.1-add-missing-include.patch b/net-wireless/srslte/files/srslte-20.10.1-add-missing-include.patch
deleted file mode 100644
index 158ff9e6db39..000000000000
--- a/net-wireless/srslte/files/srslte-20.10.1-add-missing-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/786855
-
-From 4ec818f0d337a54ff3d4ff587bbd6f5f05363700 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 4 Aug 2021 23:14:21 +0100
-Subject: [PATCH] Add missing include
-
----
- lib/include/srslte/adt/observer.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/include/srslte/adt/observer.h b/lib/include/srslte/adt/observer.h
-index 38a881d..9ad33a0 100644
---- a/lib/include/srslte/adt/observer.h
-+++ b/lib/include/srslte/adt/observer.h
-@@ -26,6 +26,7 @@
- #include <functional>
- #include <limits>
- #include <vector>
-+#include <cstddef>
- 
- namespace srslte {
- 
--- 
-2.32.0
-
diff --git a/net-wireless/srslte/metadata.xml b/net-wireless/srslte/metadata.xml
deleted file mode 100644
index aa49f7fde140..000000000000
--- a/net-wireless/srslte/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="uhd">support Ettus Research hardware</flag>
-		<flag name="bladerf">support Nuand BladeRF hardware</flag>
-		<flag name="soapysdr">use soapysdr to support various hardware</flag>
-		<flag name="simcard">support hardware sim cards</flag>
-		<flag name="zeromq">enable zeromq message passing</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">srsLTE/srsLTE</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/srslte/srslte-20.10.1-r2.ebuild b/net-wireless/srslte/srslte-20.10.1-r2.ebuild
deleted file mode 100644
index 789887297552..000000000000
--- a/net-wireless/srslte/srslte-20.10.1-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
-HOMEPAGE="http://www.softwareradiosystems.com"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/srsLTE/srsLTE.git"
-else
-	inherit vcs-snapshot
-	KEYWORDS="~amd64 ~x86"
-	MY_PV=${PV//./_}
-	SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
-fi
-#https://github.com/srsLTE/srsLTE/issues/537
-RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bladerf simcard soapysdr uhd zeromq"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/libconfig:=[cxx]
-	net-misc/lksctp-tools
-	net-libs/mbedtls:=
-	sci-libs/fftw:3.0=
-	bladerf? ( net-wireless/bladerf:= )
-	simcard? ( sys-apps/pcsc-lite )
-	soapysdr? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:= )
-	zeromq? ( net-libs/zeromq:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.10.1-add-missing-include.patch
-)
-
-src_prepare() {
-	sed -i '/ -Werror"/d' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_UHD="$(usex uhd)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_SOAPYSDR="$(usex soapysdr)"
-		-DENABLE_ZEROMQ="$(usex zeromq)"
-		-DENABLE_HARDSIM="$(usex simcard)"
-	)
-	cmake_src_configure
-}
diff --git a/net-wireless/srslte/srslte-9999.ebuild b/net-wireless/srslte/srslte-9999.ebuild
deleted file mode 100644
index 02ff600dab82..000000000000
--- a/net-wireless/srslte/srslte-9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
-HOMEPAGE="http://www.softwareradiosystems.com"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/srsLTE/srsLTE.git"
-else
-	inherit vcs-snapshot
-	KEYWORDS="~amd64 ~x86"
-	MY_PV=${PV//./_}
-	SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
-fi
-#https://github.com/srsLTE/srsLTE/issues/537
-RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bladerf simcard soapysdr uhd zeromq"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/libconfig:=[cxx]
-	net-misc/lksctp-tools
-	net-libs/mbedtls:=
-	sci-libs/fftw:3.0=
-	bladerf? ( net-wireless/bladerf:= )
-	simcard? ( sys-apps/pcsc-lite )
-	soapysdr? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:= )
-	zeromq? ( net-libs/zeromq:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -i '/ -Werror"/d' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_UHD="$(usex uhd)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_SOAPYSDR="$(usex soapysdr)"
-		-DENABLE_ZEROMQ="$(usex zeromq)"
-		-DENABLE_HARDSIM="$(usex simcard)"
-	)
-	cmake_src_configure
-}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index a1fd5156731f..c3ab0e8c0d0a 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,10 +1,8 @@
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
-AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fafb4f5a5671edc522fb13872ec64c168173667cfc072cd0fde5fbaa236109a4c49947ddfd3fd429f SHA512 734aa8b93e057579470e59a287d68f219f510f73479add86d3bfc32d73ca495644d40d9323e2b00a448ee7b519f9a60d3150057c00398165108b572999e70b67
-AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
-AUX unifi.service-r1 237 BLAKE2B 19d38b04924c9236a104323b18d423484a16159d123d573a85ec9fb4749b7c5a0b5926430f5477ab32929b7bf9bbb458e1c683ac64ab799d438791cb7e742001 SHA512 2fd33d12b95057446641d3e5cb9bba332f6089fc0019706758b47d24cda16254750d69dc76794a3b58de4cc160070f559294285c4be2829df101c670db9b39d6
+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
-EBUILD unifi-6.5.55.ebuild 2224 BLAKE2B 30612188b7ed5e51f00ef64bed1679d20db432e929f753374d5b71fd39e6f950a4d4a2f8299d353eb54fac00a49a5baaa91c9a89d47926a86ed48c4f039707d3 SHA512 1b43d2cf6a80ee306f8388d38d160aaa979ed43009cbb8e57e983a73122d9c277cafe9efb67e5937676e95eb808facad1de89f2f66748d1b9eb491c75e320a6d
-EBUILD unifi-7.0.25-r1.ebuild 2472 BLAKE2B bbc925dbfdc96c33c5cef1f11e59b6170c8026660c96bec5282336d9c0601febdbf658c9d652b928739bbabb3aed5ecdb0f6fbfd709f024cf4a1c8aa421f5bf6 SHA512 0f28c97f18d1ab089a21530f0c0da39214a3d2518169363f61482f5ced49268fddf338bae26d67d2458ecc1d607b8f82f2190117251dec7383b8b0a6b64564b0
+EBUILD unifi-6.5.55-r2.ebuild 2471 BLAKE2B 85ea582f14c30db8c8fa3f02057f8ed8c506338860b1c549ce7e2192423c4be8a087c19cdec05079731b8bfa045c63edc094e740b5ad7b0fe987635319aac7b5 SHA512 395d780fa97045cadebc193ef391576c5def6f06413940857902e792b5a39dceb93f7ee8a8b2d8162df395c132bdb89490460d2fa69191f6b87cf9282b6e7f7b
+EBUILD unifi-7.0.25-r2.ebuild 2472 BLAKE2B 3d83df8b92b77f2d0014cdab28acf6f8ecd59bd07025dd5b18974c31cf0f7a52eb04b00fd64184085f4750737606a65a2db19e62f305f76f5a99eb2f5d73890e SHA512 8e8faa25ba0f99d7bb1c48bc66c4bd6102708c3484ae9507db0a434b44ce7622aec3c644838ee22a9aab504904d62906e23f53b170237f65f53f95b7a0905289
 MISC metadata.xml 579 BLAKE2B 4c18ad9f1d440c5d2fcb1460666ba738b04108d14f30d47b046213412ad324e6d942971959b98f8eaad08485fef2e441d89cc5b77e3a6696f8f339e7822b9f1b SHA512 6a562914d527a80b5737b1e121f21a71b086612b876274b38bbf6ceeb2aee94983327c84c23ffaf7a738cce0cd20f16581c0b99f5448105269302a1ebc3b8c3c
diff --git a/net-wireless/unifi/files/unifi.initd-r1 b/net-wireless/unifi/files/unifi.initd-r1
deleted file mode 100644
index 2db36571dac0..000000000000
--- a/net-wireless/unifi/files/unifi.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ACE_LIB="lib/ace.jar"
-DAEMON="${JAVA_HOME-/etc/java-config-2/current-system-vm}"/bin/java
-JAVA_OPTS="-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path="
-UNIFI_PATH="/usr/lib/unifi"
-
-UNIFI_USER="unifi"
-UNIFI_GROUP="unifi"
-
-name="UniFi Controller"
-
-start_stop_daemon_args="--chdir ${UNIFI_PATH}"
-
-command="${DAEMON}"
-command_args="${JAVA_OPTS} -jar ${ACE_LIB} start"
-command_background=true
-pidfile="/run/${RC_SVCNAME}.pid"
-
-command_user="${UNIFI_USER}:${UNIFI_GROUP}"
-
-command_progress=true
-retry=TERM/60
diff --git a/net-wireless/unifi/files/unifi.service b/net-wireless/unifi/files/unifi.service
deleted file mode 100644
index 00c00d7f3c9e..000000000000
--- a/net-wireless/unifi/files/unifi.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=UniFi Controller
-After=network-online.target
-
-[Service]
-Type=simple
-User=unifi
-Group=unifi
-WorkingDirectory=/usr/lib/unifi
-ExecStart=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar start
-ExecStop=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar stop
-
-[Install]
-WantedBy=network.target
diff --git a/net-wireless/unifi/files/unifi.service-r1 b/net-wireless/unifi/files/unifi.service-r2
index a9b98e25de41..40fff6c81797 100644
--- a/net-wireless/unifi/files/unifi.service-r1
+++ b/net-wireless/unifi/files/unifi.service-r2
@@ -1,6 +1,6 @@
 [Unit]
 Description=UniFi Controller
-After=network-online.target
+After=network.target
 
 [Service]
 Type=simple
@@ -11,4 +11,4 @@ ExecStart=/usr/bin/unifi start
 ExecStop=/usr/bin/unifi stop
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target
diff --git a/net-wireless/unifi/unifi-6.5.55.ebuild b/net-wireless/unifi/unifi-6.5.55-r2.ebuild
index 707826628a0b..248c2222fb5a 100644
--- a/net-wireless/unifi/unifi-6.5.55.ebuild
+++ b/net-wireless/unifi/unifi-6.5.55-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 # Set this var for any releases except stable
 RC_SUFFIX="-1d0581c00d"
 
-inherit systemd
+inherit java-pkg-2 systemd
 
 DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
@@ -65,6 +65,10 @@ src_prepare() {
 	default
 }
 
+src_compile() {
+	:;
+}
+
 src_install() {
 	insinto /usr/lib/unifi
 	doins -r bin dl lib webapps
@@ -77,8 +81,11 @@ src_install() {
 	done
 	dosym ../../../var/log/unifi /usr/lib/unifi/logs
 
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
+	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
 
diff --git a/net-wireless/unifi/unifi-7.0.25-r1.ebuild b/net-wireless/unifi/unifi-7.0.25-r2.ebuild
index 24936b556d77..3466b4b1d3b2 100644
--- a/net-wireless/unifi/unifi-7.0.25-r1.ebuild
+++ b/net-wireless/unifi/unifi-7.0.25-r2.ebuild
@@ -85,7 +85,7 @@ src_install() {
 	java-pkg_dolauncher unifi --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' --jar ace.jar --pwd '/usr/lib/unifi'
 
 	newinitd "${FILESDIR}"/unifi.initd-r2 unifi
-	systemd_newunit "${FILESDIR}"/unifi.service-r1 unifi.service
+	systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
 
 	newconfd "${FILESDIR}"/unifi.confd unifi
 
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 7ba25b27ffe8..e85e16896c13 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,5 +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
 EBUILD wireless-regdb-20220218.ebuild 1092 BLAKE2B 5a8e4d26468e69a0901fd938bf6681afb86d50c74af038afb57fd992db0359bc748e24bbcb3e2d9997300df62cdaf83a6aff9d73435f1938f1dd84e93947c992 SHA512 849fa96f1cc4ebfe66604af7ab1647846bc9f45c2c4056dbe278c42e9e003a694aad4c6ed0de366e4ca996a18e3cadcece569516f0d5a2cc705130c189b2c4cb
+EBUILD wireless-regdb-20220408.ebuild 1092 BLAKE2B 5a8e4d26468e69a0901fd938bf6681afb86d50c74af038afb57fd992db0359bc748e24bbcb3e2d9997300df62cdaf83a6aff9d73435f1938f1dd84e93947c992 SHA512 849fa96f1cc4ebfe66604af7ab1647846bc9f45c2c4056dbe278c42e9e003a694aad4c6ed0de366e4ca996a18e3cadcece569516f0d5a2cc705130c189b2c4cb
 MISC metadata.xml 272 BLAKE2B 2a42142ca287ab19668cc11278dac4d0f16bf5b183646b0f06317a6e60568d9328d42baa986af6c692a256b28fdef32f24442faf69ae9b8305d625a3265df298 SHA512 4595277c33cd3d565c652cae1644c4ba131dea25899984629a48dc9a679441c95a7d26527c6fe4578a3e6f616e6f8c25580ee9f785fdcbd699bd43bacd846dd3
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild
new file mode 100644
index 000000000000..050550bee28b
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
+DESCRIPTION="Binary regulatory database for CRDA"
+HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+
+src_compile() {
+	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
+}
+
+src_install() {
+	# This file is not ABI-specific, and crda itself always hardcodes
+	# this path.  So install into a common location for all ABIs to use.
+	insinto /usr/lib/crda
+	doins regulatory.bin
+
+	insinto /etc/wireless-regdb/pubkeys
+	doins sforshee.key.pub.pem
+
+	# Linux 4.15 now complains if the firmware loader
+	# can't find these files #643520
+	insinto /lib/firmware
+	doins regulatory.db
+	doins regulatory.db.p7s
+
+	doman regulatory.bin.5
+	dodoc README db.txt
+}
diff --git a/net-wireless/yatebts/Manifest b/net-wireless/yatebts/Manifest
deleted file mode 100644
index 6be698b6b12b..000000000000
--- a/net-wireless/yatebts/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX yatebts-5.0.0-gcc6.patch 1125 BLAKE2B 20d2fa8431238c888d5841c6895a84b7fd2b914f6fdc22238b12f78b1758ffeb810cf0d37bb917439b6098c78f7fd141fbf2e6442eed5da4fb2a2a7b34afc4d8 SHA512 e2a575d1e4a31f884b2af95439ce077a811d655cfcb646b20652638a353a9e730999134128003829a538b880ca07ea23e125a9b21073e46a7aae05b1eeb9baf1
-AUX yatebts-6.0.0-dont-mess-with-cflags.patch 291 BLAKE2B 034044f86ad35888b63046731cfc147c856bdb7ca091ad3e2b8518fe0d5918ba6e6ee4478fd6ea0c24c437ab62cfebe450d01ffb1a9d88d1bd691aca1208db37 SHA512 baf8f4dd564d099efc17fc1f9d0dd8f7c7b774420c851ee2e9d11a227eb8d624a95e8759977cbd6301dc6804d42942f9c62000b3b568f20261630797063181b8
-AUX yatebts-sgsnggsn-inetutils-hostname-fix.diff 487 BLAKE2B f7d2b114259363c4eba833ac74185545678bba67db709abf2e097aec308e3aba1312ca6f35a78ab3e6ebc2f422ab397c81806b7e7ebdd78f3f27b1e11164205e SHA512 55a9ad165e00e8c9b5556c1f29e244286d3cdf425cdb94f1a3e49c1d27962c302bedbbec37e5ce4ce44867b7bd17587887dfe6cfd5fabffdba32066799bd86c6
-DIST yate-bts-6.0.0-1.tar.gz 2672036 BLAKE2B 3b538586786df32a2159002cc70f60ba6ed8ee3e82430f0e48652f9c2cb9602c229ad0e577f6445dae2225aab7fc047d40614a22f3eb995c93a870183856274b SHA512 dbff3ed5c801adc983a26e585186cc115e7c3d7a1d12d6bc6b0a08a48dfe6c4c1f15f5e731ca4c2ece04bd1784ab9af352b488e5b0f2c43f3c84204fce3ad3c7
-EBUILD yatebts-6.0.0-r1.ebuild 1212 BLAKE2B 6c16df610b4734ed53d36d39e9abb5d788163d7add3a180a49642e3b15c655355032570a35ebcd0e0434796df98e37ac507bb4f510f4072e6461797e835dd1c4 SHA512 a38dbb4921f963586292e0e7a1d8740dc8d59f012f01e9b0b1cef857e2a143f1445a659ee716fb37467726194f3439d859ea74095c18a45e377fc694e78d9191
-EBUILD yatebts-9999.ebuild 1211 BLAKE2B ef2137ca191dbb00ffe03d3e9b61ae648bb804b59176270ce716bded9732fa78a27ef40bced82f57ce2a8fa78ac274c032ff429a16933c524c9d290d36051a66 SHA512 0b5e44b05d9d913d11a06745a0ebc66c29b53e51fe2472848484f9ae64870c864e11fd973c9b7c96e9dfc4ab962a67fe64f95ed25a3ad1672e452114ce55d8c2
-MISC metadata.xml 460 BLAKE2B e72e140e2392d56da49aaaf47c92d11dc36ac06f32f54b5c2bb97f274e7804cdacc2b0fdb0f6fe52639750aa5c768929e8e44d2245a648533c0563c2c7a8b071 SHA512 99fbcdc93bef8e89191bc2aa56ee67f9f9b42c902f1a7ff0f1edb314de2743028a9332f0e97e9cd175de87ba8eef33187a9eecef244576fb2c15917c28bf18c6
diff --git a/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch b/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch
deleted file mode 100644
index 988ca2d4f73f..000000000000
--- a/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/mbts/GPRS/MSInfo.cpp
-+++ b/mbts/GPRS/MSInfo.cpp
-@@ -638,7 +638,7 @@
-         if (msPCHDowns.size() > 1) {
-             std::ostringstream os;
-             msDumpChannels(os);
--            GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for "<<this<<os;
-+            GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for "<<this<<(!os.fail());
-         }
- 
- 	} else {
---- a/mbts/SGSNGGSN/Sgsn.cpp
-+++ b/mbts/SGSNGGSN/Sgsn.cpp
-@@ -149,7 +149,7 @@
- 	clearConn(GprsConnNone,SigConnLost);
- 	std::ostringstream ss;
- 	sgsnInfoDump(this,ss);
--	SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<ss);
-+	SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<(!ss.fail()));
- 	sSgsnInfoList.remove(this);
- 	GmmInfo *gmm = getGmm();
- 	if (gmm && (gmm->getSI() == this)) {
-@@ -252,7 +252,7 @@
- {
- 	std::ostringstream ss;
- 	gmmInfoDump(gmm,ss,0);
--	SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<ss);
-+	SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<(!ss.fail()));
- 	SgsnInfo *si;
- 	RN_FOR_ALL(SgsnInfoList_t,sSgsnInfoList,si) {
- 		// The second test here should be redundant.
diff --git a/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch b/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch
deleted file mode 100644
index 8768164cfa63..000000000000
--- a/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,9 +38,6 @@
- AC_PROG_CC
- AC_PROG_AWK
- 
--# Delete -g as we handle debug info at build time
--CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| \+\)-g[[0-9]]*//' 2>/dev/null`
--
- # Helper to check by pkgconfig including local paths
- function pkgconfig_check()
- {
diff --git a/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff b/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff
deleted file mode 100644
index 46b4b1d1ba4d..000000000000
--- a/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/mbts/SGSNGGSN/iputils.cpp b/mbts/SGSNGGSN/iputils.cpp
-index 979ae3a..49bb0ff 100644
---- a/mbts/SGSNGGSN/iputils.cpp
-+++ b/mbts/SGSNGGSN/iputils.cpp
-@@ -466,7 +466,7 @@ EXPORT uint32_t *ip_findmyaddr()
- 	const int maxaddrs = 5;
- 	static uint32_t addrs[maxaddrs+1];
- 	int n = 0;
--	int fd = runcmd("|/bin/hostname","hostname","-I", NULL);
-+	int fd = runcmd("|/bin/hostname","hostname","-i", NULL);
- 	if (fd < 0) {
- 		failed:
- 		addrs[0] = (unsigned) -1;	// converts to all 1s
-
diff --git a/net-wireless/yatebts/metadata.xml b/net-wireless/yatebts/metadata.xml
deleted file mode 100644
index e368df6ddf5f..000000000000
--- a/net-wireless/yatebts/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="rad1">Build RAD1 transceiver</flag>
-		<flag name="usrp1">Build USRP1 transceiver</flag>
-		<flag name="uhd">Build UHD transceiver</flag>
-		<flag name="bladerf">Build bladeRF transceiver</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-wireless/yatebts/yatebts-6.0.0-r1.ebuild b/net-wireless/yatebts/yatebts-6.0.0-r1.ebuild
deleted file mode 100644
index ad1aea9178bd..000000000000
--- a/net-wireless/yatebts/yatebts-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="The Yate GSM base station"
-HOMEPAGE="https://yatebts.com"
-ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-
-RDEPEND="
-	>=net-voip/yate-6.0.0:=[gsm]
-	bladerf? ( net-wireless/bladerf:= )
-	uhd? ( net-wireless/uhd )
-	virtual/libusb:1"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://yate.null.ro/tarballs/${PN}6/yate-bts-${PV}-1.tar.gz"
-	S="${WORKDIR}/yate-bts"
-fi
-
-#we need more patches or configure flags because things install in really wrong places per FHS
-PATCHES=(
-	"${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
-	"${FILESDIR}"/${PN}-5.0.0-gcc6.patch
-	"${FILESDIR}"/${P}-dont-mess-with-cflags.patch
-	)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-#		$(use_enable rad1) \
-#		$(use_enable usrp1) \
-#		$(use_enable uhd) \
-#		$(use_enable bladerf) \
-src_configure() {
-	econf \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse41)
-
-}
diff --git a/net-wireless/yatebts/yatebts-9999.ebuild b/net-wireless/yatebts/yatebts-9999.ebuild
deleted file mode 100644
index 18f4117784c9..000000000000
--- a/net-wireless/yatebts/yatebts-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="The Yate GSM base station"
-HOMEPAGE="https://yatebts.com"
-ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-
-RDEPEND="
-	=net-voip/yate-${PV}:=[gsm]
-	bladerf? ( net-wireless/bladerf:= )
-	uhd? ( net-wireless/uhd )
-	virtual/libusb:1"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://yate.null.ro/tarballs/${PN}6/yate-bts-${PV}-1.tar.gz"
-	S="${WORKDIR}/yate-bts"
-fi
-
-#we need more patches or configure flags because things install in really wrong places per FHS
-PATCHES=(
-	"${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
-	"${FILESDIR}"/${PN}-5.0.0-gcc6.patch
-	"${FILESDIR}"/${P}-dont-mess-with-cflags.patch
-	)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-#		$(use_enable rad1) \
-#		$(use_enable usrp1) \
-#		$(use_enable uhd) \
-#		$(use_enable bladerf) \
-src_configure() {
-	econf \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse41)
-
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-04-16 13:07:24 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-16 13:07:24 +0100
commit	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch)
tree	464c922e949c7e4d5d891fb2cdda5daee5612537 /net-wireless
parent	e68d405c5d712af4387159df07e226217bdda049 (diff)