gentoo Easter resync : 12.04.2020

66 files changed, 746 insertions, 907 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 17bebc484711..2f376f4f6f58 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 9116146951e3..aa2c1dd9ff10 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,7 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
-DIST blueman-2.1.1.tar.xz 950296 BLAKE2B 10113bf9bd6744d6aaa5e4d0912d87ba11ace36027acfb10802988ad7c7458dbe2c092095148277f437a8dac68f93c017da53a0925a2c3e8c24e0400db567c87 SHA512 bde7dffc369a7204e2c0e05005f3c1cb97760b3d8625342fe69a5b5c729d6b90eabeca37c679c56f73499f1dbc17ccc15800b4e6e48e717f0e306083525981e9
 DIST blueman-2.1.2.tar.xz 950296 BLAKE2B dec19174813a76d5abb941b7a93257428175961c4f05709e5c1ba304302b4163a61cde2ae5938f40053ea43298ee8ac483cd0439c80ce76bae41a95b3dc8d5ac SHA512 44d397d3a9d154d05b5231e18e624bf1ca33c690be5eeb448620ba4882110306925b78dbbbd815384ee3faeff147d2b042c01be28fb1b43568924c9657484527
-EBUILD blueman-2.1.1-r1.ebuild 2952 BLAKE2B d0f5ae870fa21c35c091d6d095fb900765c2716a5a2ac7c06bfedc0332070acf4af91ffc2612e0e6f38d5b7d3ec8270a70ec2f10d05075acccd8321610eeca1e SHA512 cf9540afef232a8d2703573a8a144e603e36d0c2460a395cb6677b758d61512e1926e5e2c811600037131322bc1a6169a2be5dfdd9b0ff2e1d801fde9b615808
 EBUILD blueman-2.1.2.ebuild 2952 BLAKE2B d0f5ae870fa21c35c091d6d095fb900765c2716a5a2ac7c06bfedc0332070acf4af91ffc2612e0e6f38d5b7d3ec8270a70ec2f10d05075acccd8321610eeca1e SHA512 cf9540afef232a8d2703573a8a144e603e36d0c2460a395cb6677b758d61512e1926e5e2c811600037131322bc1a6169a2be5dfdd9b0ff2e1d801fde9b615808
 EBUILD blueman-9999.ebuild 2952 BLAKE2B d0f5ae870fa21c35c091d6d095fb900765c2716a5a2ac7c06bfedc0332070acf4af91ffc2612e0e6f38d5b7d3ec8270a70ec2f10d05075acccd8321610eeca1e SHA512 cf9540afef232a8d2703573a8a144e603e36d0c2460a395cb6677b758d61512e1926e5e2c811600037131322bc1a6169a2be5dfdd9b0ff2e1d801fde9b615808
 MISC metadata.xml 608 BLAKE2B 1acb5842f719f99063f933022cc9b093b83ce38554b9137732825a3df761dbb9fb03f1f494a870c874a7703d6a7e5c6b6b1a24f85912a327f4576b29b4294093 SHA512 35a67e2952bb587c7fd4c62e464986127799696a645c0b01df5b77a43343c86fe1f994f9401fcd1957eb76f59ff61b5806fa1910a280e5ce62e7a0e8164f65e6
diff --git a/net-wireless/blueman/blueman-2.1.1-r1.ebuild b/net-wireless/blueman/blueman-2.1.1-r1.ebuild
deleted file mode 100644
index af14a0fe84ea..000000000000
--- a/net-wireless/blueman/blueman-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
-	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_MULTI_USEDEP}]
-	')
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio[bluetooth]
-			media-sound/pulseaudio-modules-bt
-		)
-	)
-	!net-wireless/gnome-bluetooth
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# replace py-compile to fix py3
-	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
-}
-
-src_configure() {
-	local myconf=(
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable appindicator)
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/bluez-hcidump/Manifest b/net-wireless/bluez-hcidump/Manifest
index 6c6470e661ae..fcfa0fd91bb3 100644
--- a/net-wireless/bluez-hcidump/Manifest
+++ b/net-wireless/bluez-hcidump/Manifest
@@ -1,3 +1,3 @@
 DIST bluez-hcidump-2.5.tar.xz 157072 BLAKE2B e0ceb98f42a61f56ebf0a5a6adf3c95c6525106bf0491cff042f9938ab32819446be352f80dac0c26b44bfedeec58dadeb87caaf740a6ce150e91a6ca905bf2e SHA512 20e05bba1ea53fa774311fb0c24263c8837818b598ea8519539d0792cad7888330feb5c717c327630d6f6985eb0813de99a30994c3ef108fa128b484487ea3f2
-EBUILD bluez-hcidump-2.5.ebuild 411 BLAKE2B ef58039c3fb3b621f9dda57de9b20bfc30d465fe5e05c754cde092f68695c9e6149b406f14f7c7021d3457fa022b3fcfea2b68f37617b8ead1f194541f788186 SHA512 c744d7cfb1d2f75dd69e8fe2a791f36bf1846e0fcc2193cbd535bdd252331368f0266cdd06a09bb43579c0d5bae195b1fb180d9fec07630d644a67fc52b1cd8d
+EBUILD bluez-hcidump-2.5.ebuild 409 BLAKE2B 91f5d209e25ed00d6571fca97b44c017c8205aa4786ce33c359b4d364575c9cb22dbde6e955b27721ea83bfdf924a44111537ad87953e83f61a966dc5e4a16b4 SHA512 3981f0cd35febd03a041ec14d6a22fad5bdc3d8ce4e7908f3bec14ff49c5f271404f0ae35bcdca54be4b71eb3c9704b1e99dad13dd2185e9dd33b012825c715a
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild b/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
index 55e2eba236f8..caee60711fc1 100644
--- a/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
+++ b/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-wireless/bluez-4.98"
diff --git a/net-wireless/bluez-tools/Manifest b/net-wireless/bluez-tools/Manifest
index e1d96636d934..b6f992818934 100644
--- a/net-wireless/bluez-tools/Manifest
+++ b/net-wireless/bluez-tools/Manifest
@@ -1,3 +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 681 BLAKE2B c0d9628b1eb304c73a781fe981c07df5fc7ed58f3965b51665beaf2d921507b769a5fb05cc9854a45047d2cefe03e34de92e7cf50c55a273686defaaa5f37b1d SHA512 262701d6bcd971afc361d4dab7789897768dff8bf6a4b1c8fe39a04a540a465014d62aec980c42cee532f166878a22fb72912b3d68407652185727b0d98b224f
+EBUILD bluez-tools-0_p20161212.ebuild 707 BLAKE2B 22ab18908817f92803bb305857bab3a629a8250e022afb219571807d63aefdce8a788f576671e4b226b9d7ac14920e02abe401a22545f41e5413d103aa5af9fd SHA512 adfd3b1a3137020fc9f2f59e8164073ed68891472d9f881d0d4da736828c0ff57ccff44482ac7fe3a85c28374e4edb10383d339e88d43c6f1baeb8c3017abac5
 MISC metadata.xml 575 BLAKE2B c0ef09b4f032bb7ae6cc0315789ff198eb81f91f3334140a23538e158278918f9b68e2f4a24e4d1f549ffeeecc525bbcca883ef891eb4d9171a4bcb6468c5ba9 SHA512 73b71c957ac6247f7f42644c3b7ae90bcd628eeb3eda210a2488dcafb88d99dc22c7b9426593d4e095d8a18931333434756cde9e6d987d948094acf1de418c7a
diff --git a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild b/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
index 4e777054b46e..87c36ffc4986 100644
--- a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
+++ b/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="A set of tools to manage bluetooth devices for linux"
 HOMEPAGE="https://github.com/khvzak/bluez-tools"
@@ -23,9 +23,11 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README )
 
+PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" )
+
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_prepare() {
+	default
 	eautoreconf
-	default_src_prepare
 }
diff --git a/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch b/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch
new file mode 100644
index 000000000000..6bfaa57fa19a
--- /dev/null
+++ b/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch
@@ -0,0 +1,29 @@
+--- a/src/lib/agent-helper.c	2016-12-12 09:18:08.000000000 +0100
++++ b/src/lib/agent-helper.c	2020-01-30 22:23:27.555951515 +0100
+@@ -33,6 +33,8 @@
+ 
+ #include "agent-helper.h"
+ 
++gboolean agent_need_unregister;
++
+ static const gchar *_bt_agent_introspect_xml = "<node name=\"/org/blueztools\">\n\t<interface name=\"org.bluez.Agent1\">\n\t\t<method name=\"Release\">\n\t\t</method>\n\t\t<method name=\"RequestPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"out\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"RequestPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"out\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t\t<arg name=\"entered\" direction=\"in\" type=\"q\"/>\n\t\t</method>\n\t\t<method name=\"RequestConfirmation\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"RequestAuthorization\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t</method>\n\t\t<method name=\"AuthorizeService\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"uuid\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"Cancel\">\n\t\t</method>\n\t</interface>\n</node>\n";
+ static guint _bt_agent_registration_id = 0;
+ static GHashTable *_pin_hash_table = NULL;
+--- a/src/lib/agent-helper.h	2016-12-12 09:18:08.000000000 +0100
++++ b/src/lib/agent-helper.h	2020-01-30 22:22:15.463751152 +0100
+@@ -35,7 +35,7 @@
+ #define AGENT_DBUS_INTERFACE "org.bluez.Agent1"
+ #define AGENT_PATH "/org/blueztools"
+ 
+-gboolean agent_need_unregister;
++extern gboolean agent_need_unregister;
+ 
+ void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error);
+ void unregister_agent_callbacks(GError **error);
+@@ -44,4 +44,4 @@
+ }
+ #endif
+ 
+-#endif /* __AGENT_HELPER_H */
+\ Pas de fin de ligne à la fin du fichier
++#endif /* __AGENT_HELPER_H */
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 80fe1e8b5eac..311af361e976 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -2,13 +2,9 @@ AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLA
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
 AUX 69-btattach-bcm.rules 2141 BLAKE2B 07fe8306e29f05082a603bd5a4b9d51c8c23b4ed48eaeebd01591970c0e29ea37198abaa8725023fd00cd38c67451910b6028d6725be3aca5ed1c495e02555ee SHA512 ecf535d737b9f1dc7a077f2a13e3712c959c505a93c24f48d63b04db0d42f8feef3918d48b7db5e8e115574a9b62f47aaa9c3e77230cff682d3f35da2f09047e
 AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb36465739462208d1564c59d59b3c8801dca5f9ba8547efc982d972cdaeef340403c82c9fa1ad8922b0396d29bd SHA512 05fd235483c65decc8badeca1b3ec60ae59f4881cc9125f6b148afe2cbc269a636df620b6bab72ce20b6b265c73074b1afef1029aecd884dc1dbb2694c0d16d9
-AUX bluez-5.51-disconnect-timeout.patch 3053 BLAKE2B 3a9d503c688731931627df00e04c0e6f14ac71fe00d72cc3926d8fea1ee63a3034d87a706766b64c08680a0e15d96b812d0f3b12058ab05c5c14dd43f5be2771 SHA512 b7eb3e9205a37a34d7334078dee2580f5159319bf03c5d4601ff39c403d5e3e641bbf250da6622e10d0b059c9223d590e1935166bd66420d2dc6a32a420263a8
-AUX bluez-5.51-include-limits-h.patch 1490 BLAKE2B 084d0780638497594088f374da7a7f4c790eb5c4a539031e7b5e282a4ec49c44b6fb60ebbb636629d333463386d8da353012863ddc08804775a81285fa18ba54 SHA512 f23475af0d9641ed2ae2b62b8cc186a123d6f1f26556caa51e5615fe6b544a60c6dee425c05facfe3a881afecc8f22c7f370b8cdf25e09c4690c22202705a677
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399a37cbba5c414d0396f2aff7c2a4965b56a1125dc8568e7bc848011106ab993e4c1211e704f485259373ab65a SHA512 259d10df16f4b23364da971063345b25cbf7c6a1b9f2576d3ecbd48620675392601cba017a591af1f44fe8eff8ea0c8cabeafa8adbddeb3e1014f428d37d1690
 AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
