gentoo resync : 04.05.2021

21 files changed, 265 insertions, 72 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index d948c76510ad..e52f1408d2b0 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 10c43a2d9887..ae1d4ee9b0c0 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,4 +1,4 @@
 DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75
-EBUILD aircrack-ng-1.6_p20200722.ebuild 3110 BLAKE2B efa0bb740ceff1f19f55121f2bf13979610a8f9d1b063c2becf456c34e1388fea347cf9b55ca9a72c9ec7a9ff743f4d0170e92be973d6ef8cf70a3c926e61872 SHA512 7196b4ba19e4058b5959292218df55f7ddb8884b23aeb3274464352d18d3fe25ec6f7c29b5502dfc2a445e4bd88635fe985d2d0742fad4a1a76ed52c2805e100
-EBUILD aircrack-ng-9999.ebuild 2952 BLAKE2B f2c4f3148ad4c22f9240c1810bc59a86c980922aa1e4f63820e8f2dac7ca6bb258e8429b297b9df9ff2762de3b8fb0c4e5aa6353586c01b5ebabbf46fa50608d SHA512 f07550ae05f8a9b120aa0f398ca24dba73c52f607a5c411ca41c12309d3af784ca576fe4e270aa5c5f1cded0ca7eaf0dffb94e5874a7c03078485d5ac282c36a
+EBUILD aircrack-ng-1.6_p20200722.ebuild 3050 BLAKE2B d2add05e685e347c424d6b7328a9659405f28f64ba2d0eb85005770417b5608862c364619a85dba666a1d97da49003c90112d23b168b4d4fedc67788a2e4db09 SHA512 c2acb2525cca0dc2869b6e02cecd87edec74da145325c1a2d297928b186da4542a08e12c2f62d545a08d6a0f202d74992efbdfba6163f7bcb256e79b976cc01e
+EBUILD aircrack-ng-9999.ebuild 2892 BLAKE2B 6c5ca1c1db3d7541fd5b2c9b400bc3377f121a627c3b7737fa4893e1a99dbc5e3d8893823730e27ad07aa8eac042839dddf7be68fdb9b8c6f3b43a4cb8cf891b SHA512 4777b317c6353af23afa1f8ce46dbb71e4c762ffe6d9fe793612095098e07c3d07cbf6641736d9777fb8f34f25358bc2ad9fa08b8d63e26e038c9faa82daa6ac
 MISC metadata.xml 1024 BLAKE2B c7f31132d721d72f926098b5a85d4cab21ac4fdbd63e75c15485eb4dd62264061ab4173628e05ddde74523a0557fd905a6dc008305f26c7f65416f92b70a4f4b SHA512 e51a08063ed89d55ba02aef49d249fc18adb03026726230faddf661f55f709a37520c68e632ae2996955f837651309a6d83bdcbad775a540d0a2f1aeddbfee72
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
index ccf1ddb41356..9db871ae620b 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
@@ -25,12 +25,11 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
 	sys-apps/hwloc:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	netlink? ( dev-libs/libnl:3 )
 	pcre? ( dev-libs/libpcre )
 	airdrop-ng? ( ${PYTHON_DEPS} )
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 082ab4ef6b53..9677624aa58d 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -23,12 +23,11 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
 	sys-apps/hwloc:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	netlink? ( dev-libs/libnl:3 )
 	pcre? ( dev-libs/libpcre )
 	airdrop-ng? ( ${PYTHON_DEPS} )
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 4488bbd370c4..013f21db8807 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -4,9 +4,8 @@ AUX crda-4.14-python-3.patch 3022 BLAKE2B b6d78c1a09ec0f848654139e0ba778f5d65d81
 AUX crda-cflags.patch 895 BLAKE2B 0a8d8acb268ff58656a5b66a77744c14fd9f92fd6a660132f2a86a88a3cd5bde4bf39709c38f2705fe999bca312a991304b673d4d12a540cecffd1fcc4ec5cc1 SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d
 AUX crda-ldflags.patch 388 BLAKE2B 57d3ce3fccba1db8ad8bbfae2ba8e8dcd03bdd94c424761902bc2ea552c006c3e4ef1d8b913f095ba3601895bc29917d01c1e8f046a159b2b006b174bed7bf62 SHA512 3a53d3567fa9b3ff85d4e443124ea2637e5eb489ade4f160d8f1de92553a3a33c3eb9f9d80005ceac03b50e5c4aa7f0990bca3547c145644ab66985548c32e9f
 AUX crda-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90fbe503130e81fb423e04d3f257e1a1d78db9fef605e42a4d9571c54e8ac9cb8a2569d3c3cd3f5c6d542a295 SHA512 41c98f1e4ca0ae3d22b08086eb54aefd4ec95fed5a6e5fafd55fb6a9b9649ec18f5f65003a1424cf59bf99e266fddf110c92d9e46a4b40a18be5931fc7bbbbeb
