gentoo resync : 07.01.2022

18 files changed, 84 insertions, 264 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 90ed979468fb..c02995af7f7b 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 9664e93e1357..1e61baff95de 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,5 +1,5 @@
 AUX aircrack-ng-1.6-hwdata.patch 921 BLAKE2B 0cbe038a33745cfb9bf873ea34627281d4a5f30e7f36595ef85490d4a13d281235f7e6cf09af1f0d7fea10fefda4a4ba76bcd8f0175520fb6b314c191dcd998e SHA512 cb2bcb89185555e827f3bc28135ac0fd025f3c9a7e770c779c4feb3737ae6a975c55ce041e31cb4409a9339b730b42d453eb62b5576709a79e42737abe5ffd1b
 DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75
-EBUILD aircrack-ng-1.6_p20200722-r1.ebuild 3107 BLAKE2B d36f436ec00410e1713ec869d5b3dc6b5fff239e536edc7adf1eb457ddc05dd08524af96759f9c5aaca34721135b50787b6e53698a54a1aa87e4e7460dc454d1 SHA512 7e22695d8f81aed26aa6741487cbdd96965042762507110d499f4ad4182b4bef62cbffa94a8a168b54565d765385d24ed7783efd39f283ed6644136ec5129ceb
-EBUILD aircrack-ng-9999.ebuild 2884 BLAKE2B ed54ac92d75c1c1b6c5f08de0730f7d65b53a7a4805edffae880de577b0c18dcdee132d7811affcc5091d3e0a042f521924f013141e43210e8982fa7ce1fcbd7 SHA512 556433bfc754a0578eef2ce61cf2dc5cb9866311e7f767b9d1b77fcc4a959581b4e66861191d06f4926990072fce31c860db30a955ba1100ce9f6f553441cfc9
+EBUILD aircrack-ng-1.6_p20200722-r1.ebuild 2471 BLAKE2B feb9795c568e5e85deae43f3e4c3f75d90e4ee43d9c432abbfcc8bfbdf5062702f7aaf07d9ce7f22cf0937e61a3105d81dc3f101606522a03216c3a3da2d8e5a SHA512 24a09e3d256bed439bee9931dad1193c7cfe5816017f8d0b777e511232158bcddd4b2474b17153efe656ddfa51749b8c0406ffd625b19ed492d0da1b73b18730
+EBUILD aircrack-ng-9999.ebuild 2248 BLAKE2B 08bc959f2f557bdc29e59897a304262de7501ac08e20ed6f2c7942cd29e639e6c06a1f2045b7d24bca27bf93c5a56c5c4463d6c2a045e4e38b16b5859c541716 SHA512 474dfbbce5f8d1db26f26b4c827aad16472ce1b677700e74c70f4ee8766d91317300d646b6e8492c106358aab9ccfc95382c08889f844bdf39b1c981777ec589
 MISC metadata.xml 1025 BLAKE2B 3ef3b53eb156de9ed98d8a6283b6950e6d2f184d1058139a94222b18d5695da805444d993d50d9fc9736c7035a3a20253679e06e5b64bb1c83f504aa4f0406b6 SHA512 bd9b04fb372175910512baba2320a91e9122dded0070f0498c82ae55716e4b5dc027ba7027086805ab9782283eb43ab0787e41a0a5b8c551e696511ac45bc291
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild
index aba4869d9ca4..6e2b86e4ec30 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
+IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
 	sys-apps/hwloc:0=
@@ -104,18 +104,3 @@ src_install() {
 	rm "${ED}"/usr/sbin/airodump-ng-oui-update
 	find "${D}" -xtype f -name '*.la' -delete || die
 }
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index e7aadf29d9b5..6ca26f493d03 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
+IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
 	sys-apps/hwloc:0=