-DIST bluez-5.51.tar.xz 1941904 BLAKE2B e8580388961c99305c6f723160e726232a097067815a88a056c1569c55c2ea410004cf92572afbef9b782807d8a940503b4501f9c6046cacac35136fbbe580a8 SHA512 8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f
-DIST bluez-5.52.tar.xz 1957504 BLAKE2B 670cdfb44eca1b184c0bd678bab34116f9172394b86fb69fa454f7bdcc1ae82c466a806879ddef96dddd6ae6cd31466b48f9e87113d43144659ae0c057b9def8 SHA512 9024481910d1dee85578bf3d7a4fc4be2bece516e6216c91aa1a7ac18537f092b47c41c4a5506ddd7e279599d58002e98203c5439745c01df4dbc22a75234c84
-EBUILD bluez-5.51-r2.ebuild 9313 BLAKE2B acb48a3606e0cc5f7a2a48b28621af69f7c99f53b142ab5a20e3f8693fb28a4506193760885d2a181519ba89a6e6bd2dc23af4e16f79c6b7a5110fedf709e1cb SHA512 0a8d19a7e76782b2d33065d6c81a80a0a612276179658cfaeec43a106cf157126a8ba47e6a691d95e764b6652d0b25dae89cac0211ad4325d3f56af6856c642b
-EBUILD bluez-5.52-r1.ebuild 8965 BLAKE2B 846aa3a547bffbdccfda9a13be9d203f646a92406d6311d218d0c23c6d65ce21a5b566c60e13cc108c7dbaf1ef2869a110d0b22c538f9a4d5b57f7a437b3ad0d SHA512 a7cd8616336773cbe4f416499fc2a4cedf17fe4748e19c0474b79b6b87de30ecd63c095691daae29345ba3d2294ce08c37665b7ceaa02d63c92e5f81f2e8dbe4
+DIST bluez-5.54.tar.xz 2003760 BLAKE2B 278a8be86d93654b9ec31ed2591a89a2a0f35fd8378fc3cffd9028b1aab431071b802e77b956503fd16239e5b821ab356733fdc49436ef811b87190e185a91c2 SHA512 e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe
+EBUILD bluez-5.54.ebuild 9541 BLAKE2B 8b63bd805f3544e897a8b62cda2746af71ef2c24800038a4af8d43229e4451f673860112c5a91834d4ebe8a2f49e5ce6ea5f3b851f0def153b23d0223e70a0d5 SHA512 b6ca1f461f7452c6a19af3e47057edf68012935920d9932935c0d53b8357699cc872b00ebd6b120762e74baaca6d483feab65c1083d54d39904e1943758b4f6c
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.52-r1.ebuild b/net-wireless/bluez/bluez-5.52-r1.ebuild
deleted file mode 100644
index b3c94fefbc73..000000000000
--- a/net-wireless/bluez/bluez-5.52-r1.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools 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.26 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.26
-		dev-libs/json-c:=
-		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() {
-	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
-
-	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugs.gentoo.org/618548
-	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
-
-	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 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 that tools can break"
-			ewarn "without 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
-			# Few are needing python3, the others are python2 only. Remove
-			# until we see how to pull in python2 and python3 for runtime
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/agent.py || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-mesh || 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/*.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/bluez/bluez-5.51-r2.ebuild b/net-wireless/bluez/bluez-5.54.ebuild
index 5b222563fc81..9f48674ca4a2 100644
--- a/net-wireless/bluez/bluez-5.51-r2.ebuild
+++ b/net-wireless/bluez/bluez-5.54.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
+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"
@@ -37,11 +37,11 @@ BDEPEND="
 DEPEND="
 	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
 	>=sys-apps/hwids-20121202.2
-	btpclient? ( >=dev-libs/ell-0.14 )
+	btpclient? ( >=dev-libs/ell-0.28 )
 	cups? ( net-print/cups:= )
 	mesh? (
-		>=dev-libs/ell-0.14
-		dev-libs/json-c:=
+		>=dev-libs/ell-0.28
+		>=dev-libs/json-c-0.13:=
 		sys-libs/readline:0=
 	)
 	midi? ( media-libs/alsa-lib )
@@ -67,21 +67,29 @@ PATCHES=(
 	# https://bugs.gentoo.org/539844
 	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
 
-	# Include limits.h for PATH_MAX
-	# https://marc.info/?l=linux-bluetooth&m=157156119320950&w=2
-	# https://bugs.gentoo.org/695940
-	"${FILESDIR}"/${PN}-5.51-include-limits-h.patch
-
-	# audio: Fix cancelling disconnect timeout (from 'master')
-	# https://marc.info/?l=linux-bluetooth&m=157047663920714&w=2
-	"${FILESDIR}"/${P}-disconnect-timeout.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
+		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
@@ -109,10 +117,6 @@ src_prepare() {
 			Makefile.{in,tools} || die
 	fi
 
-	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugs.gentoo.org/618548
-	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
-
 	eautoreconf
 
 	multilib_copy_sources
@@ -211,12 +215,13 @@ multilib_src_install() {
 
 		# Unittests are not that useful once installed, so make them optional
 		if use test-programs; then
-			# Few are needing python3, the others are python2 only. Remove
-			# until we see how to pull in python2 and python3 for runtime
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/agent.py || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-mesh || die
+			# 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
 
@@ -267,7 +272,7 @@ multilib_src_install_all() {
 	use doc && dodoc doc/*.txt
 	# Install .json files as examples to be used by meshctl
 	if use mesh; then
-		dodoc tools/mesh/*.json
+		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."
diff --git a/net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch b/net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch
deleted file mode 100644
index 2f6e7c8c4d95..000000000000
--- a/net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 52faac4648500dd45c06b6aa41f1be426c43a125 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Fri, 11 Oct 2019 15:40:04 +0300
-Subject: audio: Fix cancelling disconnect timeout
-
-If AVDTP session has been connected but no stream has been setup calls
-to service->connect would return -EBUSY to avoid stream setup collision
-but it also takes a reference to the session cancelling the disconnect
-timeout and disabling the stream_setup logic that would attempt to
-estabilish a stream.
----
- profiles/audio/sink.c   | 25 ++++++++++++-------------
- profiles/audio/source.c | 25 ++++++++++++-------------
- 2 files changed, 24 insertions(+), 26 deletions(-)
-
-diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c
-index 7cac21034..966440534 100644
---- a/profiles/audio/sink.c
-+++ b/profiles/audio/sink.c
-@@ -256,11 +256,18 @@ gboolean sink_setup_stream(struct btd_service *service, struct avdtp *session)
- 	if (sink->connect_id > 0 || sink->disconnect_id > 0)
- 		return FALSE;
- 
--	if (session && !sink->session)
--		sink->session = avdtp_ref(session);
--
--	if (!sink->session)
--		return FALSE;
-+	if (!sink->session) {
-+		if (session)
-+			sink->session = avdtp_ref(session);
-+		else
-+			sink->session = a2dp_avdtp_get(
-+					btd_service_get_device(service));
-+
-+		if (!sink->session) {
-+			DBG("Unable to get a session");
-+			return FALSE;
-+		}
-+	}
- 
- 	sink->connect_id = a2dp_discover(sink->session, discovery_complete,
- 								sink);
-@@ -274,14 +281,6 @@ int sink_connect(struct btd_service *service)
- {
- 	struct sink *sink = btd_service_get_user_data(service);
- 
--	if (!sink->session)
--		sink->session = a2dp_avdtp_get(btd_service_get_device(service));
--
--	if (!sink->session) {
--		DBG("Unable to get a session");
--		return -EIO;
--	}
--
- 	if (sink->connect_id > 0 || sink->disconnect_id > 0)
- 		return -EBUSY;
- 
-diff --git a/profiles/audio/source.c b/profiles/audio/source.c
-index 4081e1970..0ac20fe40 100644
---- a/profiles/audio/source.c
-+++ b/profiles/audio/source.c
-@@ -257,11 +257,18 @@ gboolean source_setup_stream(struct btd_service *service,
- 	if (source->connect_id > 0 || source->disconnect_id > 0)
- 		return FALSE;
- 
--	if (session && !source->session)
--		source->session = avdtp_ref(session);
--
--	if (!source->session)
--		return FALSE;
-+	if (!source->session) {
-+		if (session)
-+			source->session = avdtp_ref(session);
-+		else
-+			source->session = a2dp_avdtp_get(
-+					btd_service_get_device(service));
-+
-+		if (!source->session) {
-+			DBG("Unable to get a session");
-+			return FALSE;
-+		}
-+	}
- 
- 	source->connect_id = a2dp_discover(source->session, discovery_complete,
- 								source);
-@@ -275,14 +282,6 @@ int source_connect(struct btd_service *service)
- {
- 	struct source *source = btd_service_get_user_data(service);
- 
--	if (!source->session)
--		source->session = a2dp_avdtp_get(btd_service_get_device(service));
--
--	if (!source->session) {
--		DBG("Unable to get a session");
--		return -EIO;
--	}
--
- 	if (source->connect_id > 0 || source->disconnect_id > 0)
- 		return -EBUSY;
- 
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/net-wireless/bluez/files/bluez-5.51-include-limits-h.patch b/net-wireless/bluez/files/bluez-5.51-include-limits-h.patch
deleted file mode 100644
index ccbc152a4ee1..000000000000
--- a/net-wireless/bluez/files/bluez-5.51-include-limits-h.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 20128c5c95fbae93c9fd996d5ad2584cf6ad8032 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Mon, 30 Sep 2019 18:35:56 -0500
-Subject: [PATCH] Include limits.h for PATH_MAX
-
-Signed-off-by: Jory Pratt <anarchy@gentoo.org>
----
- mesh/keyring.c          | 1 +
- mesh/mesh-config-json.c | 1 +
- mesh/node.c             | 1 +
- mesh/util.c             | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/mesh/keyring.c b/mesh/keyring.c
-index 3a7f92f..9fa7d6b 100644
---- a/mesh/keyring.c
-+++ b/mesh/keyring.c
-@@ -24,6 +24,7 @@
- #define _GNU_SOURCE
- #include <fcntl.h>
- #include <dirent.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <unistd.h>
- #include <dirent.h>
-diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
-index cafa2fd..74ca495 100644
---- a/mesh/mesh-config-json.c
-+++ b/mesh/mesh-config-json.c
-@@ -27,6 +27,7 @@
- #include <fcntl.h>
- #include <ftw.h>
- #include <libgen.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
-diff --git a/mesh/node.c b/mesh/node.c
-index b6824f5..15dcb97 100644
---- a/mesh/node.c
-+++ b/mesh/node.c
-@@ -23,6 +23,7 @@
- 
- #define _GNU_SOURCE
- #include <dirent.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <sys/time.h>
- 
-diff --git a/mesh/util.c b/mesh/util.c
-index 1455bde..986ba4b 100644
---- a/mesh/util.c
-+++ b/mesh/util.c
-@@ -25,6 +25,7 @@
- #include <dirent.h>
- #include <ftw.h>
- #include <stdio.h>
-+#include <limits.h>
- #include <time.h>
- #include <sys/time.h>
- 
--- 
-2.23.0
-
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 308fd95c74de..a7f6e1e1ea50 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -10,6 +10,6 @@ AUX crda-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc
 AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9
 DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588
 DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053
-EBUILD crda-3.18-r3.ebuild 2142 BLAKE2B b3735350fef553a7fb1137281fc9eaf3a550dd499be9d162c1c0448b13ff716f00e9e39106e5d473a6f37d8841ff033c087b83b1c1f49654c94b9c25e2982779 SHA512 f28109e1ae3f34d11a8d9186d0279f5b77de7c5c340964f4a776ecf4388a63e7974ed33865863e445d052a9dc90c4d1062258fba63a30b4d3b0a3cb930e7c623
-EBUILD crda-4.14.ebuild 2221 BLAKE2B 6acebb341dc2adc1559e737ef956d7eba9ced8ca928c82b67bed29f775e9321765b9d15c44536198d01c824c773f7888fc81f778276a3ac668f12dc16a8223af SHA512 d8e048822a1906fb4e5731f9fc5684c5b368eef761bf99a480ddc434be5159eb898ac950ffcc563a10d9736cc96637b36d2731bcc884c89ad27dd412a346aee2
+EBUILD crda-3.18-r3.ebuild 2143 BLAKE2B 9c7273d7d3d5bfa600074deb6183bfcc1a21b243423e2e42b16f9c8c02c37977a78d3a7c921b3c44b8e2cab5ac0ad6a816ed315a8a1f4ee11c43a394848c62ca SHA512 f084c4912c6e030d48882c1cb56cacae17854b28fcc29ba7783cdf614683a08ce99533b54b0f50fc83bf97f2bd14ed0d0c8387b0e236d43a07fd4fc2eb657159
+EBUILD crda-4.14.ebuild 2214 BLAKE2B d20a6d56b0e33aa7d1dc8390c968a961080521a0537cf2d5601a7c1d70d0580aa5b8a94117e0e2cc1a4f5416c9d1d97fc9d110da225423fa0105d2fc14dac6a9 SHA512 175c24222615c1f73719bf97d3687628d41dbd3fb23f2ebbbf48b160062b9112d275681b7c300d605b3eb0459c88b4675b7747346a5d23842cdeed790f9a3681
 MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59
diff --git a/net-wireless/crda/crda-3.18-r3.ebuild b/net-wireless/crda/crda-3.18-r3.ebuild
index 362a2c535704..a121648be719 100644
--- a/net-wireless/crda/crda-3.18-r3.ebuild
+++ b/net-wireless/crda/crda-3.18-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gcrypt libressl"
 
 RDEPEND="!gcrypt? (
diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild
index f5a34d3b6444..185314a365c1 100644
--- a/net-wireless/crda/crda-4.14.ebuild
+++ b/net-wireless/crda/crda-4.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapsho
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gcrypt libressl"
 
 RDEPEND="!gcrypt? (
diff --git a/net-wireless/dump978/Manifest b/net-wireless/dump978/Manifest
new file mode 100644
index 000000000000..d46ec37e1fd0
--- /dev/null
+++ b/net-wireless/dump978/Manifest
@@ -0,0 +1,2 @@
+EBUILD dump978-9999.ebuild 996 BLAKE2B 3cc0f475cd238942058830d5209d14c722c33f3fb0049778863c970633b48393f3f6271f8d0695984d5093a10ef72ea0255abc8ca206964e7b889f7087e39750 SHA512 f5ef87438d9351bcb910a5873d31c701c8c9a720feeb6c8f40ea7a96baadbb6e57dc85d215ed003a94fe74f4c5c41ea789fbca569046dede7d25271ad51e21bc
+MISC metadata.xml 322 BLAKE2B 268566da9bf8b705f49287f5579d0bf9d647658459e86d3a168454765387c51226246b50e8a1ee78c62a926cd4eceaafe75518929d0e7ffc3ab27ec6f839df3b SHA512 03b9e040e61bae4ce0b020f7b8d6f2e134c1c8d60de4826e43def2181a632244f982a5f2a1d9e67a542545f8703c8f885fd89dbe2c04008992a040f98035c72c
diff --git a/net-wireless/dump978/dump978-9999.ebuild b/net-wireless/dump978/dump978-9999.ebuild
new file mode 100644
index 000000000000..f84f6b174121
--- /dev/null
+++ b/net-wireless/dump978/dump978-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="simple Mode S decoder for soapysdr supported devices"
+HOMEPAGE="https://github.com/flightaware/dump978"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
+	#SRC_URI="https://github.com/flightaware/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-${COMMIT}"
+	SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/boost:=
+		net-wireless/soapysdr:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e 's#-Wall -Wno-psabi -Werror -O2 -g##' Makefile
+}
+
+src_install() {
+	newbin ${PN}-fa ${PN}
+	dobin skyaware978
+	dodoc README.md
+
+	insinto /usr/share/${PN}
+	newins debian/lighttpd/89-skyaware978.conf lighttpd.conf
+}
diff --git a/net-wireless/dump978/metadata.xml b/net-wireless/dump978/metadata.xml
new file mode 100644
index 000000000000..825bf00b405a
--- /dev/null
+++ b/net-wireless/dump978/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">flightaware/dump978</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index fb238295fc5f..4d79bf51f539 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,4 +1,6 @@
 AUX 61-gnome-bluetooth.rules 399 BLAKE2B ba3dd9fdc3834ce6a3460d8abff179d08c1258f7ba43e2350ed2c7e88aaf6fef4b06c51b6212650523c4de577cb3a85946bae9b955cf6c17a0c984431abd5d2b SHA512 74fd95e2afb3d3f13df72bb593ae6644a3a4975e43f5f50c622f14f756861596ef92aa331200d9fce6ff3976e8a1ed57e4053186b7a9716039ace971a6dfed0d
 DIST gnome-bluetooth-3.34.0.tar.xz 351232 BLAKE2B 5ed3a2edc4d0a494013c246ce4caa64cc343c08ceeca3fbdc809591c59a59a7e269b35ba2474f38bb9ae1aba7f7b47f2d164c2be49d3e59d1af538a77a7451ab SHA512 25c99f3ac4398b24c08018cdf41a124c94312bc0b1c7202c82918134ddbdea16d6ee0980536cb45deb42ae8fa25b6e86ad21870646235108583831bf5f00926e
+DIST gnome-bluetooth-3.34.1.tar.xz 354568 BLAKE2B 53e0f4d172e12ba1fec8dae476929fadaab2fd0a8e8ac063debbe516f925a3bb04c9000012fc2e143baf00c7bbdd4f2bd31bd64e674c1851e4ec544ab9c058a5 SHA512 3e0080bbeeddc144fdcf6b4f0d59b0885fd5881aee670d2e5dffd4ede9b0f988358ad0e815ba86add8b7fd5e93e1f8fc7bfacd10b8d69606aa569fd67356be08
 EBUILD gnome-bluetooth-3.34.0.ebuild 1417 BLAKE2B cce5e7d06f1ee47b524f583b180a6c6a08d727fb7901120b54383bfb075356f9a1baf636d7d7b5c6e7fbd1ccea751786bc82f1c87f969f19618a582cb5a679e8 SHA512 29aa1aec42c6208ebefe56f91f3aefdc9beff5c53ec3a4f5b5570e42bd0d215675c5ff10a8a389a8892735e3ce2be3522b586fbec279ff2f04deaf6ec3a5538d
+EBUILD gnome-bluetooth-3.34.1.ebuild 1419 BLAKE2B a799de213e5d2606fdb9deaba430493eb027b97eb301ee9962547eb1448a5ec6d26574cf09747a99b78570ac26416f04a2a34810042ca1124dbbc721fbfa8cf8 SHA512 9a2e035d256dab1860c061a4e6d5075f7de898890f8a73ba8debf780d5a2e90791f3e43a60f2c4d77bd3b40c0ed61b41133818f9da1b3839e77cc4ddd58e2641
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.1.ebuild
new file mode 100644
index 000000000000..af4accb2f528
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson udev xdg
+
+DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+SLOT="2/13" # subslot = libgnome-bluetooth soname version
+IUSE="gtk-doc +introspection"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.12:3[introspection?]
+	media-libs/libcanberra[gtk3]
+	>=x11-libs/libnotify-0.7.0
+	virtual/libudev
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	acct-group/plugdev
+	virtual/udev
+	>=net-wireless/bluez-5
+"
+BDEPEND="
+	>=dev-util/meson-0.49.0
+	!net-wireless/bluez-gnome
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.9 )
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dicon_update=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	udev_dorules "${FILESDIR}"/61-${PN}.rules
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! has_version 'sys-auth/consolekit[acl]' && ! has_version 'sys-apps/systemd[acl]' ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to control bluetooth transmitter."
+	fi
+}
diff --git a/net-wireless/gr-ntsc-rc/Manifest b/net-wireless/gr-ntsc-rc/Manifest
new file mode 100644
index 000000000000..4ed93c99938b
--- /dev/null
+++ b/net-wireless/gr-ntsc-rc/Manifest
@@ -0,0 +1,2 @@
+EBUILD gr-ntsc-rc-9999.ebuild 861 BLAKE2B 2d9e90220fdc13a72068293460fc602d77ca979d766bb238d5119db282d5c7c8b744f729028b21b3218e2dcdf324f34e795b54d6cd2ee5fd919dca78dfb66f1e SHA512 a6e1e2d5cace59d67f3b2c2fb06af1fb976682d1739a4c6a859c0678d3830530c64481a75a372be381487a199e704ecab1d0b645491840d764bb540bbf8daebf
+MISC metadata.xml 431 BLAKE2B ea50ec1fb171b7338852942042e16e18a22c91b9cea930f1cf07a2f3c11562b382686185ad7526d14f7538fc66bfef5b16d076d8551820e7ef6ff8aaabb5ae0d SHA512 3b7b5ff2cd39626db4d679a5e4ff31df14d1377b438a3948cd10749fde6aa10ae477415f48ce6da5dab5b28ce174dfcfb60dab08e184758525b4eee83d9beeed
diff --git a/net-wireless/gr-ntsc-rc/gr-ntsc-rc-9999.ebuild b/net-wireless/gr-ntsc-rc/gr-ntsc-rc-9999.ebuild
new file mode 100644
index 000000000000..0ec7eac6d1eb
--- /dev/null
+++ b/net-wireless/gr-ntsc-rc/gr-ntsc-rc-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="NTSC receiver and transmitter for 5 GHz drones"
+HOMEPAGE="https://github.com/lscardoso/gr-ntsc-rc"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/lscardoso/gr-ntsc-rc.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/lscardoso/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	>=net-wireless/gnuradio-3.7.0:="
+
+DEPEND="${RDEPEND}
+	dev-libs/boost:="
+
+src_install() {
+	cmake-utils_src_install
+	dodir /usr/share/doc/${PF}
+	mv "${ED}"/usr/share/doc/gr-NTSC/* "${ED}/usr/share/doc/${PF}"
+	rm -rf "${ED}"/usr/share/doc/gr-NTSC
+}
diff --git a/net-wireless/gr-ntsc-rc/metadata.xml b/net-wireless/gr-ntsc-rc/metadata.xml
new file mode 100644
index 000000000000..52c0f7d49939
--- /dev/null
+++ b/net-wireless/gr-ntsc-rc/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">lscardoso/gr-ntsc-rc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/gr-ntsc/Manifest b/net-wireless/gr-ntsc/Manifest
new file mode 100644
index 000000000000..b745c0deec47
--- /dev/null
+++ b/net-wireless/gr-ntsc/Manifest
@@ -0,0 +1,2 @@
+EBUILD gr-ntsc-9999.ebuild 840 BLAKE2B a27e6d526814c4fbde07c81686e74f83ad1b70dc11be82ee960dac53f8944fd5ecc7254238ec92a0f8756cbbe89db83c671c7121c25ea0c0d8e62e926012efae SHA512 13a79107f938c6e70023ee2f798a65ecc185b0fce713228957b96b9e89245462653e5118fbe6e264cbeb6267572aa0e8a8b0a0627bac044e09176e8911cb72cc
+MISC metadata.xml 421 BLAKE2B 71d536c4fa8989dcccfb7c7e6b22ed6b83883f63eacaab51b501cf62956b8582e7805d47d43676a503236a4178c34d9ca6e7f39b0c4e8292a94865a395315204 SHA512 f278ce7ed1090b98382067bb1a7aaf48bfc8663aaf8c60a75e52e6c751346e4d31e7c7e689aab995a8ac8dd0550aa4e15f83e0d26db3b97e238735f6b2664aa2
diff --git a/net-wireless/gr-ntsc/gr-ntsc-9999.ebuild b/net-wireless/gr-ntsc/gr-ntsc-9999.ebuild
new file mode 100644
index 000000000000..e29ef7932782
--- /dev/null
+++ b/net-wireless/gr-ntsc/gr-ntsc-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="RTL2832U NTSC viewer"
+HOMEPAGE="https://github.com/kik/sdr-tv"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/kik/sdr-tv.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/kik/sdr-tv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	>=net-wireless/gnuradio-3.7.0:="
+
+DEPEND="${RDEPEND}
+	dev-libs/boost:="
+
+S="${WORKDIR}/${PF}/gr-ntsc"
+
+src_install() {
+	cmake-utils_src_install
+	dodir /usr/share/doc/${PF}
+	mv "${ED}"/usr/share/doc/gr-ntsc/* "${ED}/usr/share/doc/${PF}"
+	rm -rf "${ED}"/usr/share/doc/gr-ntsc
+}
diff --git a/net-wireless/gr-ntsc/metadata.xml b/net-wireless/gr-ntsc/metadata.xml
new file mode 100644
index 000000000000..57a10860975c
--- /dev/null
+++ b/net-wireless/gr-ntsc/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">kik/sdr-tv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/gr-ppm-wiegand/Manifest b/net-wireless/gr-ppm-wiegand/Manifest
new file mode 100644
index 000000000000..d46f5bed5dd4
--- /dev/null
+++ b/net-wireless/gr-ppm-wiegand/Manifest
@@ -0,0 +1,2 @@
+EBUILD gr-ppm-wiegand-9999.ebuild 1003 BLAKE2B b12a8730c7e5af19356347458c671fb912681371e8b25e3e0b0e55974f1dd5172b88f1718f24772340d394f8ad2b56cc4a540ce69d77c4d182a79f5fd0f01207 SHA512 72f7abf29e845b3c8ef13f9602c7f03124871a13c1a8d68416cfde3efc8311fb718aa9df09cc9d6a5370e58bf57d51c5c2a8fb8d69469143ae28fd51de69cf66
+MISC metadata.xml 433 BLAKE2B d35d74676208c0b6bd50a880912d7bb312424b305252bc986a9b384d9adfbf9a1dee32ff5b34451467b4c62e06cf6ec217a829eecf738c372661ec4ea34cdbf2 SHA512 44eb1c132d221835916d15dc141e9a04651e5648cdfcb7f09fa2f698d547fd2155407a55a751d0b59b049cc1dbfabef29ac73493357f57980f1dc50669154094
diff --git a/net-wireless/gr-ppm-wiegand/gr-ppm-wiegand-9999.ebuild b/net-wireless/gr-ppm-wiegand/gr-ppm-wiegand-9999.ebuild
new file mode 100644
index 000000000000..6807b68ba670
--- /dev/null
+++ b/net-wireless/gr-ppm-wiegand/gr-ppm-wiegand-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GnuRadio PPM (Differential Pulse Position Modulation/Demodulation) plugin"
+HOMEPAGE="https://github.com/redsand/gr-ppm-wiegand"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/redsand/gr-ppm-wiegand.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/redsand/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	>=net-wireless/gnuradio-3.7.0:="
+
+DEPEND="${RDEPEND}
+	dev-libs/boost:=
+	dev-util/cppunit"
+
+src_configure() {
+	#not supported by upstream...yet
+	mycmakeargs=(
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install(){
+	default
+	dodir "/usr/share/doc/${PF}"
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}"
+}
diff --git a/net-wireless/gr-ppm-wiegand/metadata.xml b/net-wireless/gr-ppm-wiegand/metadata.xml
new file mode 100644
index 000000000000..4c5cd62965d6
--- /dev/null
+++ b/net-wireless/gr-ppm-wiegand/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">redsand/gr-ppm-wiegand</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/irda-utils/Manifest b/net-wireless/irda-utils/Manifest
index 9c6229eb3203..44af97c72db5 100644
--- a/net-wireless/irda-utils/Manifest
+++ b/net-wireless/irda-utils/Manifest
@@ -14,5 +14,5 @@ AUX irda.initd 1885 BLAKE2B abc9b3e48dc2e402e84223754b0c9a11d8b4c66a56ae21322c19
 AUX irda.modsd 1976 BLAKE2B 5e93a3307938c4031b6aca766f4a0dc4393ec1e9c6bca4d04204da78842608c58302af1a33949736a13d58e9625c644bd27db78971f545c3c075b4ebe3414a9b SHA512 b71eae4742ab0656ce45d570de6a461bddb7f547847efa887f2420cdfa809b2548aab61c49b50fc713ab9f3537cbae07c62938ebfb3092dadd6dda0b267258d2
 AUX irda.rules 683 BLAKE2B d8ca8f8348e05d1959bb34c85c3633b62821b65ee8b5e1c7dce2adf5866ef415ee7ae2e12780481543f0ea916fc0576c42f13b5b9d70e68e0b2edd2c13973cc2 SHA512 d73aaa394447191d782661ee2a3f9333aa46838721958959d7732265a1608482a431c6b83218b68ac45ccbeafe96d95d9ec616d423f91aa6dc858f5709b0f0dd
 DIST irda-utils-0.9.18.tar.gz 168390 BLAKE2B 4e0c2acbbb15bf01ff22f21e82db1341780dac1d7c76641fa7d0d85d87240c0e0ff08c6f5b1204a7a3b8b306f7cb297922fe512555df998cbd25648057d1d3f7 SHA512 493360b5c03f93063265663b86c8ef3ade714c51edf804390c4e713cb0aeea204c5cd06c8ceffb99b1531fca7272422e53d52e03b66ddc4bceb5503f4ab5f3ad
-EBUILD irda-utils-0.9.18-r6.ebuild 2916 BLAKE2B e03c88f37cae40428b741c1e89fd335d2150a6122165a890c3b568b75304451464cc25f678d5dc9ec2394469b20e4abcfb940b7b4472dc169bdc7d2a62ff4d9d SHA512 d93df9bd596f13504026beb4bdd171223cecc47e75c97d3dee48a447c8a4f3b69f65edd0230cfb6802783b8e0feae93d8045ccc9a4b418061912e41393490394
+EBUILD irda-utils-0.9.18-r6.ebuild 2912 BLAKE2B 3bf92475f373397a687f4647a749b6352768bc4dac74e5e58f6d4466036a0f3e3f522dec9496a5d6132cfbdddca293b716d54aff8289c4fd2a29111cb785f8ca SHA512 996779c9e07c037c66b8c8737807f134bbc931cc9a5fb272b9beb3755d0612dd0170425d15ee811f388f3cb82acf06f89c4d1c50f4748c39770fc6a62b4839cb
 MISC metadata.xml 241 BLAKE2B 9f6106c86c25e10eb3572c46ba9b2664dfc20a0c85e3111fc4334cf5f838731c4b13c7268d4f81e02cd18b957de78f91a01f6ce77a21a5545e083389829ef398 SHA512 8ee0154954d4a045299b6b948a8fa6fcd63e6457dd675837f38935b31adb868d8519aea90d7fb0f7bcfa6024d194abcfbf0c542626ff222252796956f8eef654
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild
index 306110bc82c0..352f6fc20206 100644
--- a/net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sh x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE=""
 
 RDEPEND="
@@ -53,7 +53,7 @@ src_prepare() {
 		-e "/^LD/s:ld:$(tc-getLD):" \
 		-e "/^AR/s:ar:$(tc-getAR):" \
 		-e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile || die
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" Makefile */Makefile || die
 
 	# fix compile when pciutils is compiled with USE=zlib (Bug 200295)
 	sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile || die
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index d355f1a47892..9912f93db988 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,10 +1,9 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
-DIST iwd-1.4.tar.xz 830548 BLAKE2B 2d03767a5308c72206aefbafce39a241e353c1ef8751758d0a336a7ad5b86ef02062da037db423b805810eb45a9467628cd241682a63835b63e3ea920f39ace9 SHA512 3b06fa24666e7cf37353d95d0e9abc41b8be921ae7313c014f20f704fe7919d154d6a5441c6d87d4cd08ee65e15218ec01f4ff4aafc7e4a358faf3ca4a6dcb18
 DIST iwd-1.5.tar.xz 834688 BLAKE2B b3d585963c93954e4038dd85e5d57b60d8baaa7028edb79b54d8650a400a149666140f6ba438ccccb5be2d67fc7b842f6272b5efc61d75a7d4dae333410625bb SHA512 55017941f2e100d644864d2ed0528c67a486da6ba2bf7782e9df019727ce0af53cdff37c53f6625e536aa756387dd4e0d20a169710da8c3ce00f615040c9da32
-EBUILD iwd-1.4-r1.ebuild 4219 BLAKE2B 36f70ad55bc4c2832fcb182999f26ab236ef852c31292c0943d7efb880bb5f8616ba38a84ce47c973c562111d116f2d68c0f55a55c563c7bb44fb3ab5b8ed575 SHA512 af3820df6cbd44468e4f5a109e051cbfdcfd0b05e6666958f5c906963a40a4b27a3e3b0cb5beb0b64b9716e26becd26d430bad75417bf49b688d2f81ad7539ff
-EBUILD iwd-1.4.ebuild 4211 BLAKE2B 81bb8365ba4b39878b9c4531e1c927ef4a068d9a6d6de9bf40180202c5cc6f75b88cbc8c54da1bf95cb19160def27148385302203ac6a7695ac0ba2da45487aa SHA512 a3f380e75083e90fcdc3510ae779da7392c7e4c11d7a378af567cf97066b93bc028141ae03dc8a9b85f0cf254409288b09ebe3f9c2d54912387bf63ca0c703d4
-EBUILD iwd-1.5.ebuild 4219 BLAKE2B 624c40476f2fd5847e8a4ec81956339c1bff2604effb993c924fb8d6505caddac226c31b07f20afd3a5ce9876359bd40adfe16731bcfa8ac525bdac4da889c00 SHA512 4a351309df1a0df69f131d0773a97842141fadc5a575dd1c071306f8edba9763b58f3f696a7b26b7afab3b14ebf115f518503b8fe147fc1a9943b6cf08441b22
-EBUILD iwd-9999.ebuild 4203 BLAKE2B a3804e0c45f950489b07e6c4a710f3722148287314539b33887f9b39c87510b27a3632a57b6dd419b7a4dbf575b1d137b64c9506b72508dee09851ef3c63a987 SHA512 87e22d525b0cc8288d28dbc0429cd5588a341ba3a18f4450afe382d3f0cd46a39e92dd913d39d5772438e21c879906f5a51a1a3e44cdcd1f1765880c9100c6cb
+DIST iwd-1.6.tar.xz 844900 BLAKE2B 97d7162da88f550383ce9b3348b18e4e2e241242d7bf1eb99a904ca496afb8db287bcb426942246824e71a68127c38cf947b7f427f845eee2aa9ba6b4caa184c SHA512 79541672d55078daff0809841f99862ac538174aba8d9b0fb356cfa0b7e025538d9a84f79c35d2ef93114d8476273c3c72890f59cbee807b2bd0b85c0f4b9b55
+EBUILD iwd-1.5.ebuild 4213 BLAKE2B afe140abb9952750957c147736baa5b23d085e6899a03a814719fcddce419ddda4d76138e79641346c0d71ed2b70c4b4fb3b07cfe768a3beadff435171d28d88 SHA512 b580d7c67914ad4b0a1e99977358d7ccaacc854984c4c066f2bfb23bb54a8b011ff9ea500a5748d78b0ccd5ef658d55051c6a899cb6b0f172badf712e031bc96
+EBUILD iwd-1.6.ebuild 4230 BLAKE2B 209a21ab5524456d539af9164a986a25f367c0b2e380fc98cd88017ebac0f34369832259919afea695b34a9b39e04b637ea3584e78cb60f3b71c9e7dc5a9c073 SHA512 a1a99b605f0393828cea5077b6d4f2babb637e2028b2f41c7e809bb2ed86ec2c4a8e3c9c29e2dff39d9e72af3a258d9e24c723df41a0932b0d50ce0a8be207bc
+EBUILD iwd-9999.ebuild 4226 BLAKE2B 396a48b9a0d28480daab3d22595f68bc9e41e5eb8945b9eb5ca5bfbe8867bef8541f7943fbb800992682b937a582ddc290fe86437bb6677a6f5aec076415855f SHA512 b389c697cba8a17183499239d539b9785ee0f390ad84024eca904afc95650b127eddc27242706c1890bd81f7655e958d41bb9dbfc8c364ba522838d7a59e0efe
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/iwd-1.4.ebuild b/net-wireless/iwd/iwd-1.4.ebuild
deleted file mode 100644
index 703fc3c680d5..000000000000
--- a/net-wireless/iwd/iwd-1.4.ebuild
+++ /dev/null
@@ -1,153 +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.27"
-
-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
-		~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" 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.5.ebuild
index b2e8a422b118..a6496aa4cc37 100644
--- a/net-wireless/iwd/iwd-1.5.ebuild
+++ b/net-wireless/iwd/iwd-1.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-1.4-r1.ebuild b/net-wireless/iwd/iwd-1.6.ebuild
index 74fdff31c597..256d210e2560 100644
--- a/net-wireless/iwd/iwd-1.4-r1.ebuild
+++ b/net-wireless/iwd/iwd-1.6.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.27"
+ELL_REQ="0.30"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -26,7 +26,7 @@ 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}"
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
 
 RDEPEND="${COMMON_DEPEND}
 	net-wireless/wireless-regdb