-AUX crda-libressl.patch 410 BLAKE2B c341e349348eb7ce1ca3979865a2a984e44e62786508fe4d93c461abdded1f1169a87a72d90ce4518e3aed1307a4624857e6a563868b303e297a56e6fbf92211 SHA512 205f06886ea5a43f870bc38f3a548ee0f2e10ebc461c3748262bfda521c6145f625ee261089256d3c5dc5d791d1688d072a3f4299ca8af89f311c3f9a74ecc69
 AUX crda-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28
 AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9
 DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053
-EBUILD crda-4.14.ebuild 2213 BLAKE2B 805b9b3492380a289f6186045377b425768400f3966bb74656aa39fd5e1e30a1fcbc0dddd5c5e90f1f490ac943db10d9539b7b29438ad2e839af3cf0b247f4f2 SHA512 d862ce24420e51ea4f4faa7d8c86e403f0744a5f2caf60c116eb7469b3644543f45d287866c1e5c5fb35d874f81083ab8c23e3d1069a95e91ce4d180f1f7933f
+EBUILD crda-4.14.ebuild 2116 BLAKE2B a0827a1a10a78aa957769d0f0474d7159f5270d3fef4779c0a24ef370d7984dfd7b979058061e87b230b9eee953b17d529816a935083fd005d98bfc0f1f384a4 SHA512 1ebec4b157e409672855aa8b7993c47a540201d83dafd149df13f1c17ae8c433ace85930383b07706b34debddfb757ce07865af455c1696a35efc4527195144a
 MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59
diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild
index deb7e455682e..285b85c237fb 100644
--- a/net-wireless/crda/crda-4.14.ebuild
+++ b/net-wireless/crda/crda-4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,11 +13,10 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapsho
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gcrypt libressl"
+IUSE="gcrypt"
 
 RDEPEND="!gcrypt? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	gcrypt? ( dev-libs/libgcrypt:0= )
 	dev-libs/libnl:3
@@ -38,7 +37,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-libreg-link.patch #542436
 	"${FILESDIR}"/${PN}-4.14-python-3.patch
 	"${FILESDIR}"/${PN}-4.14-openssl-1.1.0-compatibility.patch #652428
-	"${FILESDIR}"/${PN}-libressl.patch
 	"${FILESDIR}"/${PN}-ldflags.patch
 	"${FILESDIR}"/${PN}-4.14-do-not-compress-doc.patch
 )
diff --git a/net-wireless/crda/files/crda-libressl.patch b/net-wireless/crda/files/crda-libressl.patch
deleted file mode 100644
index 817f2e0328cc..000000000000
--- a/net-wireless/crda/files/crda-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crda-3.18/reglib.c	2018-10-26 12:39:19.128083735 +1100
-+++ crda-3.18.a/reglib.c	2018-10-26 12:42:39.737916626 +1100
-@@ -111,7 +111,7 @@ int reglib_verify_db_signature(uint8_t *
- 			goto out;
- 		}
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 		rsa->e = rsa_e;
- 		rsa->n = rsa_n;
- #else
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 273db6434152..3691a5bb2b4a 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,6 +4,6 @@ AUX hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
 AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
