gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /net-wireless
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
46 files changed, 937 insertions, 719 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3d0858fb6795..5ffeaff0ebb5 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index d995d4c08d2f..8b592fdf2c56 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,3 @@
-DIST blueberry-1.3.6.tar.gz 1411444 BLAKE2B b86db1f470f44ad8c0b8efa173f0d161112a6ddd734b9cb9545ece78762299ed244855d9d89d7f9090f876ca6da8ac0b8cd8e2b4627ea94588bfe52b466b43d5 SHA512 6ff6a9b3dc5ff46fc383f55a1c6f519447ca707fac2a31436a1a8d0955de50dd5bfc9977879fcd3191ef1a4e508629ccb0d790a2dce3fd3ff54be098218bbd8d
-EBUILD blueberry-1.3.6.ebuild 1345 BLAKE2B 48f8bffe760cbd61a1a53de51fd0f550bdb94f6e84c4c5b6535a7947e2f72a774eec4cb00691614209c1ce9d29692cbfc09927edbbb02525ebf0442b7e4fe72b SHA512 53dd07b8f4277c91a584c524724f51598ff9d173d1c0e7ae3d1029c59dd599f8fc585c61765f66fce800d9598f2afd34a25aa2a354486051975f54eae41a9c95
-MISC metadata.xml 576 BLAKE2B 1c705170b11fd8afef9f65f90743b7d3443b3952c084b771dbf93ea5bb4765cedce34cc818334ec01c577c85774e26fcf28b45d35c601e033b3478cd7713d87a SHA512 0d04db85d6d5ce7df8bdddc00ec8ff040e3a1bfdbde15300d83b4c7d59b8577314b43716909fae926ba5ace3ed75ff9b5fed7e1da3e7f8bc54f4411018d1b445
+DIST blueberry-1.3.9.tar.gz 1411969 BLAKE2B 2a11b12428166dce5dbeb00cc3813e9dea96b61891456622833400f7a9bb69a61317e9d6bdc862edce2c39f64fd04950dc793724338cb266ae365b1d10abee49 SHA512 7ee5e33daf0ce3b41bc3827042aa14ed4de1b58f862e76a50934d6beae79bf7e68b657461370da2e309d15c7ff858c8fb18aa7e891e7bc70e70c171884c5bb57
+EBUILD blueberry-1.3.9.ebuild 1296 BLAKE2B 0048ec0fed4c4960835f692f0b356173e8a542c8e8d85672e4664a3197bc1be7536a5d4304a4dbb0ca65b485728c40cb9cf5c8b423b2e2b3bff7bb4d33ca51e0 SHA512 a05e9de0c86ab0893e9eb72506b53b5a91778f0c1a957bfcecda397f52d21f4dc5f9c5f7cea706e186670e55fed8eead72f364b7773dbb6399f75b0249e14a78
+MISC metadata.xml 463 BLAKE2B 43efdc9d7413050862806d176ede86cac0bb7656be890775b72447f59cd3406b995058eeec30bfa5b992817f04b62dc00e696257b08ebe02d7b8d360f45fd14b SHA512 a12f04991328d0092a6d3127a1b028ae620f20709d4c1c45587618c50d8d19216055b8dc6d5d3085758f39a21ea8a2fa91d36ae7138fed43bc2d24ca3c486b57
diff --git a/net-wireless/blueberry/blueberry-1.3.6.ebuild b/net-wireless/blueberry/blueberry-1.3.9.ebuild
index b5c019bbd2ac..4092fe92950d 100644
--- a/net-wireless/blueberry/blueberry-1.3.6.ebuild
+++ b/net-wireless/blueberry/blueberry-1.3.9.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit eutils gnome2-utils python-single-r1 xdg-utils
+inherit gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A Bluetooth configuration tool"
 HOMEPAGE="https://github.com/linuxmint/blueberry"