@@ -99,18 +99,3 @@ src_install() {
 	rm "${ED}"/usr/sbin/airodump-ng-oui-update
 	find "${D}" -xtype f -name '*.la' -delete || die
 }
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index f2af225b3f31..d3aa93581e29 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,3 @@
-DIST blueberry-1.4.2.tar.gz 1414169 BLAKE2B cd55e2bb572efb2badeab1667324df67c35f5833c53755c76c0793c07e8427c7d4714135014dad90aeaddc806c798f2b89960a051a15f668d214bb95cc0943e3 SHA512 5c2fb94e842cd1229682305f0054061724b958406ea15a64495ca418aa7da73c38b45ddc43c27a193aef995ab860cad985e3369e3dac53d2098463e6e4250493
-EBUILD blueberry-1.4.2.ebuild 1270 BLAKE2B e41da4d8d46f46279d39d62731bb646f3fd09c62c806a8c7fbb1b38aaaf1d2d7233844f3e7b550b2b590fe202ad1090e544f5f73212e86215b25d2bab02b22ce SHA512 a6d9f7e4821fbef86be025a79b19c09d441c5ac0f343f121256f4e07b809c54ca78d0158af2688e2f4902150ce09acd18f425d2131bdb0822db61815d207772e
+DIST blueberry-1.4.6.tar.gz 1415484 BLAKE2B 2b0a737d6e9e10f4f8502ab6af5e90b35e2eb651a48b431a0738cf06817ca49f12e9cdf6e0a3221b42370a00cca23c7da54d75c1f801968f1ee6d87dc3523590 SHA512 580b0a0434bb3c980158361a22ad0d8a502cb8b9c5d92adf4e97fdc28405bd5422709d4c605923371284457389f68aebce3e4599b7dd0c35866b65bb4fc2355a
+EBUILD blueberry-1.4.6.ebuild 1270 BLAKE2B e41da4d8d46f46279d39d62731bb646f3fd09c62c806a8c7fbb1b38aaaf1d2d7233844f3e7b550b2b590fe202ad1090e544f5f73212e86215b25d2bab02b22ce SHA512 a6d9f7e4821fbef86be025a79b19c09d441c5ac0f343f121256f4e07b809c54ca78d0158af2688e2f4902150ce09acd18f425d2131bdb0822db61815d207772e
 MISC metadata.xml 494 BLAKE2B a25e54118f511c2d8d7077d2f6f7a21f5bf7a7edf03cde26561a147136868e3dbcbce27fe6628cb5637dbb728762dec841bfe0fa21e03adc34b49eb8c64722fa SHA512 9b9f58c5a954d69028c79611e11670e205366505626236895dae550faf672868ac6c778a7bd6f864ee20a29fc2f9c192065871ad28bcf2e3a7e16cb0d6cb39cf
diff --git a/net-wireless/blueberry/blueberry-1.4.2.ebuild b/net-wireless/blueberry/blueberry-1.4.6.ebuild
index d4077a454e74..d4077a454e74 100644
--- a/net-wireless/blueberry/blueberry-1.4.2.ebuild
+++ b/net-wireless/blueberry/blueberry-1.4.6.ebuild
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 480e290fbbbc..40cf1f420e94 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -3,11 +3,9 @@ AUX iwd-1.17-fix-tests.patch 1358 BLAKE2B f399c13ce1c8594bcbe5a4bb84c7cbcf51121c
 AUX iwd-1.18-musl-backport.patch 1014 BLAKE2B 47c89ce3f2d39c5c416be8b43a076cb914d5bb2431ea88e437d9966c608786ea00d71d713f143a2c6a957030b806e33c1d9a1ef739836430863f5b362c9f4e8c SHA512 7fc86e71f1c372052051c0ab73df7d301ff7498a8b70d95830bc099f0f4745a247ee54dc93de2e0173b284ac35f73fcad4cec04f1eb2dbe6ed1923d8e14e3035
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
-DIST iwd-1.18.tar.xz 961392 BLAKE2B 3c7b0a7996590435d8f8033ab0b6283b2860409064c8617eda51ecbd73102134bbced66bb4e1323b64563e21d52beaa7f88ae5168747a5a2a38355e266f9c3a4 SHA512 85c3e16bb8eb8e564072fab66b30d1636c853706546fcb35723b4b3339bcf969f08ca07bcd458521f044f407513f5d793724b316af4b7819def8400ed88f0d3b
-DIST iwd-1.19.tar.xz 972652 BLAKE2B ff93a1e26ad6afd90d1c92865e2c26c0722b5f1e0a8bba73c37569b0dfac2923e68ab4459dc83dff1bd14364f473b531f967466a2cd70b258ee13c45ce1eb03a SHA512 67544433107ff95ccfc39853a65348c5602495532a40ff6dce3c0e5dc492aa2a6cce281db9b8a1e9f2a1e5c2e712b8adce0b088d340605c9947aa6fe859fa87d
 DIST iwd-1.20.tar.xz 973964 BLAKE2B 750368aec999b988aaaed34454a1a15a75fa9c37ce4523715156c1bc89e343aad62c0d0f0ef5f798a75b19a271175f05517e641f3e2a6e502d932da8e1cfff63 SHA512 1a272492d101bd6ec22df16d98895ce03aa8470b35a7b3c36e5431239e519f74fae81f8bee25e52ce7705459b42e37298778f671a39e98787ddb1b9881521847