@@ -59,6 +59,7 @@ pkg_pretend() {
 		~CRYPTO_USER_API_SKCIPHER
 		~KEY_DH_OPERATIONS
 		~PKCS7_MESSAGE_PARSER
+		~RFKILL
 		~X509_CERTIFICATE_PARSER
 	"
 	if use crda;then
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index d27e39a56fe7..01699edb1c5b 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
@@ -26,7 +26,7 @@ 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}"
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
 
 RDEPEND="${COMMON_DEPEND}
 	net-wireless/wireless-regdb
@@ -59,6 +59,7 @@ pkg_pretend() {
 		~CRYPTO_USER_API_SKCIPHER
 		~KEY_DH_OPERATIONS
 		~PKCS7_MESSAGE_PARSER
+		~RFKILL
 		~X509_CERTIFICATE_PARSER
 	"
 	if use crda;then
diff --git a/net-wireless/jackit/Manifest b/net-wireless/jackit/Manifest
index db975c793a60..6db99eec27a1 100644
--- a/net-wireless/jackit/Manifest
+++ b/net-wireless/jackit/Manifest
@@ -1,3 +1,3 @@
 DIST jackit-0.0_p20170918.tar.gz 19104 BLAKE2B 57ba557e8ce0e10af68ed5445dc13ac51661ecd8b7dae7093643968b82d90a3ce3844571b4d84d3355a143382624af1fa16ff6d2432d07a4edc7ed9fd8a4b1fa SHA512 15e11594adf1f95e8b547ca1da9d44d93e263fa8b289a23413492bb9a991fdfc0d20d633c5ba66a9a254f12ad7301793f8456bd9197e1ad4207e5a2dd109babd
-EBUILD jackit-0.0_p20170918.ebuild 670 BLAKE2B 73baf8e389510153bafa9f9bc587c27d9eccd48b89ecb32c73cfa38a71bd86d40d208fdd2eae748cb15bfe9854493b98dabb28b4887fc2a153176fc319805d3d SHA512 8dcfc26fa4604ff196d9108593b31d45435a570970f643dac067bade4f481de30fff171d417125da5d4209f08b7e3a1c23bbf381d96274d5325456e78cb4bd87
+EBUILD jackit-0.0_p20170918-r1.ebuild 674 BLAKE2B d616ebf971b31d66b60498b2a6f2ef198190b98609445b0c5071628c9041b085e843d52c6f6cbac17692d07be71b291659daf7fd29462cd6b560e9b680ececc3 SHA512 1d25c3d45f0a5eee1a0d7e36feb979da46ac60246ac11a3dcf0afb4381d18744c46b1e6b49b8345d5bb95d0c657a672b0f32c50351b7276f1abef11bfdf2bd82
 MISC metadata.xml 347 BLAKE2B eb39ba237c6c887ba3ad252447e758af07bd54dad54213350f1db3f1dcda41fbc0e706604e86a4d99344b290c79df24d7908c153b2029b9a686c6a6af3cbc12c SHA512 75f028b7eb6bc20c2b9b401c1bf29a32b9c51aa4ec247e1d9effc8a658237d8932748c14cdb11014eb8a11c30fa0b8199830023294b33f38fe10e16e3a463af8
diff --git a/net-wireless/jackit/jackit-0.0_p20170918.ebuild b/net-wireless/jackit/jackit-0.0_p20170918-r1.ebuild
index 1e408e119d87..7e9ea21cbd7c 100644
--- a/net-wireless/jackit/jackit-0.0_p20170918.ebuild
+++ b/net-wireless/jackit/jackit-0.0_p20170918-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Exploit Code for Mousejack"
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index f957c47846ac..cd92f8304ce4 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -7,8 +7,10 @@ AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88
 DIST kismet-2019-12-R2.tar.xz 3127064 BLAKE2B b7ffac6a6a4d7d7893d3564f9471080e055798c325b102f98fa0e86db37bcbab33422afae9c2694b747ae0c369259b62c218a77c673d0e0c05969a56e42311c2 SHA512 b1e3de74a6d314150d849ac3d95c8b99324bba14522dc4f00244d1c09acb690cce40d35dbe33845ffb1060a69cd38f036d59a0283ed9b1a70b022e3d57cde5a0
+DIST kismet-2020.03.1_p20200314.tar.gz 4237221 BLAKE2B a35a511d5b3a331a409c800fc3163f35bb539b128a0393db6dd9e88e0f9b19a982222ad5e0f3f123cb1c12828f33a045bf483bec6d393cd8815e63410501678d SHA512 0849fb2b3255a20de16a9dd5f13971ac24ecff7b71ec4f2376df9da9328b024cf51ababdb689441bb3b2e4fbc23c077ea100459dfd5bddae8df3c2d9c3df5ae5
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
 EBUILD kismet-2019.09.1-r2.ebuild 4702 BLAKE2B 5ab2650fda3f9c669eb02d81e11c89a376e4704c46f1ad9b9a0b491c5accf56811edaea7fd4021ee23ee171207203c082e132a441ab147bc79dcea43e1ce5bb7 SHA512 4ea2cffec42a04b0e0588cc0a37f52b898b9dd81d5a72d17d13ec8b1eebaa1eea9d6d807de1bb1a1ebc345e264b9e7dfd1b77463fdf884631199e4d4c600225d
 EBUILD kismet-2019.12.2-r1.ebuild 4919 BLAKE2B b64aa866a750583e867308e5eb53aad49c4c897f13cd36c2d92e9881b1a1196dade4ce87968db86d0ed5cf6fc9e636917bb46830fe991ffee1936660680aff2c SHA512 ffa77d9843091abf23bf9789243567eb369d9cf3e505237647e7a4cef2b34025df243272f7ebf45445e4a908d6126b563442ca2ec5b5c8d0cc6d6daae46debd8
-EBUILD kismet-9999.ebuild 4919 BLAKE2B b64aa866a750583e867308e5eb53aad49c4c897f13cd36c2d92e9881b1a1196dade4ce87968db86d0ed5cf6fc9e636917bb46830fe991ffee1936660680aff2c SHA512 ffa77d9843091abf23bf9789243567eb369d9cf3e505237647e7a4cef2b34025df243272f7ebf45445e4a908d6126b563442ca2ec5b5c8d0cc6d6daae46debd8
+EBUILD kismet-2020.03.1_p20200314.ebuild 4982 BLAKE2B 75dd1e270f7b7d82152b34d5cc6b6e7b3efec792d6ae55a80240e751ea79b556f50fb97adc0b9caf48f9ce739186a21c951b3d1c7a675b622bc6e01a90ca4308 SHA512 30449661a01057083f0b5f9fe082ed799643e39871f65168a2dfebfdfd9c809c298cc8e5c5a2ad9f838babf7af7bdaa64c2334e1ca7d72c9afac80eb1cd57929
+EBUILD kismet-9999.ebuild 4984 BLAKE2B 375fb59e8dbc7884fb73c44137ec31041b091f8a450795309b6f5db63a3746e41471a73bb6818afdeb9956ccb5670fc8c2782e1ac6f93c254a85a4f3caef2e32 SHA512 59d5ef75637be6ebdbc15c9c69e9a7b8f2fd1298a2d01910cc478c7d370688fa1ffdad9a4e1d9a45dc00e9f0e7ca38f95739820383a71e4919ea66268e74a9f2
 MISC metadata.xml 1545 BLAKE2B c1b1fe5d6f61ca1141bf0bec03e7f416a0c7e8ec2b15aaaefe0cfc763af9c385e791747eeaf6c3d0b83594acbb528e0c6ef4abfcb348edd027d77a5ef720fa83 SHA512 49e887edfcde73eea51e96dad9c648f70f59524fc0e3f6567aeff116bf33ad7b9e57f4e8dcdfd02b0fef524a101f172bf1035437a6138376b0a41f1e8e60af32
diff --git a/net-wireless/kismet/kismet-2020.03.1_p20200314.ebuild b/net-wireless/kismet/kismet-2020.03.1_p20200314.ebuild
new file mode 100644
index 000000000000..67722300d5e2
--- /dev/null
+++ b/net-wireless/kismet/kismet-2020.03.1_p20200314.ebuild
@@ -0,0 +1,176 @@
+# 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 autotools eutils multilib user python-single-r1 udev
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
+	inherit git-r3
+	RESTRICT="strip"
+else
+	MY_P=${P/\./-}
+	MY_P=${MY_P/_beta/-BETA}
+	MY_P=${MY_P/./-R}
+	S=${WORKDIR}/${MY_P/BETA/beta}
+
+	#normally we want an official release
+	#SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+
+	#but sometimes we want a git commit
+	COMMIT="ea3f9ffe84b86cfc5e01ce3fec5476d51d161b98"
+	SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+fi
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="https://www.kismetwireless.net"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	networkmanager? ( net-misc/networkmanager:= )
+	dev-libs/glib:=
+	dev-libs/elfutils:=
+	sys-libs/zlib:=
+	dev-db/sqlite:=
+	net-libs/libmicrohttpd
+	kernel_linux? ( sys-libs/libcap
+			dev-libs/libnl:3
+			net-libs/libpcap
+			)
+	libusb? ( virtual/libusb:1 )
+	dev-libs/protobuf-c:=
+	dev-libs/protobuf:=
+	$(python_gen_cond_dep '
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-libs/ncurses:=
+	lm-sensors? ( sys-apps/lm-sensors )
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	ubertooth? ( net-wireless/ubertooth:= )
+	"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+	')
+	selinux? ( sec-policy/selinux-kismet )
+"
+PDEPEND="
+	rtlsdr? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+		net-wireless/rtl-sdr
+	)"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet_logging.conf || die
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
+
+	eapply_user
+
+	#just use set to fix setup.py
+	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+
+	if [ "${PV}" = "9999" ]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable libusb libusb) \
+		$(use_enable pcre) \
+		$(use_enable lm-sensors lmsensors) \
+		$(use_enable networkmanager libnm) \
+		$(use_enable ubertooth) \
+		--sysconfdir=/etc/kismet \
+		--disable-optimization
+}
+
+src_install() {
+	emake DESTDIR="${D}" commoninstall
+	python_optimize
+	emake DESTDIR="${D}" forceconfigs
+	use udev && udev_dorules packaging/udev/*.rules
+
+	insinto /usr/share/${PN}
+	doins Makefile.inc
+
+	dodoc CHANGELOG README*
+	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
+	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
+}
+
+pkg_preinst() {
+	if use suid; then
+		enewgroup kismet
+		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
+		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
+		fowners root:kismet /usr/bin/kismet_cap_pcapfile
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
+		fperms 4550 /usr/bin/kismet_cap_linux_wifi
+		fperms 4550 /usr/bin/kismet_cap_pcapfile
+		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
+}
+
+migrate_config() {
+	einfo "Kismet Configuration files are now read from /etc/kismet/"
+	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
+		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+	fi
+	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 2019.07.2 ; then
+				migrate_config
+				break
+			fi
+			if ver_test ${v} -eq 9999 ; then
+				migrate_config
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 73b8a86810b3..f55bc6dc159c 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools eutils multilib user python-single-r1
+inherit autotools eutils multilib user python-single-r1 udev
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
 
 	#but sometimes we want a git commit
-	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+	#COMMIT="9ca7e469cf115469f392db7436816151867e1654"
 	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-${COMMIT}"
 
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth"
+IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="
@@ -113,6 +113,7 @@ src_install() {
 	emake DESTDIR="${D}" commoninstall
 	python_optimize
 	emake DESTDIR="${D}" forceconfigs
+	use udev && udev_dorules packaging/udev/*.rules
 
 	insinto /usr/share/${PN}
 	doins Makefile.inc
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index 3ccd32a55e79..ef3d088d140a 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,4 +1,4 @@
-DIST nanovna-saver-0.1.5.tar.gz 96346 BLAKE2B e3ae93df4c732f27dc7781068b6fba3abda81b84b1663953ddf5cbc043e45c273ccc1f25c81f0c02180ebfad8e0cd0d65411fc75f2c7124cfeed8b7ff0b71aff SHA512 cb230f17f45bff77bb60700e5a32d8fd577cfa2603a3bde03dbdebd20bc0c5c2acc1546560a08d0cb3c1abce5e7e6aef067e3805d5ec09e70aefb9e1a1f3a164
-EBUILD nanovna-saver-0.1.5.ebuild 713 BLAKE2B c1f93aac370127d2674fe24199416559e1d1753af4a50385ab45dd0e181c9317f30bbec4041a574ab1c93eb05bdaf9c45c05d1e2415653d2c93012ed4684ddbf SHA512 dedfad56370e346869ef44ecad4ccc7a3ba947f383026ba77d55a88c8055751141bf296ba2f016314db866dfd355c0e5d3fde8e7c1bf13635187eb42d7a28f06
-EBUILD nanovna-saver-9999.ebuild 713 BLAKE2B c1f93aac370127d2674fe24199416559e1d1753af4a50385ab45dd0e181c9317f30bbec4041a574ab1c93eb05bdaf9c45c05d1e2415653d2c93012ed4684ddbf SHA512 dedfad56370e346869ef44ecad4ccc7a3ba947f383026ba77d55a88c8055751141bf296ba2f016314db866dfd355c0e5d3fde8e7c1bf13635187eb42d7a28f06
+DIST nanovna-saver-0.2.2.tar.gz 178819 BLAKE2B 97949c0b77f6fa122f4f1d446fe10b9d2aee8be37d6d1d47fcfe95db978e70886b110932c820bc248491cc68014c5ee5f76bea33a7b3e971ca8f9fbaaa323217 SHA512 fe1d23103472bccf804b4b0c0df6cc8ec2a782cf442214358c1bd1895c185f472701656bd9ffacf3bbf0b24ee964f8c58a103570cd8c80adbd0126a7113ccb5c
+EBUILD nanovna-saver-0.2.2.ebuild 827 BLAKE2B 52f62df193b7891c75e35e242f490c9a28e8cb1b3b52516b14aac86626f6f8900f0089026c570106470cffb61ec022ae7b905ece0b251b48b69a5647cc50bab3 SHA512 2c8b79e43b6c9ca8e06e4db1f81893cee9769d4ba7cb92c3e19b84f523074cba2f285129a548372d1991f8ae14ecc914bfe0f9f75f5a5b1f0978e4596ed75153
+EBUILD nanovna-saver-9999.ebuild 827 BLAKE2B 52f62df193b7891c75e35e242f490c9a28e8cb1b3b52516b14aac86626f6f8900f0089026c570106470cffb61ec022ae7b905ece0b251b48b69a5647cc50bab3 SHA512 2c8b79e43b6c9ca8e06e4db1f81893cee9769d4ba7cb92c3e19b84f523074cba2f285129a548372d1991f8ae14ecc914bfe0f9f75f5a5b1f0978e4596ed75153
 MISC metadata.xml 432 BLAKE2B a8869193d052dd0ec1fcae10641b19f61fe2faa2bfde6e60f9758b4da9620a316e9b318d11c778fcb0c1de1a2537f98587a8ec928bb814ae53b0160deef18be7 SHA512 0727e758f3cfd75ee8b54ac05636228fe6422ae5b8a0b0eb37f475abc075d30765b3452a05c9e99c56b8a25c378bebfce69462906910c86254f586203640dffe
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.2.2.ebuild
index eeb9302e2479..b0585e449aea 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.2.2.ebuild
@@ -26,3 +26,8 @@ RDEPEND="${DEPEND}
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 BDEPEND=""
+
+src_prepare(){
+	sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
+	distutils-r1_src_prepare
+}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index eeb9302e2479..b0585e449aea 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -26,3 +26,8 @@ RDEPEND="${DEPEND}
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 BDEPEND=""
+
+src_prepare(){
+	sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
+	distutils-r1_src_prepare
+}
diff --git a/net-wireless/python-wifi/Manifest b/net-wireless/python-wifi/Manifest
index 1e76e1bb8370..59130fac5d29 100644
--- a/net-wireless/python-wifi/Manifest
+++ b/net-wireless/python-wifi/Manifest
@@ -1,3 +1,3 @@
 DIST python-wifi-0.5.0.tar.bz2 69113 BLAKE2B fe2a6693ca22a963c5149991693ea72e58542ea0c9622573f0f6ad7194d50daa09fe52e8f349224a2131bf2a8fbe0ee9538e17d5413fefe574e60ee9416aa345 SHA512 cbbb337b20f60bb28597dc6e3c90b8d20ddee9512cf000ca0107eb01d2bfde1b3047458d1a3f4dc4b9836ae283cbc24792ffb95c4747027896cd6e50a72151d8
-EBUILD python-wifi-0.5.0-r3.ebuild 841 BLAKE2B 142ce70978d7443568a088110e5131a079cd0e17e2796eb2f146bff0041a9dc8cab87c935909afe5cd59c992fbd814509c088c2c0f63abaf3c4beafc8f5fa960 SHA512 06e8feca90a4bfb958bf2447aa98bb99b32b60e5bf7287c399794e0317ef54a43fcb88b8e38e23de3385c972aa0ab53a00a20a439b8ccbcaa0eaf4818dc2777c
+EBUILD python-wifi-0.5.0-r3.ebuild 842 BLAKE2B 8882fc4fc795597352752180527554165e93c36321479b6c2d12030d1726078243d832387c881a7fc8c4cde7a59400c97ac58ff0836a95bb4239c2c04036bfba SHA512 ae8aaacead6a43a32057814d7d498b70414deb3f4d8ef46b48f160ac9a8f270bde296ef4d0066bdbefd8500858d7191a4a14d2c670737e26235465daac6a463f
 MISC metadata.xml 329 BLAKE2B 9bb66e4d52b4b290c05ef91d15cdef7ae45d46da08311d825b9c33f8fded2106be79edd68e32a44d6399dae763204220dc60c6348f440fd8dd30fc9163c91e4f SHA512 254d847c410e8ab8f3822a03f7689245ca47e5682c73f60ca40a2e2a81ca661421c0db040332dcc6800d942d4904d2e2ca7e234b5eda1b257a358f2236258978
diff --git a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
index 139f1aa9d1c3..16cb7625f40f 100644
--- a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
+++ b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/python-wifi/"
 SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 LICENSE="LGPL-2.1 examples? ( GPL-2 )"
 IUSE="examples"
 
diff --git a/net-wireless/tempestsdr/Manifest b/net-wireless/tempestsdr/Manifest
index 26cc8d3c9029..9e11f240150c 100644
--- a/net-wireless/tempestsdr/Manifest
+++ b/net-wireless/tempestsdr/Manifest
@@ -1,4 +1,4 @@
-DIST 93c238725bdcf2f50c8a1d3789cf56e90f7bab7f.tar.gz 67322675 BLAKE2B 6ad4b5c4a32e70e7336d1bcac9f9c3e0dd1bdc0ca42e67bef20e9f31475e127f212d3558e20d275e18651cef018c134e233c5b8c0c9e85e558414e2c15993ac6 SHA512 2f29ad22d8ae2e71cdd359e066989928576a7e8c0ff344833445843df4cdb343ae1d6336810595fe720cb3d56867c8c17d8776dcb3bfda02eb53b85c9c930ef1
-EBUILD tempestsdr-0.0_p20200221.ebuild 1025 BLAKE2B 91b2fb3ab58e6bdb0a3676a887720b3b9ea43f69ccc90f8650a50b7c63c2f236b088535d71dcc21ebdee9bb936fa686f28210aeca6342d24df1cf9596d51ee66 SHA512 d013392382866a8afe3ea13a14002e3850d57776485d17f1edae6da8572fba899ee5b1ed09c08fdce30cc6c60047ed77675cca95179ce6bcc03abf6c27e08604
-EBUILD tempestsdr-9999.ebuild 1025 BLAKE2B 91b2fb3ab58e6bdb0a3676a887720b3b9ea43f69ccc90f8650a50b7c63c2f236b088535d71dcc21ebdee9bb936fa686f28210aeca6342d24df1cf9596d51ee66 SHA512 d013392382866a8afe3ea13a14002e3850d57776485d17f1edae6da8572fba899ee5b1ed09c08fdce30cc6c60047ed77675cca95179ce6bcc03abf6c27e08604
+DIST tempestsdr-0.0_p20200221.tar.gz 67322675 BLAKE2B 6ad4b5c4a32e70e7336d1bcac9f9c3e0dd1bdc0ca42e67bef20e9f31475e127f212d3558e20d275e18651cef018c134e233c5b8c0c9e85e558414e2c15993ac6 SHA512 2f29ad22d8ae2e71cdd359e066989928576a7e8c0ff344833445843df4cdb343ae1d6336810595fe720cb3d56867c8c17d8776dcb3bfda02eb53b85c9c930ef1
+EBUILD tempestsdr-0.0_p20200221.ebuild 1040 BLAKE2B 386f9d3c0b9099647931e8d4d9985a809f00759eec3495a4f1ecb9ba4f1b96e8ac4b199e11176143533b165984d03c256304f0b28abf17bffcf815afa0a49bd7 SHA512 9c07049c7d4ec958cc5447b53f3fda6590bb100284a6a4341bd10eaa15e8f78550e57d05065e0430865fb7f00696ed470b8914689e76f30feba60555d94a1882
+EBUILD tempestsdr-9999.ebuild 1040 BLAKE2B 386f9d3c0b9099647931e8d4d9985a809f00759eec3495a4f1ecb9ba4f1b96e8ac4b199e11176143533b165984d03c256304f0b28abf17bffcf815afa0a49bd7 SHA512 9c07049c7d4ec958cc5447b53f3fda6590bb100284a6a4341bd10eaa15e8f78550e57d05065e0430865fb7f00696ed470b8914689e76f30feba60555d94a1882
 MISC metadata.xml 220 BLAKE2B 46dd60edb9f6b8599815a6df1e5c833413abeb70008ac99b15b950b347fb6892dacab82b18b1be2637acaf61af1e6c32d82a031bff6f5c94da5d042455710fc3 SHA512 bce2f2527797db14ce1ebb3e56895c1cb583ba27a0cc713e7dedde863e7e3711f449b607748090ac21accd536147a16e80e5c9ec7472a795426f87469cdbabf9
diff --git a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221.ebuild b/net-wireless/tempestsdr/tempestsdr-0.0_p20200221.ebuild
index 94ad5e3071f5..7dfcb4cc7eb3 100644
--- a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221.ebuild
+++ b/net-wireless/tempestsdr/tempestsdr-0.0_p20200221.ebuild
@@ -16,7 +16,7 @@ if [ "${PV}" = "9999" ]; then
 else
 	KEYWORDS="~amd64 ~x86"
 	COMMIT="93c238725bdcf2f50c8a1d3789cf56e90f7bab7f"
-	SRC_URI="https://github.com/deltj/TempestSDR/archive/${COMMIT}.tar.gz"
+	SRC_URI="https://github.com/deltj/TempestSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/TempestSDR-${COMMIT}"
 fi
 IUSE=""
diff --git a/net-wireless/tempestsdr/tempestsdr-9999.ebuild b/net-wireless/tempestsdr/tempestsdr-9999.ebuild
index 94ad5e3071f5..7dfcb4cc7eb3 100644
--- a/net-wireless/tempestsdr/tempestsdr-9999.ebuild
+++ b/net-wireless/tempestsdr/tempestsdr-9999.ebuild
@@ -16,7 +16,7 @@ if [ "${PV}" = "9999" ]; then
 else
 	KEYWORDS="~amd64 ~x86"
 	COMMIT="93c238725bdcf2f50c8a1d3789cf56e90f7bab7f"
-	SRC_URI="https://github.com/deltj/TempestSDR/archive/${COMMIT}.tar.gz"
+	SRC_URI="https://github.com/deltj/TempestSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/TempestSDR-${COMMIT}"
 fi
 IUSE=""
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 2a7372f48d91..30413b10de47 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -24,5 +24,5 @@ EBUILD uhd-3.13.0.1.ebuild 3559 BLAKE2B 7f11665bda3d21539142bc9e76ea5b07063dada2
 EBUILD uhd-3.13.1.0.ebuild 3559 BLAKE2B 400f807fd8627dd8cc9545c1e180058f9d4a3475fe24730a5aac571a8759ebdb80cfac9ca09bf73556bc83812d7679fc6929788e5abb1d70cfb8947543391c24 SHA512 61845e49ea0002cc82e1a4bc0d30e174f3148cc3b8d2e08d88beb518484a782446476274f9170c4a7ab6563ee2cd4d452193fad8b79228108990cab957a8e25e
 EBUILD uhd-3.14.0.0.ebuild 3559 BLAKE2B 400f807fd8627dd8cc9545c1e180058f9d4a3475fe24730a5aac571a8759ebdb80cfac9ca09bf73556bc83812d7679fc6929788e5abb1d70cfb8947543391c24 SHA512 61845e49ea0002cc82e1a4bc0d30e174f3148cc3b8d2e08d88beb518484a782446476274f9170c4a7ab6563ee2cd4d452193fad8b79228108990cab957a8e25e
 EBUILD uhd-3.14.1.1.ebuild 3560 BLAKE2B c1726a482dddd447c3fd7489327df27c347d10e5645e16589a58269573dee36d607b1495e4af8600e95a2b9a26ac9c9bf42445df86d6e6f42a57cea36bd7364a SHA512 c8d99f46a12d8c47565163cabc66da914a56db3a4d61c71ea02e4686ffb719fa12465259c117bbd77449b297842ec6554635b436c5cb870ed926f1e29bc201c4
-EBUILD uhd-3.15.0.0.ebuild 3399 BLAKE2B 5feeb8f904ea3bca11e43eff040c9ca42f24e089199714a74b1f3f1acb30db82f8aa680c95ba35275419fe30d4ce0aa10dea16ebeadacddd8ea1c1d99ac948d1 SHA512 55cbca459b5ae0c12f7ecf00ffaec05ce7ffdc8b7aac405c53e2c8c027b6c2c7ff295cc4da557b60c3a93111bcbe8d885111af307cabff8afb86c57a279e7902
+EBUILD uhd-3.15.0.0-r1.ebuild 3869 BLAKE2B a9fa5020e023c1a216f9a7c719a0f81642bec090b932c55affbd87489b1c5fbe9366c8609d61665ff89b63c6ddcf456f14996019817e37d85feb27d378989c05 SHA512 767734c0377c2163238dbabfe16672ed6552d06e32068b215cede6ca38ce2f2332bbcc8b311be3f2ef7f1a9021ed9b15871a281a03a926ad2c106789a7932ab5
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/uhd-3.15.0.0.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
index c73dca778cdb..0bc67971a97c 100644
--- a/net-wireless/uhd/uhd-3.15.0.0.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
@@ -33,11 +33,20 @@ RDEPEND="${PYTHON_DEPS}
 	usb? ( virtual/libusb:1 )
 	dev-libs/boost:=
 	sys-libs/ncurses:0[tinfo]
+	$(python_gen_cond_dep '
+	|| (
+		dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	)
+	dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	dev-python/mako
+	$(python_gen_cond_dep '
+	dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')
 	app-arch/unzip
 	app-arch/gzip
 "
@@ -58,6 +67,9 @@ src_prepare() {
 
 	#this may not be needed in 3.4.3 and above, please verify
 	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+
+	#rpath is set for apple and no one else, just remove the conditional
+	sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die
 }
 
 src_configure() {
@@ -83,11 +95,14 @@ src_configure() {
 		-DENABLE_N230="$(usex n230)"
 		-DENABLE_MPMD="$(usex mpmd)"
 		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
+	python_optimize
 	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
 	if [ "${PV}" != "9999" ]; then
 		rm -rf "${ED}/usr/bin/uhd_images_downloader"
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 1bf0027d52d4..4b60745bc53e 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -6,12 +6,14 @@ DIST unifi-5.12.35.zip 114691419 BLAKE2B 0400f78cbc880f52e8e352a1b8ef925c293b5a5
 DIST unifi-5.12.46.zip 115612217 BLAKE2B 86facd4f21cf66091acfb4bfa5155188b30b1a33848ff0c24c393abf53f5efb114aca86b43b6040961fd9afe6ba1e1a42280f20f48c21772f884edd52b10b25c SHA512 05135f75bf6484810ff66b58452ea8bca1c4e47d5fa7a955bdf9653777f80a7fa355bdaa6586e3a0d98bdcf69cce4e28cf3d14cf8204b82591ba6a08307deef3
 DIST unifi-5.12.60.zip 117404012 BLAKE2B 2ef8fbbf3c6be963929678e1e563ec4e8716e385a61ae770fdf275d166a8b0db3bdbbd043a61bf9aca347a2383712733de5b80712f2ce9201772956f1e6fd2a1 SHA512 d6c172f69b13941fa1c6a69dc1a21111995a94f9a42024c8814cbda6e68796a2244a08e6acd00dc5af45b68164157d1cd5d04b343aeb4086cbd71b72c5af2904
 DIST unifi-5.12.66.zip 117434749 BLAKE2B 6d48632b7add5f3943574decb66aeb209c570151ee4f1c4dca10feeff924ba1946bc7bd1aae8ce36ac0a20ce2765da9953ded073086a82fd59ed08a57e30965d SHA512 138882bd7a67900ff47e5b02644a7e1941aef98d49ee6e56fa41b462ffd2e92e073e8064bfd846f2c369ef3491b3adc3032dd2ca9b8980058ca88d1925367ca0
+DIST unifi-5.13.10.zip 126198214 BLAKE2B 168baabd0523091ee41b75809c9bbe9941ea0dd9fa97807c826ad1be3afee868ac0932b5068ddcbfd8cfd9c6e3c7838c663c7b248e9cd21ea90cac59e99ed99d SHA512 08d4053201671380c152597ed6a795f593a03b67488d3d21c1f1320bc2ca980e9985e86e45eb6ef5582184c371a33eedbecfc867aac6c9129f653b84c1a87fcc
 DIST unifi-5.13.9.zip 117147673 BLAKE2B d05f0e6d0bdada8e1e02f78f99d59f02e259f9c6f6e78827a7288520e393e0811f37501004b3914f5df4ec2065728b28d5a9eb3a376d1f83b174ab7e07215bea SHA512 363b8019ba0854c289b2ec375739d0a86353fd876f3b59c7d8dd191da40866433e2222d98c1888d5d45a5def1209c1c0d7be733a71c3f5749c7b4def682d195e
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 EBUILD unifi-5.12.35.ebuild 1777 BLAKE2B 84159e527fa3a125543f3335bb8fb17ceac1634ce143ffc262a2caf5c6da27e452ce6adf999a205b187bad5623fdde25f97bd83f46dd93ee448fd83c84ed4f50 SHA512 a4324b8391a72d073fb67b629326683335bafa66c013483f689c95fdd59caf7e4c697f2ee74d63ea68075a7660dc5e4034f7569043cc80e147a0df3fa4717f87
 EBUILD unifi-5.12.46.ebuild 1789 BLAKE2B 977f4d7e280eae27045fbdd0507862166579c4d029b35a6c39de7091ca15000510604f175859709183686956456d4d90b6bcb4c43cbbba59fdad99f100791429 SHA512 8bd4ffa29ba3c36b2fc0d9555aa9b06844ecf6d5e6bc1ce187187616fea96ac7e580f015accc671eaef6dbe70031a8c29553e563d4332483761f0194fd68166d
 EBUILD unifi-5.12.60.ebuild 1789 BLAKE2B 6ed0184ca911a3ce1f3f043e683768c7df6a21a3a4b5781f49c903d3f750ec869ae5dbaaad3f44cbb7b5c13ad0d8be6a6fec6fdefa0ddf38a83d3b85f11937e1 SHA512 71d2dcb21db8e1105293c827add5d5af4444546b8bad180a858e2961623bf464fa4f583286978bb05904bfb250da49eedccea681eea6aba3fddb54fb07446cf1
 EBUILD unifi-5.12.66.ebuild 1789 BLAKE2B 512679ecfc4f0b438db8ff1f7049c4ec8da2d64ddc3e07c22997a96aacccac966452c972b37468e27249e777fe9963e8626034f4108c34d8588e5872480d15c0 SHA512 4b4c0cae00f63bb28a2bf0d800b9703b653ef7ca54c5fc224b8bb9daf5431ff59f50bcf7ed076f9aa73c6d552691122026d7ab616801c808141b9b25113869a2
+EBUILD unifi-5.13.10.ebuild 1789 BLAKE2B 4161583b6433dab461180e7e22538b0860196efa57e87f4fbe85a128c8b684058e98c579559869be72b97c4ad4eb5b555719e8c6ee4060959bd3b833e87e2ccf SHA512 51cb921e0ff5e2307e122fc113ea63df0e318dec8767a96b91269f2d68c7a399878447232a32dc9b4ee7c2cfe36a9b3e63a0fcdee7250d747bc5b64c6259e403
 EBUILD unifi-5.13.9.ebuild 1789 BLAKE2B a0cda416e4a6f95c35ab8ab296b70f15f9191011db5652cd1be5a1b8f1e142c4cd050f994625c500fddfc4491a2cfbcfe91677b6736178625b6914b3d3af5769 SHA512 2152629d311b8b98997c20e434f79e5fd49200a962def20c0cb631be45460baaff26193585a1cd4b5d3226a4679b0699c2acc7027c2a197242c0c53f26dfa7eb
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-5.13.10.ebuild b/net-wireless/unifi/unifi-5.13.10.ebuild
new file mode 100644
index 000000000000..800112ef51b8
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.13.10.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-202b4c03d0"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.13"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 05b4518b311d..07f73eb7ba3c 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,4 +1,4 @@
-DIST urh-2.8.3.tar.gz 13384590 BLAKE2B 00d256be04670883c92ab0fda772f90a2b9b2ed462fc254338a07c8e240f4febf3b95caca6b3f97e8ba21b56138e57ef77ae4630170a7579644e2200936a75a1 SHA512 a76f7ca0da20cb77149f32a764e29ae82417fb33a9d727ca5a05c52d4aafe58512acd0b180a329252a1ca8eb20e87ff182a88e72037b5b5e525a6d580e37aac5
-EBUILD urh-2.8.3-r1.ebuild 1279 BLAKE2B 71eedf2e43afee718b10e6314177f71a7ae14d764ca856f0e97ab6d0d1be3f3bf51b81c09ac1ab6269f6062dbe496297904251b697f953450c4ff7db29858164 SHA512 34a36ee4e79ba1718993026f70ebc69224918a0b798afdf7777d59cfd8ffea5487a8249cabbafd0fe3be2e416f724d9548f0dde03b386becbc07a8540b748a33
-EBUILD urh-9999.ebuild 1279 BLAKE2B 71eedf2e43afee718b10e6314177f71a7ae14d764ca856f0e97ab6d0d1be3f3bf51b81c09ac1ab6269f6062dbe496297904251b697f953450c4ff7db29858164 SHA512 34a36ee4e79ba1718993026f70ebc69224918a0b798afdf7777d59cfd8ffea5487a8249cabbafd0fe3be2e416f724d9548f0dde03b386becbc07a8540b748a33
+DIST urh-2.8.4.tar.gz 12639483 BLAKE2B 2db083e8c0203c15cbb4f89e9a844095d5f7728eb8e4629a0050df47310f891f8e12107ec8083cba5c028861d5a72d7c3f8235c10047a40efeebce33e1d94428 SHA512 8ded9d065cd4773b1a5d26b47838d7586b22fc142d0101388bd6aa5c638cf858452857191ca5de553b1a62397fb814c0f1839175647ec41cec32e216a6244ce6
+EBUILD urh-2.8.4.ebuild 1275 BLAKE2B 70519ed863a549365a02727ec16cd89bcecd93f2489047ea557d9aa3817009bfefb82cad7f73270913c292ff926d6a21cf87e814b2009b2542889857736a68ea SHA512 2a20211be19396d4180c36709f7a6da8630d8cc11b2add92c963368d13d257864e3a8168c2cc1409e742f3fc4717eb2e76fde220bf390c6abd043cb9892b42a9
+EBUILD urh-9999.ebuild 1275 BLAKE2B 70519ed863a549365a02727ec16cd89bcecd93f2489047ea557d9aa3817009bfefb82cad7f73270913c292ff926d6a21cf87e814b2009b2542889857736a68ea SHA512 2a20211be19396d4180c36709f7a6da8630d8cc11b2add92c963368d13d257864e3a8168c2cc1409e742f3fc4717eb2e76fde220bf390c6abd043cb9892b42a9
 MISC metadata.xml 925 BLAKE2B 2ae753ff0a9b2c58db180655350b7805546a6d4bf548902d5717be45ce07481ed1e478b7e46cfc4d0b9c82807b7b99135017aa1beb882d3ac1c9b9cd80ada30c SHA512 1d1005d81c4ba5eb2d482419d4469de906d3c754750fd7ed46540b92861e4b5356935986572168f1ee3008319aa31054a206d71b5153e7a1758a8c6796949f89
diff --git a/net-wireless/urh/urh-2.8.3-r1.ebuild b/net-wireless/urh/urh-2.8.4.ebuild
index c5cc8e3ff712..c4b387c055b5 100644
--- a/net-wireless/urh/urh-2.8.3-r1.ebuild
+++ b/net-wireless/urh/urh-2.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
@@ -26,7 +26,7 @@ DEPEND="${PYTHON_DEPS}
 		net-wireless/gnuradio[zeromq]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyzmq[python_targets_python2_7]
+		dev-python/pyzmq[${PYTHON_USEDEP}]
 		dev-python/cython[${PYTHON_USEDEP}]
 		bladerf? ( net-wireless/bladerf:= )
 		hackrf? ( net-libs/libhackrf:= )
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild
index c5cc8e3ff712..c4b387c055b5 100644
--- a/net-wireless/urh/urh-9999.ebuild
+++ b/net-wireless/urh/urh-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
@@ -26,7 +26,7 @@ DEPEND="${PYTHON_DEPS}
 		net-wireless/gnuradio[zeromq]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyzmq[python_targets_python2_7]
+		dev-python/pyzmq[${PYTHON_USEDEP}]
 		dev-python/cython[${PYTHON_USEDEP}]
 		bladerf? ( net-wireless/bladerf:= )
 		hackrf? ( net-libs/libhackrf:= )
diff --git a/net-wireless/wifi-radar/Manifest b/net-wireless/wifi-radar/Manifest
deleted file mode 100644
index f45011ca3526..000000000000
--- a/net-wireless/wifi-radar/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wifi-radar-2.0.s08.tar.bz2 62781 BLAKE2B f7ea7a2a884ac2ddc4dcc74f44c1bd4799dcf7ce03a19a5c32aea886f0c4bca47a33fe8789f1b75d26867604b9f2703e1f6664e789636605faf6bf313ee36078 SHA512 8b14a227c4e1e60f05c981b51777dcb5318a1dda2026bc32e9fd761adb0a4243caabd7444768630ad54258f9f065f4c7cc73e9d8b17bc2ccd98f63f3119ce584
-EBUILD wifi-radar-2.0.8-r3.ebuild 1812 BLAKE2B 1c3df36a678c81c9992e48b598390c0f9822535009734c02522e3bb9e4fa7a22f719d4a3ad0d13d888719ca8724f02404ff6cf88beb6a76da41c282b5f2c4693 SHA512 8f38bdac4fcc9f40773563858952a3bf8c4b0f8c88a34f7faa0a073c28f343353b8e10353293d2dbf0c4d910e13d13ba6de3640f8e5670461125f5f62774ee6b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-wireless/wifi-radar/metadata.xml b/net-wireless/wifi-radar/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-wireless/wifi-radar/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-wireless/wifi-radar/wifi-radar-2.0.8-r3.ebuild b/net-wireless/wifi-radar/wifi-radar-2.0.8-r3.ebuild
deleted file mode 100644
index 0e2d255179ee..000000000000
--- a/net-wireless/wifi-radar/wifi-radar-2.0.8-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils versionator python-single-r1 readme.gentoo
-
-MY_PV="$(get_version_component_range 1-2)"
-MY_PL="$(get_version_component_range 3)"
-MY_PL="s0${MY_PL}"
-MY_PV="${MY_PV}.${MY_PL}"
-
-DESCRIPTION="WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles"
-HOMEPAGE="http://wifi-radar.tuxfamily.org/"
-SRC_URI="http://wifi-radar.tuxfamily.org/pub/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-admin/sudo
-	$(python_gen_cond_dep '
-		>=dev-python/pygtk-2.16.0-r1[${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-wireless/wireless-tools-29
-	|| ( net-misc/dhcpcd net-misc/dhcp net-misc/pump )
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Remember to edit configuration file /etc/${PN}.conf to suit your needs.
-To use ${PN} with a normal user (with sudo) add:
-%users   ALL = /usr/sbin/${PN}
-in your /etc/sudoers. Also, find the line saying:
-Defaults      env_reset
-and modify it as follows:
-Defaults      env_keep=DISPLAY
-
-Then launch ${PN}.sh
-"
-
-src_prepare() {
-	sed -i "s:/etc/wpa_supplicant.conf:/etc/wpa_supplicant/wpa_supplicant.conf:" ${PN} || die
-	sed -i -e "s:/sbin/ifconfig:/bin/ifconfig:" ${PN} || die
-	python_fix_shebang .
-}
-
-src_install() {
-	dosbin ${PN}
-	dobin ${PN}.sh
-	doicon -s scalable pixmaps/${PN}.svg
-	doicon -s 32 pixmaps/wifi_radar_32x32.png
-	doicon pixmaps/${PN}.png
-	make_desktop_entry ${PN}.sh "WiFi Radar" ${PN} Network
-
-	doman man/man1/${PN}.1 man/man5/${PN}.conf.5
-
-	cd docs
-	dodoc BUGS CREDITS DEVELOPER_GUIDELINES HISTORY README README.WPA-Mini-HOWTO.txt TODO
-	keepdir /etc/${PN}
-
-	readme.gentoo_create_doc
-}
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index d192e12444d5..99f7ff6cf9c4 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,5 +1,5 @@
 DIST wireless-regdb-2019.03.01.tar.xz 23196 BLAKE2B 804ad05a0270df58dd89eb7193f8b568b5534abfc52b35f519e27cfa1f1922db457c77477b3014bd6b48cdd1bbe9e859a6508afa848cf01efbbf6b20d10c4984 SHA512 f0b94e1f661d86f4fcd39384588e10d7353ad085563ddc40a98446b416ce0d7bd0cbe34f1d9620ac45a33f16b7bfe58419da915061942cd5f51d5a3bf9809d72
 DIST wireless-regdb-2019.06.03.tar.xz 23176 BLAKE2B 46ed9c25103a57d2370f07035f27ffd89d6a65cdccb22d283aef524aff60b669f21dd4a4dd78c68229a443640a5fd0faa1ad6917e712181881d4b27ead74f480 SHA512 73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb
-EBUILD wireless-regdb-20190301.ebuild 1073 BLAKE2B feb8c9f16ce45e9613aea9fb590c2dd221a55ea2126072d149c33653b062e6a7ad4da445bbdf1560114cb04facae44b6a4ad0864a79bd9dc4e28db0592e087b3 SHA512 1095084aa9937c1219e6099b7171314bdc8242ecfde4485d9fb2cdce7383550fc92b8fa492034b3a6f56e9d53ea57e237a9370f1f000bbeeedfa693ede536cb7
-EBUILD wireless-regdb-20190603.ebuild 1073 BLAKE2B feb8c9f16ce45e9613aea9fb590c2dd221a55ea2126072d149c33653b062e6a7ad4da445bbdf1560114cb04facae44b6a4ad0864a79bd9dc4e28db0592e087b3 SHA512 1095084aa9937c1219e6099b7171314bdc8242ecfde4485d9fb2cdce7383550fc92b8fa492034b3a6f56e9d53ea57e237a9370f1f000bbeeedfa693ede536cb7
+EBUILD wireless-regdb-20190301.ebuild 1074 BLAKE2B 907d91e22cf6a29b65c82c2d9837ea4128a6928b6674effc000ceaa1a5b75cfb8ccba5fcfb47ceada6c8d7281e49b25f0584d69f20bba4dc1db1cb2a171b1570 SHA512 5c747eb1b4cdd400e5b62df5b73ff21ea3bb8f4614d3b67ea03ea7e364ddad57d6733b2548b0fd8981701093542b1ce8a11b34d259b228db165ead464cbb771f
+EBUILD wireless-regdb-20190603.ebuild 1074 BLAKE2B 907d91e22cf6a29b65c82c2d9837ea4128a6928b6674effc000ceaa1a5b75cfb8ccba5fcfb47ceada6c8d7281e49b25f0584d69f20bba4dc1db1cb2a171b1570 SHA512 5c747eb1b4cdd400e5b62df5b73ff21ea3bb8f4614d3b67ea03ea7e364ddad57d6733b2548b0fd8981701093542b1ce8a11b34d259b228db165ead464cbb771f
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
index 6f46b27ed2b1..99791c41e7f7 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
index 6f46b27ed2b1..99791c41e7f7 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index ef5807adf6cf..97155b39a18a 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,4 +1,5 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
-EBUILD wireless-tools-30_pre9.ebuild 1768 BLAKE2B fe847c9861b38e619b5fe2496fea5d1e52e841d479b302faf7a2c1cf39b2c2330414b8a9128e7a7aca9d53fc0de855ab62d72219457842c8d17c07caae341056 SHA512 ae7bf5bbff8a2b1cb077c6b380895be7feea8f80a84b0c93b91ce787fa5cb20bb6aabc9b6ce8cee8fe70bac9e005e626b33604a4f4bb603d8e151be52956f7e7
+EBUILD wireless-tools-30_pre9-r1.ebuild 1781 BLAKE2B b38e21dcffa05ec43507bce7277adcc6a9e7d87a7e03a35256ba3a26c4fa4f99b3b6901108bfe725c7260ccedcf97e63da1493f752733bc234b611fe70a98ef6 SHA512 91e71d7b8f1c21d92486b4c6b0bef1cdfd0de681763615b02cc643d48b397f872126fff7d974d28d552b07ee9ac13ded30dc05c8fc2397d7f985a056b783565d
+EBUILD wireless-tools-30_pre9.ebuild 1763 BLAKE2B 13d6da1bc9bbf1ca4bfe19a83a4b8b3dfe2ca8642abde1f2711814051ca91047bbf161d069acc3dbacea8cb5dada5ace287de309c1c60121809610a01fca272c SHA512 6099ac7cd5f4615e49ef894c21278df88616479ba7a5a8d7e41e289cee43c1eacd575d36ac7804968205ac9396bdbf060a67ff127722dea362bf3e23d8838987
 MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
new file mode 100644
index 000000000000..9013ba6595ed
--- /dev/null
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs multilib eutils
+
+# The following works with both pre-releases and releases
+MY_P=${PN/-/_}.${PV/_/.}
+S="${WORKDIR}/${MY_P/\.pre*/}"
+
+DESCRIPTION="A collection of tools to configure IEEE 802.11 wireless LAN cards"
+HOMEPAGE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="multicall"
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+PATCHES=("${FILESDIR}"/${PN}-29-asneeded.patch)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:^\(CC\) = gcc:\1 = $(tc-getCC):" \
+		-e "s:^\(AR\) = ar:\1 = $(tc-getAR):" \
+		-e "s:^\(RANLIB\) = ranlib:\1 = $(tc-getRANLIB):" \
+		-e "s:^\(CFLAGS=-Os\):#\1:" \
+		-e "s:\(@\$(LDCONFIG).*\):#\1:" \
+		-e "s:^\(INSTALL_MAN= \$(PREFIX)\)/man:\1/usr/share/man:" \
+		-e "s:^\(INSTALL_LIB= \$(PREFIX)\)/lib:\1/$(get_libdir)/:" \
+		-e "s:^\(INSTALL_INC= \$(PREFIX)\)/include:\1/usr/include:" \
+		-e "s:^\(BUILD_STATIC = y\):#\1:" \
+		-e '/\$(CC)/s:-Wl,-s\>::' \
+		"${S}"/Makefile || die
+}
+
+src_compile() {
+	emake
+
+	use multicall && emake iwmulticall
+}
+
+src_install() {
+	emake PREFIX="${ED}" install
+
+	if use multicall; then
+		# 'make install-iwmulticall' will overwrite some of the tools
+		# with symlinks - this is intentional (brix)
+		emake PREFIX="${ED}" install-iwmulticall
+	fi
+
+	has cs ${LINGUAS-cs} || rm -rf "${ED}"/usr/share/man/cs
+	has fr ${LINGUAS-fr} || rm -rf "${ED}"/usr/share/man/fr.{ISO8859-1,UTF-8}
+
+	dodoc CHANGELOG.h HOTPLUG-UDEV.txt IFRENAME-VS-XXX.txt PCMCIA.txt README
+	has fr ${LINGUAS-fr} && dodoc README.fr
+}
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
index 5d1c1e649408..0d412dd1f216 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="multicall"
 
 DEPEND="sys-apps/sed"