@@ -50,10 +50,6 @@ src_install() {
 	doins -r usr/share
 }
 
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
 pkg_postinst() {
 	gnome2_schemas_update
 	xdg_icon_cache_update
diff --git a/net-wireless/blueberry/metadata.xml b/net-wireless/blueberry/metadata.xml
index 77900a98ef0c..49b903bd866e 100644
--- a/net-wireless/blueberry/metadata.xml
+++ b/net-wireless/blueberry/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Olivier Laurantin</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-wireless/bluez-tools/Manifest b/net-wireless/bluez-tools/Manifest
index b6f992818934..944da56f2de7 100644
--- a/net-wireless/bluez-tools/Manifest
+++ b/net-wireless/bluez-tools/Manifest
@@ -1,4 +1,4 @@
 AUX bluez-tools-0_p20161212-gcc-10.patch 2377 BLAKE2B 80aeefa71c6096f6c6e61e326f67b5f727c4d262ab9daa9c501069bbb2caf89c651850fcf3ab226a026a9b079135ac99dac3e5b9f3056556dba9fc549abe07a4 SHA512 2b91be22769660c57d50a1269e03c05e5489550f5dcdce5b29bada4074f6ffeeb9ee3074ce4935b6684ab37ec132f2dbf6ecba056d1e860eebc586f65573c208
 DIST bluez-tools-0_p20161212.tar.gz 126613 BLAKE2B 474393862049a893280eeb0b7f466a1b1165a14d0ab33cbd9d3ca805a15eef237761aa3038423de85280bcaaf1385c3c7ab313d4cc3199f284aba86d8e5ed16e SHA512 ab5dd4a223348aab29fae22f552afae989b74d56c3fa46fd5587c100d63309649a10a87591bc040082545f45b7bb95360fcf6a48812012edbdb93570b0e166f7
 EBUILD bluez-tools-0_p20161212.ebuild 707 BLAKE2B 22ab18908817f92803bb305857bab3a629a8250e022afb219571807d63aefdce8a788f576671e4b226b9d7ac14920e02abe401a22545f41e5413d103aa5af9fd SHA512 adfd3b1a3137020fc9f2f59e8164073ed68891472d9f881d0d4da736828c0ff57ccff44482ac7fe3a85c28374e4edb10383d339e88d43c6f1baeb8c3017abac5
-MISC metadata.xml 575 BLAKE2B c0ef09b4f032bb7ae6cc0315789ff198eb81f91f3334140a23538e158278918f9b68e2f4a24e4d1f549ffeeecc525bbcca883ef891eb4d9171a4bcb6468c5ba9 SHA512 73b71c957ac6247f7f42644c3b7ae90bcd628eeb3eda210a2488dcafb88d99dc22c7b9426593d4e095d8a18931333434756cde9e6d987d948094acf1de418c7a
+MISC metadata.xml 462 BLAKE2B bdac336e57ba0fa55ce218a808b7466f0ad5bd5e0c2ef72d6245c0031724c685064b4629a6ef4efb17b4a9a68ed3f4561d84ed6536d3771fb46be8d9de64ff7d SHA512 030136f0e665679205ecc34f7bf1db089544369654fece04d02ffd0a058e86b5e3ec070f0622178d2405a4b08281d37ad9f22b082a900e783233984de9a1a185
diff --git a/net-wireless/bluez-tools/metadata.xml b/net-wireless/bluez-tools/metadata.xml
index 084c5c22574b..520bd08fd9d6 100644
--- a/net-wireless/bluez-tools/metadata.xml
+++ b/net-wireless/bluez-tools/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Olivier Laurantin</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 311af361e976..5db16aacda09 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -6,5 +6,7 @@ AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a591
 AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399a37cbba5c414d0396f2aff7c2a4965b56a1125dc8568e7bc848011106ab993e4c1211e704f485259373ab65a SHA512 259d10df16f4b23364da971063345b25cbf7c6a1b9f2576d3ecbd48620675392601cba017a591af1f44fe8eff8ea0c8cabeafa8adbddeb3e1014f428d37d1690
 AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
 DIST bluez-5.54.tar.xz 2003760 BLAKE2B 278a8be86d93654b9ec31ed2591a89a2a0f35fd8378fc3cffd9028b1aab431071b802e77b956503fd16239e5b821ab356733fdc49436ef811b87190e185a91c2 SHA512 e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe
+DIST bluez-5.55.tar.xz 2041428 BLAKE2B 7eee44063ea53188d35324bcc5b5f0539cf92a5934632743677bbf41822b8b79a899a82a93fd79887fe058e6f0c0e66ed8d5da46e5585682613bc1847cb009a8 SHA512 9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033
 EBUILD bluez-5.54.ebuild 9541 BLAKE2B 8b63bd805f3544e897a8b62cda2746af71ef2c24800038a4af8d43229e4451f673860112c5a91834d4ebe8a2f49e5ce6ea5f3b851f0def153b23d0223e70a0d5 SHA512 b6ca1f461f7452c6a19af3e47057edf68012935920d9932935c0d53b8357699cc872b00ebd6b120762e74baaca6d483feab65c1083d54d39904e1943758b4f6c
+EBUILD bluez-5.55.ebuild 9656 BLAKE2B 09b4149c1241b7c9b55742dd84b90d4f2420ae0daf39067fc5db39d58d252b7487a681fc3a92c353bff45549c8da2964b3c34a2f991763b7f2af4dd1beba7b4f SHA512 97b589100ed28309c0aca4e02cd78f2a8becd9f09c71f6c4341f02dbb7e8190be2cd838dc843f2fb9483b17dbf54eb3add33d1c346c3fe09456ce71ab9b3c668
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.55.ebuild b/net-wireless/bluez/bluez-5.55.ebuild
new file mode 100644
index 000000000000..12445761a180
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.55.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+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 ~x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+"
+
+TEST_DEPS="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${TEST_DEPS} )
+"
+DEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/hwids-20121202.2
+	btpclient? ( >=dev-libs/ell-0.28 )
+	cups? ( net-print/cups:= )
+	mesh? (
+		>=dev-libs/ell-0.28
+		>=dev-libs/json-c-0.13:=
+		sys-libs/readline:0=
+	)
+	midi? ( media-libs/alsa-lib )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? (
+		>=sys-apps/dbus-1.6:=[user-session=]
+		sys-apps/systemd
+	)
+	!systemd? ( >=sys-apps/dbus-1.6:= )
+	udev? ( >=virtual/udev-172 )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	# https://bugs.gentoo.org/539844
+	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+)
+
+pkg_setup() {
+	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
+	# to prevent bugs like:
+	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
+				~BT_BNEP_PROTO_FILTER ~BT_HIDP ~RFKILL"
+	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
+	if use mesh || use test; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
+		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_USER_API_HASH
+		~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
+	fi
+	if use test; then
+		# http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER"
+	fi
+	linux-info_pkg_setup
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	if ! use user-session || ! use systemd; then
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
+	fi
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--enable-datafiles \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable btpclient) \
+		$(multilib_native_use_enable btpclient external-ell) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable mesh external-ell) \
+		$(multilib_native_use_enable midi) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev hid2hci) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also they can break without"
+			ewarn "previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			dobin tools/btmgmt
+			# gatttool is only built with readline, bug #530776
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
+			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
+			# https://bugs.archlinux.org/task/37686
+			dobin attrib/gatttool
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
+			dobin tools/avinfo
+		fi
+
+		# Not installed by default after being built, bug #666756
+		use btpclient && dobin tools/btpclient
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# Drop python2 only test tools
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
+
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-pkgincludeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	if use user-session && use systemd; then
+		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	# Setup auto enable as Fedora does for allowing to use
+	# keyboards/mouse as soon as possible
+	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	# Install .json files as examples to be used by meshctl
+	if use mesh; then
+		dodoc tools/mesh-gatt/*.json
+		local DOC_CONTENTS="Some example .json files were installed into
+		/usr/share/doc/${PF} to be used with meshctl. Feel free to
+		uncompress and copy them to ~/.config/meshctl to use them."
+		readme.gentoo_create_doc
+	fi
+
+	# From Fedora:
+	# Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
+	# as found on some Atom based x86 hardware
+	udev_dorules "${FILESDIR}/69-btattach-bcm.rules"
+	systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service"
+	exeinto /usr/libexec/bluetooth
+	doexe "${FILESDIR}/btattach-bcm-service.sh"
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
+	use mesh && readme.gentoo_print_elog
+}
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index c43557d7aff7..beabb1a299ef 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,6 +1,8 @@
 DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
 DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B 036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1 SHA512 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
+DIST gr-osmosdr-0.2.2.tar.gz 251425 BLAKE2B e1e29280b84139bf4b1b25ee35553f48abe7f26f9f240852c25f883ec6df406157d9b734035fd6df87e50b6d6f8ddab679ea91430558716acba05a9a64844c3d SHA512 42aef6efd35fd9184a371202398455de7cac3a88374e761359ab837a329495b653a95f5641f0a9533daeaa08c0d7fd5649b1b33359009dd4e8a3b9b24aedd2af
 EBUILD gr-osmosdr-0.1.5-r1.ebuild 1926 BLAKE2B a61337ac088431d18e5e2bd04b0bcf8c60b1519e07c0b86a61dbb23e74346796fdf1ff6a16258365f88f2bab3628934fafd8774d728c5f50befb2d68e3f9a5ce SHA512 3ebb20e9c58fd195b6c59d885cd0f4f6cc88af32dabd0cc2da2567eb0aa997cdbf72b616ad375350faa43c87bc3c4baae7dc3160d8e80c468bd47985c7c4383c
 EBUILD gr-osmosdr-0.2.0.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
-EBUILD gr-osmosdr-9999.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
+EBUILD gr-osmosdr-0.2.2.ebuild 2199 BLAKE2B 90a673c1a90268b367a93f593a22e905d1a83ad4e43597564b8b10142cd8898996621851c1ca45a50bd2d892234b0467e6bf145ae08aba8d31fb309f02ee6a8a SHA512 141a81ca92922bbdf69f2731e1e20200a61372abb8b32d0be26ccb8679627b8b8b64d53a2e17147635df3a804700cf64118d39b48c69026efd911ddbcf73b28e
+EBUILD gr-osmosdr-9999.ebuild 1948 BLAKE2B a3f613241993c7efebdece14548cfe61c75cc5beb8efd0a463e2e83643658b0b921692908edb17fe401773b17ea8317f87be1491190449078bef9d1095a5ac55 SHA512 c4ff4d8d9fc20284b846886a1bc2a3ad6dc7c6ebc4a18af44616500cce0833fabec96d1c29ef44518073ef9729655f4cf0fdcad4a8482a761ce06e667a4cbf08
 MISC metadata.xml 965 BLAKE2B 6dbc466abe93e1ffef58f8f07ac4326ced3e9399c86fcb3135c16293065d0c9dfca6584e527b1d60f4fbaee6322ff6ed7a5c5a8ae20c8f985d0488a94352e8ea SHA512 2c744ddfec67ffd438ea76afc037e6ff7480d5349b63e00ac74dff191f33f3f9ecde08ee167b568b64a7dea33d3efbf67be582f1613bd8f8a5e0d29275a8da77
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
new file mode 100644
index 000000000000..af9ebaa516aa
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
+else
+	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/volk
+	airspy? ( net-wireless/airspy )
+	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
+	mirisdr? ( net-libs/libmirisdr:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
+	sdrplay? ( net-wireless/sdrplay )
+	soapy? ( net-wireless/soapysdr:= )
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "s:\${GR_DOC_DIR}/\${CMAKE_PROJECT_NAME}:\${GR_DOC_DIR}/${PF}:" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_FILE=ON
+		-DENABLE_AIRSPY="$(usex airspy)"
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_HACKRF="$(usex hackrf)"
+		-DENABLE_IQBALANCE="$(usex iqbalance)"
+		-DENABLE_MIRI="$(usex mirisdr)"
+		-DENABLE_PYTHON="$(usex python)"
+		-DENABLE_RTL="$(usex rtlsdr)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr)"
+		-DENABLE_SOAPY="$(usex soapy)"
+		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_SDRPLAY="$(usex sdrplay)"
+		-DENABLE_NONFREE="$(usex sdrplay)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use python; then
+		# Remove incorrectly byte-compiled Python files and replace
+		# https://github.com/gnuradio/gnuradio/issues/2944
+		find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
+		python_fix_shebang "${ED}"/usr/bin
+		python_optimize
+	fi
+}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index f77ffadc343b..9c632a04463c 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
 HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
@@ -57,11 +57,11 @@ src_configure() {
 		-DENABLE_NONFREE="$(usex sdrplay)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	if use python; then
 		python_fix_shebang "${ED}"/usr/bin
 		python_optimize
diff --git a/net-wireless/hostap-utils/Manifest b/net-wireless/hostap-utils/Manifest
index a32e9178c884..b89798865062 100644
--- a/net-wireless/hostap-utils/Manifest
+++ b/net-wireless/hostap-utils/Manifest
@@ -1,4 +1,4 @@
 AUX hostap-utils-0.4.7-makefile.patch 860 BLAKE2B e1f27d3da73e6cf0c9a6b2eb7ebf738e8dc67f0f815edceb8c317472f72abb7e72b29870a2be82e74a35084cb0dbc12eec5e11a6770baeb3d0a4295db40b7ac9 SHA512 a84f1c078538b6df6542b67e71e0ec97e7d3cd2624f0cbd56e5ff6f976b0504f4f0e2b6fd148148d36133aaa406fb31acde7d45d1e1c2f25f015c430128b97f0
 DIST hostap-utils-0.4.7.tar.gz 60782 BLAKE2B 6e56488df1bde9de13724df39606a8eb125a67d9f1b14e80fd58cc8ff5c5fd703713e565db49d82d00acacc0275c9ca38d38d81a026ccc30d27db82bf3d351a8 SHA512 1a54c5d84b02d2dc96c33d6463af775212e09a20ac85367184636d364f17a09e48f937417dd9c43148663d242b3fc5f2f13835ec5331bd0600ef31797c414d44
 EBUILD hostap-utils-0.4.7-r1.ebuild 608 BLAKE2B 599923bb1a7eb7e452483cd9ce502f798c10a9580081d0103e3f51d0e1e18e2d8a1d8abf66dd7cf2c295f85e635a32dd1749440a9165b21fedb6e2c8a8c811c5 SHA512 3e671ea30f0c37092a6091ac82c21b617c7b4f73dbe10a00c685a773428a7b5b3eaf0c85b111513fd8e38b55df5195938306fcc5169464a188dcb97d1efadab3
-MISC metadata.xml 236 BLAKE2B edac1ea2c31bb8a5e334f9ce1ab76a4413aee84aa851f109afec729418c9e8164356c3faf55e1beb0317769da9642e645b94852d92b7cefa67c3a92a28f5cf2e SHA512 d002364fc624df1993a205281bab483edac8d8c5fe9831be50050b1f29fcb6f002a8d55e0aed6eab931f0c934084abe28d5ff922045045c524562006d10ee3af
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-wireless/hostap-utils/metadata.xml b/net-wireless/hostap-utils/metadata.xml
index 6d14b3af9ffd..6f49eba8f496 100644
--- a/net-wireless/hostap-utils/metadata.xml
+++ b/net-wireless/hostap-utils/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>Utility programs for hostap-driver</longdescription>
 </pkgmetadata>
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index c73d2e04f5d3..996289cf196b 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -2,15 +2,9 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060
 AUX iwd-1.8-eapol-prevent-key-reinstallation.patch 2575 BLAKE2B 1e9683e551178ff54f31f9c8e861afb4b1cbe6d2f11188043d2bc6075fb21fe2637db4b13a4b93c900b9450034d28088e525e42ff0cfea08341fb056c7c74fc2 SHA512 e39965ae121e42ff17c1cc05539af1d9005748d05c0fe2ff4ef7884c3b224973a30875961476ecaad7f6f7567e79dd33bc854be05a71b37c4c05a19e2b60fced
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
-DIST iwd-1.5.tar.xz 834688 BLAKE2B b3d585963c93954e4038dd85e5d57b60d8baaa7028edb79b54d8650a400a149666140f6ba438ccccb5be2d67fc7b842f6272b5efc61d75a7d4dae333410625bb SHA512 55017941f2e100d644864d2ed0528c67a486da6ba2bf7782e9df019727ce0af53cdff37c53f6625e536aa756387dd4e0d20a169710da8c3ce00f615040c9da32
-DIST iwd-1.6.tar.xz 844900 BLAKE2B 97d7162da88f550383ce9b3348b18e4e2e241242d7bf1eb99a904ca496afb8db287bcb426942246824e71a68127c38cf947b7f427f845eee2aa9ba6b4caa184c SHA512 79541672d55078daff0809841f99862ac538174aba8d9b0fb356cfa0b7e025538d9a84f79c35d2ef93114d8476273c3c72890f59cbee807b2bd0b85c0f4b9b55
-DIST iwd-1.7.tar.xz 846040 BLAKE2B a765513da5482ab5856d1d47c3b302dc65efe3b10f444f263ee11a24df716bb46237aa689538e11dd5b9744cfcf0cd00ff5ab5cd11e37a56c9ad85cf7361b177 SHA512 3012a7725a909737b48c803289513138d057dec3b99f98a7de91eef0eb58e145537809e7ed84afddc4f061d27d5e448f1fc9d6ac2a748d496bf97656baab48ad
 DIST iwd-1.8.tar.xz 865668 BLAKE2B ba1be5c1658df950fe28deca6b8c3c9482eda260fbd05f721cb34cadcb2852768086e65e7c74940bc6ddd345d1438624b59bdfe4b6a5323dd122a0cd397008d7 SHA512 f1caa330b3ff18b4598efec596a4b9a22887833218a90d19d59717503679eff71fdb990cb63bd74b8f1523197a366cd803d799259e8002e5cde2745b03d51d8e
-EBUILD iwd-1.5.ebuild 4213 BLAKE2B afe140abb9952750957c147736baa5b23d085e6899a03a814719fcddce419ddda4d76138e79641346c0d71ed2b70c4b4fb3b07cfe768a3beadff435171d28d88 SHA512 b580d7c67914ad4b0a1e99977358d7ccaacc854984c4c066f2bfb23bb54a8b011ff9ea500a5748d78b0ccd5ef658d55051c6a899cb6b0f172badf712e031bc96
-EBUILD iwd-1.6.ebuild 4230 BLAKE2B 209a21ab5524456d539af9164a986a25f367c0b2e380fc98cd88017ebac0f34369832259919afea695b34a9b39e04b637ea3584e78cb60f3b71c9e7dc5a9c073 SHA512 a1a99b605f0393828cea5077b6d4f2babb637e2028b2f41c7e809bb2ed86ec2c4a8e3c9c29e2dff39d9e72af3a258d9e24c723df41a0932b0d50ce0a8be207bc
-EBUILD iwd-1.7-r1.ebuild 4222 BLAKE2B 494bb710cdc7b76bb702da467ce2bce7151cc27d239580b08bbd903b04c49375a10559353a69a2cb3b32abccef283d5cd5ef2882bd9d3840ac5f3dae81a7b4a5 SHA512 5c25dc76bbd4e014ecaf63b0b8cc400add7cc8c3cf9294df71ff1d60c1e5b7cff89eec6d7309a40008f2ae448a774a26c727b94aa97cf70316504cc642212f03
-EBUILD iwd-1.7.ebuild 4224 BLAKE2B 3690d838adf8a9f8bc9d3b11cd454cf2bf78196b40c50f7a029e2c8108cccce19ead0dd54f58d44207c647e1b9692633cdc5e281e592d16ef202102e9fca93f4 SHA512 4c30c9d78001a9ed7da673ad1704a0d967bfce1a6f011f434626739cab8b33a0564b1e42ddcc30a862364ac20828a8758b2da8cca89af100e2f1a5f9dc773075
-EBUILD iwd-1.8-r1.ebuild 4298 BLAKE2B 26cfb0821ef1086439e102e3aa88b36667e46192b16a7a2d9e7775426c41f6ef1b04a8848e3309fb55301da8a352dd0b2fcd42fa3f5d56da5e39f84217e14707 SHA512 f9b39f923767ff28291e4e1c0dbc24305e603f4ede7ddab5cd6329be04dedd4bbf92c39b3aafbf58d7706660f35a9490dd91ee0fd864e914a3dce65e014fa9d7
-EBUILD iwd-1.8.ebuild 4226 BLAKE2B 6dae3dc8f42e562c84213f9edab1059c15d3bc0ee861f1ff8b20fa85deaac58b2c5b3ef45d7dfdb46a7b0ab0b2fecdffe3f1e0ce73317862c7e0d3103dcdc672 SHA512 fb9bfb2166f8e01bc862adca01d7d09a7423c8e58770204609c9f12e94ed0e932d35922bb55946dfaf3be1740201c2da7e87476bd30796465b2d0e347b4b95af
-EBUILD iwd-9999.ebuild 4224 BLAKE2B 4fbeee6dd24638918ab7a9edf38658b62ef1d379b6a23b35e1079d9b23a8d3a38077125e38cb49c68d98e937cff92a6640b609029ec2b5457f8e8801cabb7063 SHA512 67d8d45988e608a9674c380a7645a365580bc0a5fd4d5bc95ee3a3e78833f4bfbe5b9d836f45e1fec77f20379c13ee26ebc708e0f8131dcac1e27da7b1dff938
-MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
+DIST iwd-1.9.tar.xz 883616 BLAKE2B 57dd4a6e00d73bcfb752e1bd3661e97251d1dab4c05638d148ae7031bff35d606063f79e575ed4d3d3a60ff5514eb3fc340e1eec4c2e7074bf8d6d4b79832f6d SHA512 d8762495f7f5a342476653c0cf64c31b3b41a3064a05c4fcf49b9faf4394b0d7a5db6aae6324896bdc8f7b104697fb4c4315f7073a4fde4fc87f8f55d932538b
+EBUILD iwd-1.8-r3.ebuild 4477 BLAKE2B d80632f00a31b5f1f751373701f80602d34e8fb8cec14316f5405a76af1df1cbed79f0b786d3f9e3e2bce2d54f7ee72ffcb0595455e9095c87c55b68b9f4b50f SHA512 d9b44088c2a4ddc0b42831ffca847daa1570d72583526a669c2178fff2a8d2c0cbf5415dc6f4d3edc2991fc588951e546de4b67449f721fa4e2ad71d2fd52e1e
+EBUILD iwd-1.9-r1.ebuild 4870 BLAKE2B 9e65385109c3d3125878351d0324c4fca5550487f67a34bedd69cd986552ea5dd40ee701696e041145be744124c8d78a888f8b5acd26d1c785efcd4f711c7c50 SHA512 d8188fa38f588b66355e89f42abf712670ad1d4dc07c5e8fd8e0345791d7cfbc3b9f1fe61db379d16c3fff76d9252b07d4309be0e60af672c4b2de5ff7986d6a
+EBUILD iwd-9999.ebuild 4866 BLAKE2B 56604e640edcc195e7590b17e5b390d2301cf99f222c7046393e50312decd6b162c9d204e33bb5984db3fcf109270ddac0445bf87da4cb7317722584709bdda9 SHA512 c0188ce813cc775f17fd9dfbfb2e0abd8de904a9d4f872750e3342cbe6559f06d8d0c50007e8b48c31a3066c26c3a3773ea4c4a3ee863151250cd58cf2e11b4d
+MISC metadata.xml 832 BLAKE2B 5f9e80bd6e64bb7542509fa934e5fba8f433781f35b0c5e3f0dcae48a4a4cd3ecf23312241358daeccc0429f8bd74651531b7d628ec19f6af16714027ff8ddc2 SHA512 06950191a98edb0453b80500c0c1b7ca879fea962cd13f5ad695923d866edb4aa99753750d67110eac0a790d8ddeff9154add4fc8793d34af35870e13e8a6464
diff --git a/net-wireless/iwd/iwd-1.7-r1.ebuild b/net-wireless/iwd/iwd-1.7-r1.ebuild
deleted file mode 100644
index 84c262950729..000000000000
--- a/net-wireless/iwd/iwd-1.7-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.31"
-
-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"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~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 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
-}
diff --git a/net-wireless/iwd/iwd-1.7.ebuild b/net-wireless/iwd/iwd-1.7.ebuild
deleted file mode 100644
index f2b626e25c2e..000000000000
--- a/net-wireless/iwd/iwd-1.7.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.31"
-
-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"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-pkg_pretend() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~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 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
-}
diff --git a/net-wireless/iwd/iwd-1.8-r1.ebuild b/net-wireless/iwd/iwd-1.8-r1.ebuild
deleted file mode 100644
index 61bd996e8df6..000000000000
--- a/net-wireless/iwd/iwd-1.8-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.32"
-
-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"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-PATCHES=( "${FILESDIR}"/iwd-1.8-eapol-prevent-key-reinstallation.patch )
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~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 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
-}
diff --git a/net-wireless/iwd/iwd-1.5.ebuild b/net-wireless/iwd/iwd-1.8-r3.ebuild
index a6496aa4cc37..a8c6fbd6ae43 100644
--- a/net-wireless/iwd/iwd-1.5.ebuild
+++ b/net-wireless/iwd/iwd-1.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.28"
+ELL_REQ="0.32"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -37,7 +37,9 @@ DEPEND="${COMMON_DEPEND}
 
 [[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
 
-pkg_pretend() {
+PATCHES=( "${FILESDIR}"/iwd-1.8-eapol-prevent-key-reinstallation.patch )
+
+pkg_setup() {
 	CONFIG_CHECK="
 		~ASYMMETRIC_KEY_TYPE
 		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
@@ -59,6 +61,7 @@ pkg_pretend() {
 		~CRYPTO_USER_API_SKCIPHER
 		~KEY_DH_OPERATIONS
 		~PKCS7_MESSAGE_PARSER
+		~RFKILL
 		~X509_CERTIFICATE_PARSER
 	"
 	if use crda;then
@@ -90,6 +93,10 @@ pkg_pretend() {
 	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
diff --git a/net-wireless/iwd/iwd-1.8.ebuild b/net-wireless/iwd/iwd-1.8.ebuild
deleted file mode 100644
index 3e066268c2b2..000000000000
--- a/net-wireless/iwd/iwd-1.8.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.32"
-
-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"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~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 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
-}
diff --git a/net-wireless/iwd/iwd-1.6.ebuild b/net-wireless/iwd/iwd-1.9-r1.ebuild
index 256d210e2560..d9b58be0e827 100644
--- a/net-wireless/iwd/iwd-1.6.ebuild
+++ b/net-wireless/iwd/iwd-1.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.30"
+ELL_REQ="0.33"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -21,23 +21,34 @@ 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"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
+standalone systemd"
 
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
+COMMON_DEPEND="
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+"
 
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
+	crda? ( net-wireless/crda )
+	standalone? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( virtual/resolvconf )
+	)
+"
 
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
 
 [[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
 
-pkg_pretend() {
+pkg_setup() {
 	CONFIG_CHECK="
 		~ASYMMETRIC_KEY_TYPE
 		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
@@ -91,6 +102,10 @@ pkg_pretend() {
 	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
@@ -151,4 +166,14 @@ src_install() {
 		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}"
+		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 55d9df110e12..c17d39b08802 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -21,19 +21,30 @@ 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"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
+standalone systemd"
 
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
+COMMON_DEPEND="
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+"
 
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
+	crda? ( net-wireless/crda )
+	standalone? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( virtual/resolvconf )
+	)
+"
 
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
 
 [[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
 
@@ -91,6 +102,10 @@ pkg_setup() {
 	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
@@ -151,4 +166,14 @@ src_install() {
 		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}"
+		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
+	fi
 }
diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml
index b8cd886617b9..2b83f954fd84 100644
--- a/net-wireless/iwd/metadata.xml
+++ b/net-wireless/iwd/metadata.xml
@@ -10,6 +10,8 @@
 		<flag name='crda'>Use net-wireless/crda for regulatory domain loading instead of in-kernel (4.15+) support</flag>
 		<flag name='monitor'>Enable iwmon monitor tool</flag>
 		<flag name='ofono'>Enable support for oFono SIM authentication</flag>
+		<flag name='standalone'>Enable standalone mode with built-in DHCP client and DNS handling"</flag>
+		<flag name='systemd'>Use systemd-resolve rather than resolvconf for DNS handling in standalone mode</flag>
 		<flag name='wired'>Enable ethernet authentication daemon</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 9f4cdc0c2f93..947be9624227 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -3,9 +3,11 @@ AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4
 AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
+DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 458c40dea530008295d46aadaf15699a0fd9025bb572cb23e94f059f31bba2835dedd9c39725d0183e84d31c326c2769450ce0b8bee7e7ca3bb7ac9dd82f4cc6 SHA512 585def7f19f479c6049cbc24e3886276d816f584fcb2070009cd90e35b33630d3e544145abf5f8b1eae87ec571a213ed9cb9f6b81345257c9bf1332d5bb319c2
 DIST kismet-2020-09-R1.tar.xz 8694804 BLAKE2B 1389486809024179c3be71a8b26cdb460f483e1af0dd7cda9d36450d10e4df16536f23db3b5ca3fd6b65b0c48514c96e5cb37ec71425a8f087d58e7a89bed137 SHA512 e687c76b9e94d973245f61d6fc59a1a05a06ba9c765f7661a183d14d0228676359a7d7798bac9f3b493a5c311e53785c54fd9f0d12bf6cdc4d43919bad167327
+EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 9d2cb57cc3728ebaeb8ccf8b9ed4716473c4930d006d4b6f1b5badb21e6433da49b24e4d9a1f41dff698ec198cae7d09450266a78f7be67b65cfbfd61b459ca2 SHA512 4463682c7ebba71368ecb28f9ac89789be91de8c11f2ff3a1395ad4101f3ce8da2fef5e0622d211b885b9d1cacde82f27cd73aeb1079b6415af7b232dd730090
 EBUILD kismet-2020.04.3.ebuild 4981 BLAKE2B 62fcf37f04f9651f33c8686e31f387eb237498a4030a07636c922823167a59e69d9896789fa908f432af41c8f6701c3044996dd2229be6eb67ca455bd8b858ca SHA512 dd6e4ddbbbb1847574e35a66413f0d208b02c9ade36f4f4646920df86fc714466aeea3f357f7541cf10bff4e38e7b86ca1a2aead7a8a60c4a18eb9230875355a
 EBUILD kismet-2020.09.1.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
 EBUILD kismet-9999.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
-MISC metadata.xml 786 BLAKE2B 86f38600535248d3b03f57ea796b57d7cc5ea04c2e35095702b586574740105efdd3710ab05e15c2faef640c7a5ddeb835cd4055e3426591129ab5802a2708b2 SHA512 a6ff91e31ed15b2e6fb381210b654c1a1195699c466d36af838c9ec4d560d632a194ff7597f167cd8281ad9908d75eb39aef5a73d7dc59fdf2020aaf5359a0f8
+MISC metadata.xml 1445 BLAKE2B e915106684538d82bbd7488f9a1e37990a6b7c8bec8265db850797beeacdef58671f5635f186c21afca9c0c0964fcdb8bf6589d9d235e3e91eaa0c0d88dc5548 SHA512 33bafa9ff07daa54dcca14b76a80f01ed483e0952abe254f9a9627655f998922e7a2ff006fa6e24d6009af5ce78dd43ac43900f0ea61a22541110ce5b7d6cc86
diff --git a/net-wireless/kismet/kismet-2016.07.1-r2.ebuild b/net-wireless/kismet/kismet-2016.07.1-r2.ebuild
new file mode 100644
index 000000000000..17f5963fa10c
--- /dev/null
+++ b/net-wireless/kismet/kismet-2016.07.1-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib user
+
+MY_P=${P/\./-}
+MY_P=${MY_P/./-R}
+S=${WORKDIR}/${MY_P}
+
+SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="https://www.kismetwireless.net"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby selinux +suid"
+
+CDEPEND="net-wireless/wireless-tools
+	kernel_linux? ( sys-libs/libcap
+			dev-libs/libnl:3
+			net-libs/libpcap
+			)
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	client? ( sys-libs/ncurses:0= )
+	!arm? ( speech? ( app-accessibility/flite ) )
+	plugin-btscan? ( net-wireless/bluez )
+	plugin-dot15d4? ( virtual/libusb:0 )
+	plugin-spectools? ( net-wireless/spectools )
+	plugin-ptw? ( dev-libs/openssl:= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	ruby? ( dev-lang/ruby:* )
+	selinux? ( sec-policy/selinux-kismet )
+"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet.conf.in
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
+
+	epatch "${FILESDIR}/${P}-ruby-fixes.patch"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable client) \
+		$(use_enable pcre)
+}
+
+src_compile() {
+	emake
+
+	if use plugin-autowep; then
+		cd "${S}"/restricted-plugin-autowep
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-btscan; then
+		cd "${S}"/plugin-btscan
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-dot15d4; then
+		cd "${S}"/plugin-dot15d4
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-ptw; then
+		cd "${S}"/restricted-plugin-ptw
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-spectools; then
+		cd "${S}"/plugin-spectools
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-syslog; then
+		cd "${S}"/plugin-syslog
+		KIS_SRC_DIR="${S}" emake
+	fi
+}
+
+src_install() {
+	if use plugin-autowep; then
+		cd "${S}"/restricted-plugin-autowep
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-btscan; then
+		cd "${S}"/plugin-btscan
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-dot15d4; then
+		cd "${S}"/plugin-dot15d4
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-ptw; then
+		cd "${S}"/restricted-plugin-ptw
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-spectools; then
+		cd "${S}"/plugin-spectools
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-syslog; then
+		cd "${S}"/plugin-syslog
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use ruby; then
+		cd "${S}"/ruby
+		dobin *.rb
+	fi
+
+	cd "${S}"
+	emake DESTDIR="${D}" commoninstall
+
+	##dragorn would prefer I set fire to my head than do this, but it works
+	##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
+	##is there an automatic way to force this?
+	# install headers for external plugins
+	insinto /usr/include/kismet
+	doins *.h
+	doins Makefile.inc
+	#todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
+
+	dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
+	newinitd "${FILESDIR}"/${PN}.initd kismet
+	newconfd "${FILESDIR}"/${PN}.confd kismet
+
+	insinto /etc
+	doins conf/kismet{,_drone}.conf
+
+	if use suid; then
+	dobin kismet_capture
+	fi
+}
+
+pkg_preinst() {
+	if use suid; then
+		enewgroup kismet
+		fowners root:kismet /usr/bin/kismet_capture
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_capture
+		elog "Kismet has been installed with a setuid-root helper binary"
+		elog "to enable minimal-root operation.  Users need to be part of"
+		elog "the 'kismet' group to perform captures from physical devices."
+	fi
+	if ! use suid; then
+		ewarn "It is highly discouraged to run a sniffer as root,"
+		ewarn "Please consider enabling the suid use flag and adding"
+		ewarn "your user to the kismet group."
+	fi
+}
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml
index c596280be249..f9a1efd46a10 100644
--- a/net-wireless/kismet/metadata.xml
+++ b/net-wireless/kismet/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<use>
+		<flag name="client">Build the ncurses-based user interface</flag>
 		<flag name="libusb">Support libusb based capture sources such as mousejack, cc2540(ble), and nrf51822(ble)</flag>
 		<flag name="suid">
 			Install a setuid root helper binary with limited functionality;
@@ -13,7 +14,15 @@
 			reducing security risks
 		</flag>
 		<flag name="pcre">Build with pcre support</flag>
+		<flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag>
+		<flag name="plugin-autowep">Build the autowep plugin</flag>
+		<flag name="plugin-btscan">Build the btscan plugin</flag>
+		<flag name="plugin-dot15d4">Build the dot15d4 plugin</flag>
+		<flag name="plugin-ptw">Build the ptw plugin</flag>
+		<flag name="plugin-spectools">Build the spectools plugin. This uses <pkg>net-wireless/spectools</pkg></flag>
+		<flag name="plugin-syslog">Build the syslog plugin.</flag>
 		<flag name="rtlsdr">Enable rtlsdr based kismet capture sources</flag>
+		<flag name="ruby">Build extras which are written in ruby, example plugins and the like.</flag>
 		<flag name="ubertooth">Enable capture source for ubertooth to sniff bluetooth low energy</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-wireless/lorcon-old/Manifest b/net-wireless/lorcon-old/Manifest
deleted file mode 100644
index 124680e4027a..000000000000
--- a/net-wireless/lorcon-old/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD lorcon-old-9999.ebuild 623 BLAKE2B 5526d0c499bbd64cf597a482666d722bf12d5b2916b6ef3f18b093e1bdcbf395ff3b5f5a9b3569c9835629181b16d3874b9dc4e3837094af5dea80fdb80584b1 SHA512 7a5b0a5e3bf22f71a79fcca3a58d873e8ef98ba38e1b2152c8e7556f1d81362443ffc97f02517794674f5719722db6e4ce7e80e9eb69e084ef44c80009c41c2d
-MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/net-wireless/lorcon-old/lorcon-old-9999.ebuild b/net-wireless/lorcon-old/lorcon-old-9999.ebuild
deleted file mode 100644
index cd62cbdd50f6..000000000000
--- a/net-wireless/lorcon-old/lorcon-old-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils subversion
-
-DESCRIPTION="A generic library for injecting 802.11 frames"
-HOMEPAGE="http://802.11ninja.net/lorcon"
-SRC_URI=""
-ESVN_REPO_URI="http://802.11ninja.net/svn/lorcon/branch/lorcon-old"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="dev-libs/libnl
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	DESTDIR="${D}" emake install
-	# rename manpage to avoid conflict with lorcon
-	mv "${D}"/usr/share/man/man3/lorcon.3 "${D}"/usr/share/man/man3/lorcon-old.3
-}
diff --git a/net-wireless/lorcon-old/metadata.xml b/net-wireless/lorcon-old/metadata.xml
deleted file mode 100644
index 0bd171786a1f..000000000000
--- a/net-wireless/lorcon-old/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 9b58f3508d2f..9bcd627a6b6e 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -3,8 +3,10 @@ AUX rtl_tcp.initd 483 BLAKE2B 1e2feb9f481677792319b60fa99d0a2ed5c4a489c85c97a3a0
 DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
 DIST rtl-sdr-0.5.4.tar.xz 108708 BLAKE2B 12f5f5a913089ec57327621eddab9b74b07cccceeac9d00ab2cbd413bc29d8444633953319e2887ef5e07a766f38b4ea2f5d3cbf73efd63a1886e30e2bed6968 SHA512 6cf3c62e6a56694f90deed64e2761105fdbeb40de8001a378e687d60cc3718ad64065b5d896b3f4b27ff6a5383173b53df52816e24b31c726485364cfd9c1a43
 DIST rtl-sdr-0.6.0.tar.gz 134289 BLAKE2B a630ceea359c49170c04bc6bb2a01b481e40b4529ed3d2c924d0370399bb149c47f751929716fa4c86fac9776d26584696ece7a5f83a428b300ccbed243d0ffd SHA512 a08356a08672f03d86adb662e28923e7998b78c0f49432dc1b1e3844976158c467242e0c5eabf206fd257bdebcf91cd2767dabf13d2ef475f2f3e1d82e23ed75
+DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1142 BLAKE2B 1321119ae94c5c89a8912dde134ee7890b987c70cafa61617f0118fa596cab58485f3fbf51b3f6ebfce819eb50b281606adfb36cbea12497ea02cbc7a0e053d2 SHA512 043448e7787215446c27eb1e264e7c18f463f829ae162dd23ede268c3664ed0073fac4c6f3c30c77902cf421bf535eee83a585575b980c1fafc9119809cbe9a1
 EBUILD rtl-sdr-0.5.4.ebuild 1149 BLAKE2B 3690e4cfd90271b6b49a0f453b0a1e290e096e432f42621cfd3a97aebcd0050a4a4cbc69334c6906eed637c3814bdb554e97edf997d116618715af8c1673f7b1 SHA512 08d4f453f18be3c631b54ca11f0042c60163182f25bcb335148d32978a64280f116d61fed6fa0bff8efc94acc09b901c87a89e3a93bfb6d7f24e8936ccd24411
 EBUILD rtl-sdr-0.6.0-r1.ebuild 1180 BLAKE2B 52cafed14f3ffadadfe80fc939bde5798eb93ceac4a7d050e1f03c5a1ece453f646619181476f0074752c24e6437ab218b92fe4c7531ef96cd38525e09ec9938 SHA512 d30cbb5fe9ab5c80a2eb44a53e875bb6042ad5352f5418cab1e2097197b94d15ffd1d8dd7e973891571258912562dab6c85b6a848e384c72c3fd7b0b6b4af395
-EBUILD rtl-sdr-9999.ebuild 1269 BLAKE2B c64ffc27db5f0eebe6423f96717ac2eb7ea3ce56ed374e4f1e5685ea738c5745f2498843795e7b0d93a4790c585a67a4b9520a22c32862b25a6d729a7f37d4a8 SHA512 01e3c7ba4e964fa48411a6a66aa1b631cb25ab102df693ec5859a8ee10b8f7966fe1d89260fe83c09a65d0752e8e60bdaa4b5512f176824af69a0f41b3772d04
+EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1583 BLAKE2B 0b4b10624672aa7496f0b8a4542ab0754869f167b62c664ea190e980fc1f4b6d59ff6ac384867df28243586ccccaa723ae3382c4b8ca6b1bab2d140005c613a5 SHA512 c2d06c9b5073fa9f28120c02eff2689193db47fa0dd202b2c76cd2c61f7b047515cb68c82f2da0a90a39e9af5b14eef29879d823d4e09aeead017a80b67bb557
+EBUILD rtl-sdr-9999.ebuild 1583 BLAKE2B 0b4b10624672aa7496f0b8a4542ab0754869f167b62c664ea190e980fc1f4b6d59ff6ac384867df28243586ccccaa723ae3382c4b8ca6b1bab2d140005c613a5 SHA512 c2d06c9b5073fa9f28120c02eff2689193db47fa0dd202b2c76cd2c61f7b047515cb68c82f2da0a90a39e9af5b14eef29879d823d4e09aeead017a80b67bb557
 MISC metadata.xml 326 BLAKE2B bc05ca32a96bfdc2221a30c9214fddbf4c4616e2f79b97fb8ee6f0fc875c1934452cf8bbfe513c184addfeed36c007c4b5e78e08a0e1003b24396149460ee03c SHA512 df8ab517f535f57ae6ebecbecd33f49ecc83a4d0446020f9e40f4a43eb86b5f1cb279a4c356a09986c8dc8497ae2a5f309ae21cd8797ac5d1f546a785727ee1d
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
new file mode 100644
index 000000000000..f119f1ec187a
--- /dev/null
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib
+
+DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
+else
+	#git clone https://git.osmocom.org/rtl-sdr
+	#cd rtl-sdr
+	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
+	#SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+
+	COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5"
+	SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+zerocopy"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_configure() {
+	#the udev rules are 666, we don't want that
+	mycmakeargs=(
+		-DINSTALL_UDEV_RULES=OFF
+		-DDETACH_KERNEL_DRIVER=ON
+		-DENABLE_ZEROCOPY="$(usex zerocopy)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp
+	newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp
+}
+
+pkg_postinst() {
+	elog "Only users in the usb group can capture."
+	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
+}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index f404f170f4f4..f119f1ec187a 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -16,8 +16,12 @@ else
 	#git clone https://git.osmocom.org/rtl-sdr
 	#cd rtl-sdr
 	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	#SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+
+	COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5"
+	SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -35,6 +39,11 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt
+	cmake_src_prepare
+}
+
 src_configure() {
 	#the udev rules are 666, we don't want that
 	mycmakeargs=(
diff --git a/net-wireless/sigdigger/Manifest b/net-wireless/sigdigger/Manifest
new file mode 100644
index 000000000000..18908bfc82cc
--- /dev/null
+++ b/net-wireless/sigdigger/Manifest
@@ -0,0 +1,3 @@
+DIST sigdigger-0.1.0.tar.gz 4190977 BLAKE2B 2079ab0cb8ea24c17fd1643c01b9a31ea38921d3c72885753eeefff67c5bfe366ff306cd8538cac03f354bc31e14fa5c13d624b3a9b8d5104f006e6d223523b7 SHA512 2bd84ae0aca4f89f19a756e8cb5cae34e0f91cfb0df94bef58079edbebc1133ec5e9c620c8bd394e757237c30a72a67c691991c48317cd952dc17df95f141dd8
+EBUILD sigdigger-0.1.0.ebuild 776 BLAKE2B d5508ae010eb4d2fa89d56aa84a3503343534843fb95fcbaef26af05b877251a9b0656a2d7ce9b40b3b09a2aaf6c4d9cd09b2eeb2fc39866494be37faabcaefc SHA512 ee3874f62ef5ecc7e2fd8b05d0cf4078ae71370b5774b56f53a45c6e987add8ae6a687d4645580aa431c6347d9ac09b531c84289db42aa2fbce44e51bf876a38
+MISC metadata.xml 431 BLAKE2B fce5bbddb50333e812681e4d0fb79eed1517605055ba7a18bf7ff0d2da3d624cbafb5a75ba93f56a439d54c69efe4850d282c9e8f789a3952ffd44c3da2ac1d1 SHA512 14ef5316f5332d747df760d8a77503669985155e9e140c0057b92afc52962ad8a5eb340924d2419ade906cc457cc5bea8e5f1b0337fae495e835e23ef73a3f9e
diff --git a/net-wireless/sigdigger/metadata.xml b/net-wireless/sigdigger/metadata.xml
new file mode 100644
index 000000000000..7c4ffedcd157
--- /dev/null
+++ b/net-wireless/sigdigger/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">BatchDrake/SigDigger</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/sigdigger/sigdigger-0.1.0.ebuild b/net-wireless/sigdigger/sigdigger-0.1.0.ebuild
new file mode 100644
index 000000000000..254bab0bec4c
--- /dev/null
+++ b/net-wireless/sigdigger/sigdigger-0.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qmake-utils
+
+DESCRIPTION="The free digital signal analyzer"
+HOMEPAGE="https://github.com/BatchDrake/SigDigger"
+SRC_URI="https://github.com/BatchDrake/SigDigger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	net-wireless/sigutils
+	net-wireless/soapysdr:=
+	net-wireless/suscan
+	net-wireless/suwidgets
+	sci-libs/fftw:3.0=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/SigDigger-${PV}"
+
+src_configure() {
+	eqmake5 SIGDIGGER_PREFIX=/usr SigDigger.pro
+}
+
+src_install() {
+	INSTALL_ROOT="${ED}" emake install
+}
diff --git a/net-wireless/sigutils/Manifest b/net-wireless/sigutils/Manifest
new file mode 100644
index 000000000000..558f00fce2dc
--- /dev/null
+++ b/net-wireless/sigutils/Manifest
@@ -0,0 +1,3 @@
+DIST sigutils-0.1.0.tar.gz 98315 BLAKE2B 68e91dea40ad5e9cbff98f8618945ef11df4ae6551827c1e52a1a8051bbc61162e4bc0c1bc90fe4d7fe84992132d35b46af56d199cb90896a27d429bdedb9d2e SHA512 871bbd72739463f1094748edbddf07a9641fb34b29ba78b4d241ad1116f3a85128e99800561f72348a8c7a2590e2d0b3a3b99c368246807bac7a5665fb5829ca
+EBUILD sigutils-0.1.0.ebuild 650 BLAKE2B 1a626f56efa61a4961ea58c98add260e7c05d4595421fbdd9f190cc8288f70b65a0162d54a7b7d4ef7910e9ac2bcccac419cd686e95cc672c14dac5a12e892c4 SHA512 062f66a0f01d4a2cc449ca456bab28c30341300e1c42826d92370ee52114d40d0e6f47b03fb184db361d8709e94d87aed79121784ff37c57e5815e748174aaad
+MISC metadata.xml 430 BLAKE2B 0617bbaea3eb0eff26d2be0949e0dcb76850118c2386ef63a8a28ecdc5cb85f812fd513842b01692d340dac750a4693c5fe9360c7019c75e5551f247bed02e60 SHA512 118d1cfdd0bf5445e8c3ffb610dfea69635b22d22945c7c827b741aad87c0ae55527185aa6c2fa52837c4d5ac7628ad62f9482a22c2315bdf9ff771b4ee12ca8
diff --git a/net-wireless/sigutils/metadata.xml b/net-wireless/sigutils/metadata.xml
new file mode 100644
index 000000000000..9485d05db17e
--- /dev/null
+++ b/net-wireless/sigutils/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">BatchDrake/sigutils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/sigutils/sigutils-0.1.0.ebuild b/net-wireless/sigutils/sigutils-0.1.0.ebuild
new file mode 100644
index 000000000000..61e850915e24
--- /dev/null
+++ b/net-wireless/sigutils/sigutils-0.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_MAKEFILE_GENERATOR='emake'
+inherit cmake
+
+DESCRIPTION="signal processing library for blind signal analysis and automatic demodulation"
+HOMEPAGE="https://github.com/BatchDrake/sigutils"
+SRC_URI="https://github.com/BatchDrake/sigutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsndfile
+	sci-libs/fftw:3.0=
+	sci-libs/volk:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -i "s#DESTINATION lib#DESTINATION $(get_libdir)#" CMakeLists.txt
+	cmake_src_prepare
+}
diff --git a/net-wireless/suscan/Manifest b/net-wireless/suscan/Manifest
new file mode 100644
index 000000000000..3aa6eb462445
--- /dev/null
+++ b/net-wireless/suscan/Manifest
@@ -0,0 +1,3 @@
+DIST suscan-0.1.0.tar.gz 1868384 BLAKE2B a021b67f38f86cd54c137c6091ecc2bdbc92fadcc4173f119a4a071d90db8ce259f02a38006b9021f8c65fe13a3a64b2a4b0d459f3d32b492c70f0551f8f59d1 SHA512 1ae42fb2ebe762b77040b4f2bee70b213e89ce9c348c7b4d589600d0bc764a402cf5bbf8488d8f69bdb4c03aea44cbf6384ad986dac217591caab563bdc09fc6
+EBUILD suscan-0.1.0.ebuild 667 BLAKE2B 0c0f65fa2e91978cf161ca035ec53ed5d8ddf35761804fddb5d5fec10f7c19b288b127537fc1aa8be1f99cbe04a63e7a8d050ff4a2c5689a9205631a50daa1d4 SHA512 849eb5342516bdfe47f3f01871ae62154d8badbd1d3730a0fb4b0488a0034595d00b5cde06fb43a2574f9f9b2523a6bc05f3fe297cf6443f4187862ccbf79cc7
+MISC metadata.xml 428 BLAKE2B 87385d8f9ca09325d09ceb5908dd048ff3d367a2d392722b352e1b6b60da9cd7a5fe119dc0710b17051a92323e086924a3edf3fd3907e12b834c53cd0efc73f2 SHA512 28e49c6903428df62c4ab9cd6048dff1a4773f38ede5051bf25982766dc321cc101929e50daabe06cfde03de5cca0faf769176385ed4a995c3e5ac2d04b515b1
diff --git a/net-wireless/suscan/metadata.xml b/net-wireless/suscan/metadata.xml
new file mode 100644
index 000000000000..90b2d0cdbbed
--- /dev/null
+++ b/net-wireless/suscan/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">BatchDrake/suscan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/suscan/suscan-0.1.0.ebuild b/net-wireless/suscan/suscan-0.1.0.ebuild
new file mode 100644
index 000000000000..e95316a6268d
--- /dev/null
+++ b/net-wireless/suscan/suscan-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_MAKEFILE_GENERATOR='emake'
+inherit cmake
+
+DESCRIPTION="a realtime DSP processing library"
+HOMEPAGE="https://github.com/BatchDrake/suscan"
+SRC_URI="https://github.com/BatchDrake/suscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsndfile
+	dev-libs/libxml2
+	net-wireless/sigutils
+	net-wireless/soapysdr:=
+	sci-libs/fftw:3.0=
+	sci-libs/volk:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -i "s#DESTINATION lib#DESTINATION $(get_libdir)#" CMakeLists.txt
+	cmake_src_prepare
+}
diff --git a/net-wireless/suwidgets/Manifest b/net-wireless/suwidgets/Manifest
new file mode 100644
index 000000000000..c4fa03f217e6
--- /dev/null
+++ b/net-wireless/suwidgets/Manifest
@@ -0,0 +1,3 @@
+DIST suwidgets-0.1.0.tar.gz 74722 BLAKE2B 7677fe49cba6646eb45b01aea2d311aba5ab62adae71d9c5b8381766aeeec09560f1c028f94fdce7056b1340d923f6d4727fcc2295db609231a1e5c70dd8f26b SHA512 9f623e01e66d22424b99682c00b5109d9fe07d041f51c583573304897e1bbad33e940a19fc3d1104f97dfcd2f7b7d9a00abc02a3c91e0114214a7a954dfdc054
+EBUILD suwidgets-0.1.0.ebuild 627 BLAKE2B e3b01895fb51c7c243e06ce1ef45a5d4ff43f33e5d59af0acafe3014696d1ee9be5316eadc542caf696177ec2dadf38e72437e8d123305bbf0a26fd80ee55196 SHA512 3017b734602c28092089a8a8c811fbdc6a56dc8022946cf71e21797b0d7993ca12f27254edc46f092a0425e0979442d4e52f25e725733976afdf3186a34f5e99
+MISC metadata.xml 431 BLAKE2B 0c9b453568696f8a3a73cffb7281410a1d3c43c5a199063c7474130c772fe6b7047d23607626bcde8dc0045f324a96f299213f530a21f50b38b65d033875450f SHA512 208660d96495925cbe34d1e8e8cdc256044f0a794110c58ce358163d8008fc976f5cc9881e4ba214b655f3e60c0d9d63577ceea94a5a7459cd059257de35785c
diff --git a/net-wireless/suwidgets/metadata.xml b/net-wireless/suwidgets/metadata.xml
new file mode 100644
index 000000000000..8c12da29d1da
--- /dev/null
+++ b/net-wireless/suwidgets/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">BatchDrake/SuWidgets</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/suwidgets/suwidgets-0.1.0.ebuild b/net-wireless/suwidgets/suwidgets-0.1.0.ebuild
new file mode 100644
index 000000000000..f5bf575c6fa8
--- /dev/null
+++ b/net-wireless/suwidgets/suwidgets-0.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qmake-utils
+
+DESCRIPTION="graphical library containing all SigDigger's custom widgets"
+HOMEPAGE="https://github.com/BatchDrake/SuWidgets"
+SRC_URI="https://github.com/BatchDrake/SuWidgets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/SuWidgets-${PV}"
+
+src_configure() {
+	eqmake5 SuWidgetsLib.pro
+}
+
+src_install() {
+	INSTALL_ROOT="${ED}" emake install
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index d7cea33ba987..f8503eddcd41 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -7,13 +7,13 @@ DIST unifi-5.13.32.zip 151006051 BLAKE2B d853a05c361b26a47f2b3e296a41d3086a05347
 DIST unifi-5.14.22.zip 242779284 BLAKE2B 7056229ff86db56e192c96cc61b9a5c0fba8cd96727a5260af39c5949fe0df49d8bac880ac7e016938e7d7f36b6fa378addef73a08b074e8795898ae3a4ded4f SHA512 4bfa673cea02d014927844fcf4ab97c09581b4b9abe2eab618f388d74f4fa78c294f240beacfdc8a33316a9b73164224f114e28ea202f8b8930927183c11ec88
 DIST unifi-5.14.23.zip 195394703 BLAKE2B ba762712b958f4a784f281419edcd9f7622a4df4881e23a9bbf53b70ca8d9c2dd2452d8b567f1151c7cb7031947fcc0e79193c7b853a23f8faf4235edea62388 SHA512 e29969da15bed74fe24eb7b997c14247f3e8c53cc43021c402365f93cda3b7cc48b9222235770101ab37cdd574eb94d1aba445bc04393b70dac386b7a77cebb9
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-DIST unifi-6.0.13.zip 180668004 BLAKE2B 40eb75f67a58f9796c0f2b51cbf3a46021399e55be016986c531e5a090cbeee45889e69e52c53c668538977df64058e5782038f38e9b7ed667bcfc0b7872e5ff SHA512 9392eef34023a5071b2d2d1ff35bc7a17cb6ba3a70c452b884de86c832a85a419f1b4ecd8d6aeca2ab40a7280149e3794a36b6d0764be898bef2ea4ab2eba49b
-DIST unifi-6.0.15.zip 181660567 BLAKE2B 7dd73e54711333ed3893994dcde15e8d362a823a777b8d82f6989f0c15aa7e661b7d28cf6db0dee3a81f6a33c883ca14fd265c2e4b434630a2248bd27c964a62 SHA512 f8055cb0304644be06f858a7866217393e9199a46fed1dfdf11199de9a85278a4cead1a39d50e3a23c4257b43d0e364021e4f1663c924a37665ac917fb6140d5
+DIST unifi-6.0.18.zip 182521633 BLAKE2B 1b80396a721125479579275d071765e468aa62f21664b3009398cf91585a9d66a31d0e503c61fffad9dea2ae63e354321205033807530ee60b4da66930ca6def SHA512 83d0fafacda4c0e271d6f3c85dd3e7f4e0faddd43822700d5206c5be3876d470d1417901c29be11c95af2688edd0b269e3758b73de6283be3aa3f7f602ad19fc
+DIST unifi-6.0.20.zip 182776288 BLAKE2B 3b9aca0a7b356a1bab2e9f6af8da21ee43b7c4f14392292a0f25803395a12ad726ad7db46f4c4863841bf9c3cdc973ae5bfdd9e7dc48974494807e6ba15658b8 SHA512 926f78c3f9b3035e09a8592bd52239665fb379d9324ceae42494a55d01325028dd0d09f0692cd23466216958fe51153f2093f747fadbaf9aabd49c450233aae3
 EBUILD unifi-5.13.29.ebuild 1566 BLAKE2B f3518c77f5344023a9f219e5e01b501b0d1855879c06c90b7b89798059100e844325fe1cf42c09117049056d49df19723613977eb3f73da4a5845e403a5303c8 SHA512 b3d01a742500089913ceba14990b18cea9470be9413b753ae3ab17e4adbaf49a5575f4ffdbcbb97c7b369be3aff400a3b3cdcdf711d944dc3865f3844347cadb
 EBUILD unifi-5.13.32.ebuild 1567 BLAKE2B cbfbf056c1f98854bc1732b2b4c3204cc1f9b63f9a3fece1bf629047d87164d9b4487f39825e90f41a6cc4251985bc1e263ab1efeb297034d4316107e93043b2 SHA512 9e251af9c81088256c6bdd06a6c557f9a7cc10c4e6e48aa94e0a76173cd2dedca26886d3b52bc7d39b6a9faad30ebf5306d178803cdc8ba95bc2bdec8b4974d9
 EBUILD unifi-5.14.22.ebuild 1567 BLAKE2B 18e719065dabc0f01e0e9ef1b078e9351e915fef828efb36ce4772226f30d20c4833fff9255e23c59fbbf2e6f77e89423d3a909f0faf2978e86d11f55af70645 SHA512 811b5ab374ff4673916ee7577a48e48638bf0336542e1884e2cefe92d3b8b31d13a69bbb74547b06d0511c832901e8e8388f802a04ec5322671fa360c90d7758
 EBUILD unifi-5.14.23.ebuild 1566 BLAKE2B b41bc9e03b2812566edb82bf3127501cb12df15484045c267c2e47bf1eebdefc740ee978c36e914d3cd1911728b7a4871f2bfb2f90198d38b9c3a771299c4e4e SHA512 a9998d13dda0fd508595d0c53667fec28001c1ee5766422a793f8a512c22a1266933c21f5e6e3b17702f68cd328aa5202f810aa9da020fdd66c88b3e80c30afd
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
-EBUILD unifi-6.0.13.ebuild 1566 BLAKE2B bae463772dccc551033e2bd55b2245f61dccffe681748a0c01c9694c621462a1a80404f3b3dba0ce43c4a281e2f2caf5c0ccd3844cc8a360b636652715e35366 SHA512 86c928324383f716df8b6f0ff7bb7e80728dfaa733544eefbe8321b5806260622a149b3e0ae04dc7e304b9036ef3bd500eb2d3883af0cb3a941a6151daae81f4
-EBUILD unifi-6.0.15.ebuild 1566 BLAKE2B 8b4b7da944d361f82cb4a8eeb4ce65b83784df4c0581bc4873a73c744a4d8de6fdc04d635d328b97533acbee5cfa94109a436374ffad5623a22e6bad6a5999e7 SHA512 3f784d89287bb0a56309f8ed79acac9b8723b30f4e24a15b7e65a2c3c232a7084c7c2739a5f855f60defba114dacbb17f10aee797b8c3c94f408b59773909516
+EBUILD unifi-6.0.18.ebuild 1566 BLAKE2B 0d5345ecc947710f6d01332a7f68548eddf65adfc9fe7f385cdb44c8c367d145de4b44b6a3c1b124bb87ff5018aca5760829b19c6a3e011b06c30f1df1628247 SHA512 e0b29cf469c5e96b35d814a46015b0afaf07e925d2eb13ce290318337d273b21f009bb94fce9b2b839e7d3335eff3a332b98e3c1e047db0936b08c752e0a7301
+EBUILD unifi-6.0.20.ebuild 1566 BLAKE2B d7ce4d01f4b58287324f01568f6a5a5810d05c100bc6d8d71efffa31146082dc26c25fb2c7ba9187bde12bb1b440e04af3ff4d7b60aad2fa346f2a90720d2f5e SHA512 2140f9d813804bb533cedc699aff741f1001bae746fae41b17508964600542c5ac7fca9e27d136b37cfe2fe6d4eff9c92eae5ebed3502b3b09e19084b4981002
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.0.13.ebuild b/net-wireless/unifi/unifi-6.0.18.ebuild
index d7fba07ec7ce..184ee24cc3a2 100644
--- a/net-wireless/unifi/unifi-6.0.13.ebuild
+++ b/net-wireless/unifi/unifi-6.0.18.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-49f6654778"
+RC_SUFFIX="-2f53410e48"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-6.0.15.ebuild b/net-wireless/unifi/unifi-6.0.20.ebuild
index c17ea6d564a9..4516135ff546 100644
--- a/net-wireless/unifi/unifi-6.0.15.ebuild
+++ b/net-wireless/unifi/unifi-6.0.20.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-60e2436234"
+RC_SUFFIX="-816b9dfcdd"
 
 inherit systemd
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /net-wireless
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)