-EBUILD iwd-1.18.ebuild 5056 BLAKE2B a9aaea65713db66d5f9a859a7b931adb9973ff917b1231008a1435998cf8ce604c3d0e155d199aa90a3b17f6c6f3af83a59fcb221e2e7039b0f9cd4b8c20b862 SHA512 df341a83d4f51732febaee1d03d84a25307a2ea448a447189c12626746e0c32dd667d63e1a62d5c31c83e6b7d7ff5b13a8852e998cb2a61e2313d149366eaf3a
-EBUILD iwd-1.19.ebuild 4941 BLAKE2B 0cb271b7b57441181cf40ec006307bd27c245ac6c31e7f646de621884354588e8b8dff64c4b84879a07606b126a929fb0491accac1b331ecc5bfba3cb3f66627 SHA512 6c5b356e6e9dde3e2db525c0d3ca58c0f962cc8f105721805a685fe83670eee91f74faf132443af6b13a262507de2bc80b56c63ed3b667a9172656cf1449afbb
+DIST iwd-1.21.tar.xz 994644 BLAKE2B d8a12463f4f6e4b5f1840625b723fbffdd67df12092a9f945240751e40af7cf1d6cab4cba2e97f4fa628f902354bf76921238107c630c9fc4b35f451ccb7456c SHA512 420e4c1f9a7a0a11f6dedff5213d4b80671747ea3d24c4d492a843e3dd9813727127f4f0930588849d4aa6e6e1ca8f8434f0b07be7da50fdd0b2ab4156725389
 EBUILD iwd-1.20.ebuild 4935 BLAKE2B 928a2e49188357f14a99c6abe9c60046c8e0471382215791e7a020945ffa37e0dab11e3fbc50cc79b44aadbf2cf17d3f1730300b03c6297d7ad4d39002dd33f8 SHA512 f544d5276a5782cbcefd5221972bf2c0d17a3adfd8e917ea33116dc9a6da7061fb3e96a4d830a5d9be3e1a623e85f72a728f1aa1b53960bce32bfbfb52f895a2
-EBUILD iwd-9999.ebuild 4930 BLAKE2B ef4e6abb91312e52edc376f99664863d83ff87340a7a83e617b826d48fd85c8b70c95e0929a1c3461ec03bc45724ace0f287ce5b03cb381e6221b9414f38b93e SHA512 485aaca5116e7f13b5a76816bf0b98731c95f305b69e40ae717bad2da2760b8759eb2043c8f6888fa790854ed5f8b0039d920572af5e6396fd297aa2e2d06256
+EBUILD iwd-1.21.ebuild 4941 BLAKE2B 3aef789bbbb76a0089b5b9fa0ccf3e82d552729c4adb32c8298c2b7cd037212c51ccf78a6557f15f0940b27642ca200b4d06cc20abf69c8773c88cc578b3ffcc SHA512 a16c1423b0d88ad605bc374e39afc293e16e2eee2be97491d95fc36781121979bc13420dc9960961807a3d6b48ccd6ad6adc0520f020d3be042ce79795173a8d
+EBUILD iwd-9999.ebuild 4937 BLAKE2B 3d6b12722babbfcc1a42faba7fe80fe7a30846b24c5ec45bf51031c0fee77b866f5a89ae89d5c0b812beeb52c776c0534f30792e6754ffa8f0e8d8dc1cafd821 SHA512 30e0ca29f9de87e99dfa36a0aa072c960feb81aeee3d4146f58a307733fd56ddd52b6bc6106eca53cf847c06bb19ed9be0b473abbc97d90e59f27ce1512bad90
 MISC metadata.xml 844 BLAKE2B a0745226f5314cee29c405d53b5f03c1e2706518272a69443174123601c4b79ad5902e2f22575b46bed37c5d6ebebd1ad4cdcccbb7c40405c4d04f2b92bef17d SHA512 9997101871ad37981492b0a70150d091926ec2321f13d70d5f85f2ff5d360cc87970beb9575c2f78a909e6f3a91ef022fd7115db9ec0ec77d5d94363ed30d793