-EBUILD hostapd-2.9-r3.ebuild 7871 BLAKE2B 50283fe6ba3d643ae7c84c3d47471a56f824ae6aa58cf78b565dc80c8180404f8946182217c74de511ea60cf2e0ab145d58d4e94b6c85a8c49b555b901104593 SHA512 66c092f0d79bff7614fadc0dda04093204de2b1b2afe4c5edc3848d6fb096c21a3abe0b8bf73264339dd67998ce5b7614642574007dbea228adf8f8d978e68c8
-EBUILD hostapd-9999.ebuild 7876 BLAKE2B 0a1fffc7904ade94302842b58f6fae75bf3ffbe0b8a474bbe484c0a5db9699b06d5c15d574664ba1f8b465b7d4ee7a01f394925cad50fbc203c236929dd35acb SHA512 9059af767eb0c61b07aca8d6aa7828e4342a5baef517248c4e88d39701048db694ba9160286636ba6c4dc67030f2f5be44f6c88f03c428cd353431b125ed663e
-MISC metadata.xml 1116 BLAKE2B 658e8397f7ebf2f5f265e1376ee87f29ed9fa81012f0269bf655f4f2647c58f27f7cafc3bcd61ddf312039cef59ad525baf8dcb52dccff8e16842952294da839 SHA512 451d5d71930a4624d2ffc70ee69671d2a2400b0b715a19d0b7f4c14e7ec0457147b068e6ca65fbcc6ff3d75eeb721047f399f55e01fa8d7072dc02c57985813d
+EBUILD hostapd-2.9-r3.ebuild 7550 BLAKE2B e779c6986b7205fe7499809eed0bd3b129b20b9c7d87b5ccbadd68df852b5142fd119ee8be4cd7f20c3b199399cfcebf1b2e37bbc333266e827592a9a89d3bf3 SHA512 df47ee822e74a0f6638846693bd54250e39b750d7e010a037a7e44020adf5f662d860b63c19d307a76f0a34bf75082d746c442768e32a51050156737995f459e
+EBUILD hostapd-9999.ebuild 7554 BLAKE2B 35f31a8f1c76573552f13c8f1370eea464f33ee865be1b669d7e947081cbfc2abb6b82fe9857b62ff8fbc0c2ea396d402ca4580ced38d3851c92f3c435591697 SHA512 898bfa0c1df91d394c83f9c22f1c6eef6202172f7b7651f7d39e73fbc0ebe7ba1ed8fc7c5fa818dc082e1665b66f87ee4d4d3feccbc90631b9cd4295b4538fb6
+MISC metadata.xml 1106 BLAKE2B 4b92b2eaa73222e60eb079522620e58991393296da9e981c742cd2b20fa38a5984c8c7b3d6242f0a27770af32caff148089eaa1ace27b4a152a751557ac0e0b9 SHA512 b0b6e8a9f72e01534770876d5a656360397d48d3736ec6aa5f799e65d414be4291729f78b4f2ebea1a2c55510d337adc0ae709021b3d360deef04f0ea2e32002
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 6183c8c4e5f6..7a63076e50a7 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -28,17 +28,12 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
-
-# suiteb impl uses openssl feature not available in libressl, see bug 710992
-REQUIRED_USE="?? ( libressl suiteb )"
+IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? (
 		internal-tls? ( dev-libs/libtommath )
 		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
-	)
+
 	kernel_linux? (
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
@@ -50,11 +45,7 @@ RDEPEND="${DEPEND}"
 
 pkg_pretend() {
 	if use internal-tls; then
-		if use libressl; then
-			elog "libressl flag takes precedence over internal-tls"
-		else
 			ewarn "internal-tls implementation is experimental and provides fewer features"
-		fi
 	fi
 }
 
@@ -107,7 +98,7 @@ src_configure() {
 		echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
 	fi
 
-	if use internal-tls && ! use libressl; then
+	if use internal-tls ; then
 		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
 	else
 		# SSL authentication methods
@@ -211,7 +202,7 @@ src_configure() {
 src_compile() {
 	emake V=1
 
-	if use libressl || ! use internal-tls; then
+	if ! use internal-tls; then
 		emake V=1 nt_password_hash
 		emake V=1 hlr_auc_gw
 	fi
@@ -226,7 +217,7 @@ src_install() {
 	dosbin ${PN}
 	dobin ${PN}_cli
 
-	if use libressl || ! use internal-tls; then
+	if ! use internal-tls; then
 		dobin nt_password_hash hlr_auc_gw
 	fi
 
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 3ceb1520bd8d..515d2b26e214 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -28,17 +28,12 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
-
-# suiteb impl uses openssl feature not available in libressl, see bug 710992
-REQUIRED_USE="?? ( libressl suiteb )"
+IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? (
 		internal-tls? ( dev-libs/libtommath )
 		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
-	)
+
 	kernel_linux? (
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
@@ -50,11 +45,7 @@ RDEPEND="${DEPEND}"
 
 pkg_pretend() {
 	if use internal-tls; then
-		if use libressl; then
-			elog "libressl flag takes precedence over internal-tls"
-		else
 			ewarn "internal-tls implementation is experimental and provides fewer features"
-		fi
 	fi
 }
 
@@ -107,7 +98,7 @@ src_configure() {
 		echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
 	fi
 
-	if use internal-tls && ! use libressl; then
+	if use internal-tls ; then
 		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
 	else
 		# SSL authentication methods
@@ -211,7 +202,7 @@ src_configure() {
 src_compile() {
 	emake V=1
 
-	if use libressl || ! use internal-tls; then
+	if  use internal-tls; then
 		emake V=1 nt_password_hash
 		emake V=1 hlr_auc_gw
 	fi
@@ -226,7 +217,7 @@ src_install() {
 	dosbin ${PN}
 	dobin ${PN}_cli
 
-	if use libressl || ! use internal-tls; then
+	if ! use internal-tls; then
 		dobin nt_password_hash hlr_auc_gw
 	fi
 
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 09503282fa44..d518c0ca0889 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -8,7 +8,7 @@
 	</longdescription>
 	<use>
 		<flag name="crda">Add CRDA support</flag>
-		<flag name="internal-tls">Use internal TLSv1 implementation instead of depending on OpenSSL, LibreSSL or GnuTLS</flag>
+		<flag name="internal-tls">Use internal TLSv1 implementation instead of depending on OpenSSL or GnuTLS</flag>
 		<flag name="logwatch">Install support files for 
 			<pkg>sys-apps/logwatch</pkg></flag>
 		<flag name="netlink">Adding support for using netlink to create VLANs</flag>
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index b564fc582a09..367cf7c66a74 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.12.tar.xz 923476 BLAKE2B 08bc5906573da11df5e63b812f2d374eaec7c605140675d8209d81bddecd96e05f10099c63f4f49d7957159dbf7654a5dd2191c8e6bcc1dace7bde6dba6cbf43 SHA512 f331a60430582269801cb01d4eca9957a200c5cfecff637941414eb6db4f077c2dbf824b776cd78ae57b27d442cdb8ec9b3ce8468c206387ea1eee2c9973fcaa
 DIST iwd-1.13.tar.xz 927880 BLAKE2B 0ff1d0c0a4dfd08bfea602e8a76fbf7d9078f5b665b90cd6cdf49ed589fd8c43151a3938313ab877653348a6862ae19d228feeea44d441efe17324ff1c5b9aa5 SHA512 7da9d28bf6f1f2ce55c6cd3bedd927580245789ccd3b67bc44d4768ac74e1793f912b12029662fadd6d6f15da68f337553efc05d886d3be04956d2db0d85f01c
+DIST iwd-1.14.tar.xz 933764 BLAKE2B edc6a925872afb6b98f5bbe16fc1cb6b8459a1aff33ec1f9e2d6bd45e605e34debaffa3048b6506cd3e8006c57d6efc9ae341f73050668454ad85fe7e6b4f256 SHA512 bff9b5a744e8eb4e285f28d976e9335d2c85b57fc1eb023c3aa9442e451523b3b9f080d2c02fc5432735c398857b64d115ed2929dd4bb910925cbf18df0b0874
 EBUILD iwd-1.12.ebuild 4869 BLAKE2B bfd4a88bbe3771da227ea20695ba5b8f2de618cc31ac4b783f0b3b29226b8c17fa573219807406ce011a90f35fc5907eca190a40e8f128c08c491a0b23be0f44 SHA512 9a32042377b3466435be2e36c4fb4992b822e9d9e8b8bd09ba31d7ec87ee83e3fb1f03b4e536ad0009a82f5e7d97292c6edb0d13a24c911c7f9aa32f651cdceb
-EBUILD iwd-1.13.ebuild 4836 BLAKE2B c08f54cab8da661416a31a65117358f8a9a1e0c468124a46ee455f2fbf5653719421765fe9176a97098902dcb00092aaf138819d3b286e3fadeb7e906be2f4d8 SHA512 ea301cb46067d4d484ce3c6188fc8996b466476a97e66b7961d10b522e6105b013fa6b718a8b2987b356f0d8c35d0586cd7c9b6309fd89db05ddbae98772d018
-EBUILD iwd-9999.ebuild 4829 BLAKE2B 3367c0d95b627690a8772935f5aa631381ec2ef65cc021d64bbc770a39722c9efd96636323e1c65036979eb8c33ff48d2da19b8ca02a2e517d516e96b47d4212 SHA512 af1ca6e2be49466e5984f41a4b6faa0b0cc2f025a7468c50e6b55e8496a78087717b7a93bbc59eac99b2cfdbbf9c7c3fcd65de36db0239c5233b80947dcb089e
+EBUILD iwd-1.13.ebuild 4832 BLAKE2B dee7e7f2cf199c2a7c66d6b8bf2bf698bf2ddab27389ec957232451f3649f13b5c9291a4ee4e1eff17a67ee15c57b0795bbd664574351e9ba1bc7810c376690a SHA512 68fbe4c0bc424e8cf38cbe8374ca925e304a2f3a36a7affb8894aeb4a430025060accb8863d1f0ce98093f30bed16c5f346a9d32b068106d0c87acdf3461a4a5
+EBUILD iwd-1.14.ebuild 4838 BLAKE2B f6dbba93ba0869cb9bf5055173e860b2dc0398e142c7a49c1bcdc68793a8aaf6028e3a9ab35ac366f7f2563a7132a780d9b720a6d4a63ffe6d62247ee08b2a41 SHA512 45bc691808140ada252a1d5785f621370fa87489ac41848bebe7cde3f8ae899cd4c1b39ceaf098d9d072c291f5750c14493c0cb4de3b8779074940dc59229c2a
+EBUILD iwd-9999.ebuild 4834 BLAKE2B 87df114e7ade404c0455fb9098dff7c56edb764c76390323065a6b1128c6a9afe80cb8b01ca01d9c48294c733d54e8a7423a279ebb6cfe2b78d43ff018a75450 SHA512 327bc13bcad6d5877a82ec9d10cf892fcddf305a3a54988c5b5d59732fd626dfcaca4870d5608d0a8cc2052128bb3d11ed59be7f2c7e44bc7d6abe4b591009c6
 MISC metadata.xml 832 BLAKE2B 904ff92a3b4e243fe9780fcb0ca0376c33f93669a77dbc8cfb345257dfec77057a54a41688b0cf5a9230a058d4e258096fa9664867b1c43dbc1bdc9662441838 SHA512 f8b8cb1b2d49159a23b8bfc27b6e54c0fd5509c16b6425881dd80f833586dde918f9a2d94a608b61689e30891c10780318197f10e703d9587a12179f98121442
diff --git a/net-wireless/iwd/iwd-1.13.ebuild b/net-wireless/iwd/iwd-1.13.ebuild
index 70428c66c613..b7176338196d 100644
--- a/net-wireless/iwd/iwd-1.13.ebuild
+++ b/net-wireless/iwd/iwd-1.13.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 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-1.14.ebuild b/net-wireless/iwd/iwd-1.14.ebuild
new file mode 100644
index 000000000000..b09c7610802a
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.14.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 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.40"
+
+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 ~sparc ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
+standalone systemd"
+
+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_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+
+	if use standalone ; then
+		local iwdconf="${ED}/etc/iwd/main.conf"
+		dodir /etc/iwd
+		echo "[General]" > "${iwdconf}"
+		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
+		echo "[Network]" >> "${iwdconf}"
+		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
+		dodir /etc/conf.d
+		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
+	fi
+}
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index 3f5ab9303c14..47494b053c37 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -53,7 +53,6 @@ pkg_setup() {
 		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
 		~CFG80211
 		~CRYPTO_AES
-		~CRYPTO_ARC4
 		~CRYPTO_CBC
 		~CRYPTO_CMAC
 		~CRYPTO_DES
@@ -173,6 +172,7 @@ src_install() {
 		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/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index fc246211212c..8aa508e7c552 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,4 +1,4 @@
 DIST nanovna-saver-0.3.8.tar.gz 357896 BLAKE2B bace55c49c55e7389931c9f001e49cf8c0dab895b390e1be94d9f590e8c6352d81ff0ce6029c06211939360c76710c4df919af3e0f41533e1d7d56b75a788d3e SHA512 f560d076eb2ab06e441b0e1cb73cf20318abacc70dc9092ef9e32bac4198922aead8210997c176c774dffe2325407ad66cfbbb0f120f1fb465b84e46b28beed8
-EBUILD nanovna-saver-0.3.8.ebuild 911 BLAKE2B 05e94661effcafbec2686c10d5d9b295692a8a4979ab05f7fd5545ba86ad43f19982257ca256da76836dd8e3438e18158ea1995097e0d42b7be47e529b8f6f03 SHA512 92111b735f3b5d302ae7937b60bdd6417eeaca66dabe2ca4f06ee4543bae4b6c7f7ab54d517800be77cb6aa83742789a6b8beb66dc0ce9f47cdcd88c8657cae2
-EBUILD nanovna-saver-9999.ebuild 911 BLAKE2B 05e94661effcafbec2686c10d5d9b295692a8a4979ab05f7fd5545ba86ad43f19982257ca256da76836dd8e3438e18158ea1995097e0d42b7be47e529b8f6f03 SHA512 92111b735f3b5d302ae7937b60bdd6417eeaca66dabe2ca4f06ee4543bae4b6c7f7ab54d517800be77cb6aa83742789a6b8beb66dc0ce9f47cdcd88c8657cae2
+EBUILD nanovna-saver-0.3.8.ebuild 912 BLAKE2B 54e451cd3445eb75e09ab5c1fdab29ff10375b71fc92676c1df41aaebcc6964f0e92faabb9067b074e1226c0d8801724a7ce892d2555e70ac95024fedd97fd9a SHA512 b4f5da18d224970108e2035b83b0e43a17c2b0a509aa9155479eb1b6c8d2654b5ac33417851060803fc593f286c5fa053387a2c79a5e2bd0c7b77c2cf54b4e48
+EBUILD nanovna-saver-9999.ebuild 912 BLAKE2B 54e451cd3445eb75e09ab5c1fdab29ff10375b71fc92676c1df41aaebcc6964f0e92faabb9067b074e1226c0d8801724a7ce892d2555e70ac95024fedd97fd9a SHA512 b4f5da18d224970108e2035b83b0e43a17c2b0a509aa9155479eb1b6c8d2654b5ac33417851060803fc593f286c5fa053387a2c79a5e2bd0c7b77c2cf54b4e48
 MISC metadata.xml 432 BLAKE2B a8869193d052dd0ec1fcae10641b19f61fe2faa2bfde6e60f9758b4da9620a316e9b318d11c778fcb0c1de1a2537f98587a8ec928bb814ae53b0160deef18be7 SHA512 0727e758f3cfd75ee8b54ac05636228fe6422ae5b8a0b0eb37f475abc075d30765b3452a05c9e99c56b8a25c378bebfce69462906910c86254f586203640dffe
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild
index 27756ef03e1d..c56b16504c74 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}
 	dev-python/scipy[${PYTHON_USEDEP}]"
 BDEPEND=""
 
-src_prepare(){
+src_prepare() {
 	sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
 	distutils-r1_src_prepare
 }
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index 27756ef03e1d..c56b16504c74 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}
 	dev-python/scipy[${PYTHON_USEDEP}]"
 BDEPEND=""
 
-src_prepare(){
+src_prepare() {
 	sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
 	distutils-r1_src_prepare
 }
diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest
index b47f042be143..f891f21fe34a 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,3 +1,4 @@
-DIST qdmr-0.7.0.tar.gz 3743078 BLAKE2B 779329fcf8f091f237cdb851e03359c9a4679f687f3d9e995ee41869ce38b8f56baadd58bcba302a7f4c43ad76663946c90ebcb5b3bb1e01f94fa5bb6b2e8929 SHA512 d585e4331c267ff2d25de4e66ecc6f51b57190ab493a18699e40a870e5db07342183ce947b2b063a36a38fc7d122aaa174ebe3fd0695ea56dcde7f707ee0dfc5
-EBUILD qdmr-0.7.0.ebuild 801 BLAKE2B 67e27603a58d07b48b770de8dcce3ffdafc820f20adaa38d5c6b7e41ab39d4c86843bc41cf14a883097d925731b417188a28b66aec30688550fe03b936c55d59 SHA512 742780118e20baba7c0410333501fc43ddc7ef33982cb504fe8be9ca6033f14fa7ec47ae1c75458af65fc29973c4d57e0b5016555cbb1525c2a96869784d8761
+DIST qdmr-0.7.2.tar.gz 3749310 BLAKE2B 31df190a4054c3314e25d40d8eb494664871dd551302227e90bfda13d7270ba66dc6c8ecd2b852f780894c601f57b91988e4e3fae6dba1a43c98bedbba82f703 SHA512 68df43f54045794c4d1c0bc90dc4680fe1bac0078d2092a4267d6e24caaf3e1207f9a1fe78b95360b872dd0010c38b7580502dd5bb00d17e5a2ec45ff906265d
+EBUILD qdmr-0.7.2.ebuild 913 BLAKE2B d294e2546f9d6e470f2f170a5b5114caf845bf0ed13c619f83c37988f48961d218c958c0b905a6fb05c330758d48c098923561e6ce39304d8ac7c43cc4e2e4c7 SHA512 60f76dad956ca78f91cf4133e8e574a28071723e87dd3cb16b641a3908b76f40d4c60566ea2bbe43c1b7ed632b8cdcd71b41dcb0b25df3a97e8d53d56a3a32fd
+EBUILD qdmr-9999.ebuild 913 BLAKE2B d294e2546f9d6e470f2f170a5b5114caf845bf0ed13c619f83c37988f48961d218c958c0b905a6fb05c330758d48c098923561e6ce39304d8ac7c43cc4e2e4c7 SHA512 60f76dad956ca78f91cf4133e8e574a28071723e87dd3cb16b641a3908b76f40d4c60566ea2bbe43c1b7ed632b8cdcd71b41dcb0b25df3a97e8d53d56a3a32fd
 MISC metadata.xml 318 BLAKE2B 9cacba8715336d0e5ad5f9dedb1cc57a8c771941c98111cfbd3b5e1cf8a3ddacc5d26bae6e0109222af160e7103fcb826ba1af5eda0623501890c1ca30853564 SHA512 51568083da9127e860cab2a69cc25f99d6431c65577d2b26c4eee688154e65406a66cd6323662ea0531babae8c3dd643ea8430349e21539465dd8be3039604df
diff --git a/net-wireless/qdmr/qdmr-0.7.0.ebuild b/net-wireless/qdmr/qdmr-0.7.2.ebuild
index 3ac2b78f8923..ae09930cdab3 100644
--- a/net-wireless/qdmr/qdmr-0.7.0.ebuild
+++ b/net-wireless/qdmr/qdmr-0.7.2.ebuild
@@ -7,11 +7,16 @@ inherit cmake udev
 
 DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
 HOMEPAGE="https://dm3mat.darc.de/qdmr/"
-SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
+else
+	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-qt/designer:5
diff --git a/net-wireless/qdmr/qdmr-9999.ebuild b/net-wireless/qdmr/qdmr-9999.ebuild
new file mode 100644
index 000000000000..ae09930cdab3
--- /dev/null
+++ b/net-wireless/qdmr/qdmr-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev
+
+DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
+HOMEPAGE="https://dm3mat.darc.de/qdmr/"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
+else
+	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtpositioning:5
+	dev-qt/qtserialport:5
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+BDEPEND=""
+
+src_prepare() {
+	#no devil perms
+	sed -i 's#666#660#' dist/99-qdmr.rules
+	sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt
+	cmake_src_prepare
+}