diff --git a/net-wireless/iwd/iwd-1.18.ebuild b/net-wireless/iwd/iwd-1.18.ebuild
deleted file mode 100644
index a80d0e0f25f2..000000000000
--- a/net-wireless/iwd/iwd-1.18.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.44"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda +monitor ofono standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-PATCHES=( "${FILESDIR}"/iwd-1.17-fix-tests.patch )
-
-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
-	use elibc_musl && eapply "${FILESDIR}"/iwd-1.18-musl-backport.patch
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake ${MYRST2MAN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${MYRST2MAN} install
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		echo "[General]" > "${iwdconf}"
-		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
-		echo "[Network]" >> "${iwdconf}"
-		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.19.ebuild b/net-wireless/iwd/iwd-1.21.ebuild
index d91aa706aa87..a53771ed5b53 100644
--- a/net-wireless/iwd/iwd-1.19.ebuild
+++ b/net-wireless/iwd/iwd-1.21.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.45"
+ELL_REQ="0.47"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index bea6be6a9ea8..64554bac45d6 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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 ~riscv ~sparc ~x86"
 	MYRST2MAN="RST2MAN=:"
 fi
 
@@ -22,8 +22,7 @@ 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"
+IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda +monitor ofono standalone systemd wired"
 
 DEPEND="
 	sys-apps/dbus
diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest
index e97b06dc4866..5eff176c9e04 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,4 +1,6 @@
+DIST qdmr-0.10.0.tar.gz 5819245 BLAKE2B 5beb4cb876742911d00f34953d30c6e26ba41db3e6bf653bbde57d003fee712e2d5652cf9fba15332629491f8b3c43da7408094e187d47532976c088dc38046d SHA512 1764b6af3e90744ebe8300fd8e46038bca0ff1ba6ac0789a2b947ed9310efa8ca867a10a50f12a41cb150728a7b88c129df03e806d95b48533356b8142e2ada9
 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.9.1.ebuild 1331 BLAKE2B e8fdd54df680b737bfe10ce343ecb044ffe798685cc521ad89be0ebec2242c3c0a5ee2a11d00dff87784c9a71f2ab71785536c6f654d5e253a63b5d4389d0898 SHA512 529fe241cee0626936f237e709ebaf5214f561f5306648e3340ab81e7087374024a14616093962324f48e51520a1372e511b00a6e2e35d3e6397c93b046ddd37
-EBUILD qdmr-9999.ebuild 1333 BLAKE2B ca4c64386d6deb373b18ad7b13c73c28a34af22e0205d5a0bafca86f9e81db144d1808e2136147076cee62a34f0d04cb3b7176b3a04e8bb811d5321a00a3c04a SHA512 d75c019dcb65af2bc49ea8d380a646749e2d36e942549d5b852af2fcaff1512158efd2767f1addd351d1ebbcfb643222e26b09920ff049354ef0a7eee0ae31db
+EBUILD qdmr-9999.ebuild 1338 BLAKE2B b39f547f3d89dc38f369731545f2512cb0c82cad3783e6db12e2567b2aaf48a22a614df58e2039c387ec72a0103d40ac6202b7598af0496309f3482c140c5423 SHA512 abb0c74ab4736b8812d67e06d9318c0dae8debdbe45327b3f5804566929b6bd8346632080ece67a4ced62fc9132dc7a2d281778e1de7cdb87016030b204e2388
 MISC metadata.xml 319 BLAKE2B 1ce9d4701527c9ba9f8d990413aa07b22bea984360611162da0baa235a71fffcd16fe13cd5ce6c8f4192e9533e0886358f40890756d9220cae5a6d6af7e903fb SHA512 b59a65526d21586cc142876a59fea232d8d8e34cc9faf85a05b17b45ea3e98383e3e4be92d639e489ec5c62c74c53253a4de26adf4151b877135c754cb08de70
diff --git a/net-wireless/qdmr/qdmr-0.10.0.ebuild b/net-wireless/qdmr/qdmr-0.10.0.ebuild
new file mode 100644
index 000000000000..f46aebabe549
--- /dev/null
+++ b/net-wireless/qdmr/qdmr-0.10.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev linux-info
+
+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
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-cpp/yaml-cpp:=
+	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=""
+
+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"
+	CONFIG_CHECK="~USB_SERIAL"
+	WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio"
+	check_extra_config
+}
+
+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
+}
diff --git a/net-wireless/qdmr/qdmr-9999.ebuild b/net-wireless/qdmr/qdmr-9999.ebuild
index d80ff7599869..f46aebabe549 100644
--- a/net-wireless/qdmr/qdmr-9999.ebuild
+++ b/net-wireless/qdmr/qdmr-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake udev linux-info
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 0c231bb861f4..f9aa2d132082 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -14,8 +14,8 @@ AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e1
 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8
 DIST wpa_supplicant-2.9-r3-patches.tar.bz2 5266 BLAKE2B 284fdeaf6328c35b1f5e88075c62c3b008ec2c400b0cc163a59d9cf8d7c356c3e58f8798e5bade102259d2e5be2ed298b63a0001d0a4ab71d90604a8ee8bf274 SHA512 80e4950ddc99d1134a29a3e5a39767c756f7c9f9f283749e688db3435184631f0384b78954f926724ceff86c96d05b4fb042160265e9d00f976a96e864b7ecc5
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807 SHA512 37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8
-EBUILD wpa_supplicant-2.9-r4.ebuild 12060 BLAKE2B 8843c2e43a7b0dee34d5b5e02488ca23b16a4876f69112fc18f8d46c8c86ecc1cef522fd7e157ab60a93d54a9b5603ea6a65f2ebac9fdcfb5da32b9c45f6ec35 SHA512 ddbdf6269775a13c726f727b0df4f1049f890165bedd4072ab031c00cde051964c62a7e6265acfab439fdf256f968a543bba825359e893bacf1e4d44b6c232b9
-EBUILD wpa_supplicant-2.9-r5.ebuild 12434 BLAKE2B 523199b19036417f6bf5ee7062444b85709393470ad03a331f4a47c2150cb463abb6da50d4c3ccef4b78e39ce194778eb00ee312ead5285d8b5be838d61fdbe2 SHA512 51faaa0f6264cb140e609429152fdee361603dbc21abae230e1d24041e58decfda7c6f107d3e9bee8218d75bca979668f70fc379b39397599ac87ae364afe064
-EBUILD wpa_supplicant-2.9-r8.ebuild 13048 BLAKE2B 353dc1e5804f16cb0c3a1adb15080bfd4aeb3863cbc6ea3ecd9873bf30a88d857036403c34b45ab8556fdde73b3e4b9685d1fc162fce8e002e6c87e9253165f5 SHA512 dddb74bb5e5b231571e9939744955e327f4cf3ce74d4bd6c8598e9c2d4d7063da499fe8d8a0b76009a45c76dc115d2d1f630c3509763c914340ad0805cfce775
-EBUILD wpa_supplicant-9999.ebuild 12656 BLAKE2B f97f6fecfdfc766489cfc9fa9d1d47edaf8b857b8d8c23ea903bd1fb2861b7a2a18c8d3042fe5c763b70ea9b58390e4d309606b070e269dead9a9402e7b3d740 SHA512 c8c389adfee5b84a2cac9fe5cb2163e850df93365e01bdcbc15f6bccbd5329ae296631aa2a4cc6505ea31fe402728caf0d5e4216e415e02c479a4ca13c76dbf2
+EBUILD wpa_supplicant-2.9-r4.ebuild 11937 BLAKE2B d9dd4c233bd0d700563f849271d09e75dd9e5c754739e51d8dc6889199d4d8003adf25ab51ece8df9e10200ee86a203d8792726ff129e78091ebf591e58f7bf9 SHA512 8e063b1a3236bf80f551a1d5c4d211a72cca442c52b62c676375fd8281d3da5081e0481a6793390e1c570a16f59203c96d55d6b1f133d0d505b6a7caf42ae5b5
+EBUILD wpa_supplicant-2.9-r5.ebuild 12311 BLAKE2B 9ef4ccaed095a0adb90dc039c8cc2ff97f6e10c2cc0b26919aa247204370de658da548651eb854dde7c0dbeae35cff7c32f7c7d9564f96ec217f6b8208e19f5e SHA512 0b887ef1f384bf194be26872aee8ba798722bc7598bdde09cd94b7f656dffd0f67899fdef66bfb81105fe4bffb1fb1a032d6b17af3bcd0e12da721708d175c28
+EBUILD wpa_supplicant-2.9-r8.ebuild 12925 BLAKE2B 58808d6d60e53dd3aa4dffdb503f05d5afadd671b0390585cae241a4777778a0f1a97a5ebba65704339f813d9c057b7a4da4aa346b7fa8ff5084c7868a1b0b59 SHA512 8b40834efc140c1ddc8189232e84043ac2cd8bf447a9fb2f4cb938779b4d5cb0ee150b3af376af41b9fa74db94a695298d8103191d90c02674da7f0db2749a82
+EBUILD wpa_supplicant-9999.ebuild 12533 BLAKE2B 030514b09957f3cc04d7bc8b915cb2f708ea5c02560f66b0444468399c1fd75af5af91e661ee7751672d0cd46c6d4f4640dac36e55000799af7f0c656dcd60a3 SHA512 8352d0da3038cb43c99e7475f572422e3df7bb722623317edb7d6b587a21c220458281d1e4a3d7322cd2b130b9db9759a4ac5601a23b3daeab4bdc399cff3f32
 MISC metadata.xml 1804 BLAKE2B d8e5383b6ff9511bc0541725d2c6e8b114f4619d27d6d96b09e868925ebf20fa1e63476218c3b42e1c01af695492879c4e428cf2ae34ea139bca21ef46bd4b4f SHA512 1fc0ccf65262195d6f8896fc0414cb5a4203b3b659bff68bac3ad449eec77d3ce071b7453c636eb16d666199770fd2c65d4b45aca20d14f32b9e0874ec676e70
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
index f3b138d121f2..1f17da11e7e4 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -282,10 +282,6 @@ src_configure() {
 		if use ps3 ; then
 			Kconfig_style_config DRIVER_PS3
 		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		Kconfig_style_config DRIVER_BSD
 	fi
 
 	# Wi-Fi Protected Setup (WPS)
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index 62785e101ba2..3be08e10a41d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -288,10 +288,6 @@ src_configure() {
 		if use ps3 ; then
 			Kconfig_style_config DRIVER_PS3
 		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		Kconfig_style_config DRIVER_BSD
 	fi
 
 	# Wi-Fi Protected Setup (WPS)
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
index 8c0150f8694d..1b4727fa9173 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -312,10 +312,6 @@ src_configure() {
 		if use ps3 ; then
 			Kconfig_style_config DRIVER_PS3
 		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		Kconfig_style_config DRIVER_BSD
 	fi
 
 	# Wi-Fi Protected Setup (WPS)
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index 132825beb46c..2e075c4c2b2b 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -304,10 +304,6 @@ src_configure() {
 		if use ps3 ; then
 			Kconfig_style_config DRIVER_PS3
 		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		Kconfig_style_config DRIVER_BSD
 	fi
 
 	# Wi-Fi Protected Setup (WPS)