gentoo resync : 05.02.2020

30 files changed, 355 insertions, 119 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index c93e38e2d54c..1a0d4b121c21 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 6678da022bdf..f6d7b1e8750f 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,4 +1,6 @@
 DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046a094f9c772a562f19ae783c30810cf7b6aa8668566ef6998af79090266771aeea8037b446eb0b9755b602ddcebc0d2 SHA512 72c249782dda3a875fbec98e4fe0e6044a6f123ebd36341a5f42733dfe6c26d96b5c74f67c0547b81c5dd5e2f52a6f475b424885f8e6fa21279ac539228038f5
-EBUILD aircrack-ng-1.5.2.ebuild 2919 BLAKE2B 43fcdcb640aa5935a3e2219effd6916261ef339a11cbd5640c4c3c0b7b19eb7a770152e827b8435073a035dfd31783981a588cc50400b7e7381cb792d5f08727 SHA512 8b55b035ce6adc7496ad42096e3350b68673a1c5fbc767435656941107d7259a3e8d578a90eae25ed357eebda34afe3ca1ce39e62e0921f03df92009f18b6e28
-EBUILD aircrack-ng-9999.ebuild 2902 BLAKE2B 5f58efb09471a894c7cff3898d7a73b252fe92270f2834fd22acb3c3f57ebccfcd96fe493bc7715d0bde7189ffb713ef8ae5dca5fc74b8ba864375d522f0e934 SHA512 5108b684defd91d55de9ebd9c0d26a4fe6c8e625cb7ba84eabaf0ded2f7cdd4e64b6796230185398f7679e7c1923bec3cf9f92503967729d87ca3ac519d018e3
+DIST aircrack-ng-1.6.tar.gz 7933308 BLAKE2B c4cacdc9b767789a7b2426857831c1f8166d3f2e11a71cffc1466f2d4006552dfe420a50e0085f3c74fbdc23770309bb81d49e0c5372b0e4a8fa5e294c16d942 SHA512 df65ec3032ff20dc4aae4921e6a9c330a51b5df89af02d4c6fbf691fcfade21658b1a2d5de286a7e729dc6fb740f6fd4e6b6f53649486ef64bc3d00d81a95bd5
+EBUILD aircrack-ng-1.5.2.ebuild 2893 BLAKE2B a93ce214ad665bbf50e7d08bb1250731e2993437592fa6db39b1a207090ec4264e6f8b8b51d6a4f6f97b972250d0abb2afd5b23394899ae3075464939ef4a5ce SHA512 7797d00f2128120e5755a023903f6677c83face85d31053b71e9a11f73fcb2f64069464727aae58c6a234ad1fe673a987afe49c9271a191dd5cf0420b6f43572
+EBUILD aircrack-ng-1.6.ebuild 3065 BLAKE2B b9c609292bc81035b97a48a2ba3824f2c6a9c96a6d299b4831525f5f14f66d79366ddc5f0159e81130c5737f23a9cd62d5bc2938db2b31000384cd8f1438c445 SHA512 0a9dbcb42146f62aad2e4b6db30bf86605347c094131f4a23056512d6fab3e81169350c62474c3f37222e919c5b2fa4e7c3f251e019ca3974e69420c582fa3a0
+EBUILD aircrack-ng-9999.ebuild 2896 BLAKE2B a71674967487bffbe6662aba8c02b5861d403f4cf97cb8ff711d19d46ad295a4e6089acaa5dca96fb1aab4704fc44bc3ed8dac6b60656bab149d0875c02da557 SHA512 69c5efbb589d303a88a1ef18fcd2def9c9273e26fa967eebc320d5f6443c592119012ea213f0d35ce224d3627de4c296f0f6f46723ba061f335f65728d68cf0c
 MISC metadata.xml 936 BLAKE2B 1e62943b6dbb382d972c07ec810b332be4e9e949b025450bdcc6380f129c463c5dc370a476bb3db64172e8ac319b93361ce0cc1cd71d2072acb5a0891413ebf7 SHA512 6fc72c61abbddf6019c5a3610e422d24cd0d915e98789b411c978b54c61b4d6c50224a5d0905b25520f27067245327dd10ad3cada1d0a316d66b18ed9fc3016e
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
index c03f3658dc90..bc429d293451 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ HOMEPAGE="http://www.aircrack-ng.org"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-	KEYWORDS="amd64 arm x86"
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6.ebuild
new file mode 100644
index 000000000000..69db574fc3d5
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Upstream aircrack-ng supports python 3.x but lorcon doesn't yet and
+# it is needed for airdrop-ng. Will adjust when ready.
+#PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs distutils-r1 flag-o-matic autotools
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
+
+DEPEND="net-libs/libpcap
+	sys-apps/hwloc:0=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcre? ( dev-libs/libpcre )
+	airdrop-ng? ( ${PYTHON_DEPS} )
+	airgraph-ng? ( ${PYTHON_DEPS} )
+	experimental? ( sys-libs/zlib )
+	sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}"
+PDEPEND="kernel_linux? (
+		net-wireless/iw
+		net-wireless/wireless-tools
+		sys-apps/ethtool
+		sys-apps/usbutils
+		sys-apps/pciutils )
+	sys-apps/hwids
+	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="
+	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		STATIC_LIBDIR_NAME="$(get_libdir)" \
+		--disable-asan \
+		--enable-shared \
+		--disable-static \
+		--without-opt \
+		$(use_enable netlink libnl) \
+		$(use_with experimental) \
+		$(use_with sqlite sqlite3)
+}
+
+src_compile() {
+	if [[ $($(tc-getCC) --version) == clang* ]] ; then
+		#https://bugs.gentoo.org/show_bug.cgi?id=472890
+		filter-flags -frecord-gcc-switches
+	fi
+
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_compile
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_install
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_install
+	fi
+
+	# we don't need aircrack-ng's oui updater, we have our own
+	rm "${ED}"/usr/sbin/airodump-ng-oui-update
+}
+
+pkg_postinst() {
+	# Message is (c) FreeBSD
+	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
+	if use kernel_FreeBSD ; then
+		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
+		einfo "mode of your wireless card.  So do not care about what the manpages say about"
+		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
+		echo
+		einfo "To return from monitor mode, issue the following command:"
+		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
+		einfo
+		einfo "For aireplay-ng you need FreeBSD >= 7.0."
+	fi
+}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index a2e14c08c242..fa7cdd3ca822 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,11 +14,10 @@ HOMEPAGE="http://www.aircrack-ng.org"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-	KEYWORDS=""
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/airtraf/Manifest b/net-wireless/airtraf/Manifest
index 17466e4e5835..2fd4e8f2cbea 100644
--- a/net-wireless/airtraf/Manifest
+++ b/net-wireless/airtraf/Manifest
@@ -1,6 +1,8 @@
+AUX airtraf-1.1-fno-common.patch 480 BLAKE2B cc22a8bfe2f96fc55889f7f4ddb3f5f4ce7a22865ab061ddabac3d32cd70adae5408729dba6e493b02f70748d4b4638333cc0c661597a5742b8144c536105e6c SHA512 59e73928e886497b7fce9d06a0e39ec3bbf5c3e89758af209bf012e12fd2a2b2272148dcad40a0323e8e418df50b84faa78e486ecad058f2cbfcadac94b6227d
 AUX airtraf-1.1-fprintf-format.patch 421 BLAKE2B 8acd7417ded374a9973f52be45ee171507c4152a986be1a9da6d4fe011c68748b70c0ed7dda4db331c52f08775781e9283f839c04665f30f920ddf0138408a04 SHA512 9c0b63fc1a918cbbcaf82a263c42f891e1dcde6823768d9e2944cbe997aae220381e938f6a89efe1070592d3906cc11918a60d5cc50eea08d00bd29b16014eff
 AUX airtraf-1.1-off-by-one.patch 744 BLAKE2B c2000cc9014cfb02cb65fa6a51e3803c54dc813ef0268ec35fdf3119033438ab5b24e9caa5c0104435deeeedb46c545ada16683ccb638628385aef13647aafb5 SHA512 c19194498b2169a4ac20f20e51ea197bc9c96f5150a730a299375ea8d6babb4e498246fd8faf93d7dc285ca8a21d300a33102b2860868c7b9b02c89bd818c1fb
 AUX airtraf-1.1-sniffd.patch 1699 BLAKE2B b175d5d6b82beb519d4a74c4faabd9967d030a08b0fe18c779ca6cccb34a277e740a861034e0e567278ba2485c842bd2be05f4e64dfc38a3a1af3e14fa2a57a5 SHA512 6906700e625d8c9b78b248d281b19e158610c1d58d1ab23de3526bf3d060b3bdc259ae768b587ff52fdbaf4dd343ccda30517578825b75e65ff11d7fda515a1f
 DIST airtraf-1.1.tar.gz 136241 BLAKE2B 682516c6441efac8699fb15d40b99b50882d1c2d9e3acd344a979df080ca4f5532b0aa3247f37360f78ad2902018f907d6fe3e912b1d7b0df383c3bfe16f61a9 SHA512 7f341abb25e15dbdf510805230ee2f186a7a66d5c1e486bfdb978d3d8534d8b8c2cc1b5e0e323357c65af1eedbcb1da3e3e5f3ac8299db5f203f54b4a868f90b
 EBUILD airtraf-1.1-r3.ebuild 1084 BLAKE2B 2539bef87e23d475fb0e2c53b461881d6f09808160af99f1466b917b0b158d0386da76ed365312a13c1d6956a875489833a6f329d8bed4fa7d9f02ed60a54275 SHA512 61d87eae646ca16feb05a3c4e48d6b87cef3289bbc5d2445f661ab3015f8c1d73eb7dfe877e757eb993eaa7adad40c72f7a62b2d0eb108fd5cbbbbfa0aee1b37
+EBUILD airtraf-1.1-r4.ebuild 1117 BLAKE2B 6e0f3596122ad56466210a6e314db2728be225ef8acc9dbc34c76e4c0d2a43d21613e458fc16cfea3c3e8f7450e0213a82c27936c5ff0b82d253a60babbf3075 SHA512 c646e1fcd056613629a5388c1bba1de7900d38eb6743ac9db617a4fbd05e1af4b7ea40a7a2bffb9c6bef20dd493a1f60ff472671dc462a48512f1d695c5db232
 MISC metadata.xml 684 BLAKE2B 58863082b9d07f5798333fd9ab8e1a7777fe7ce8e0a63a4bbb5f6905b4125547c1248fcfa95027668fba537399330ef4464a3a2681733bb0ba68ede152ac7db7 SHA512 51cdb73af9ffdaba0fb7a8778dd573885fa446def0baa3932925e89357d43fe33af62095d01f1cc51f5135c2cfb09f7044381b080e077c7bae0a3276a231ae33
diff --git a/net-wireless/airtraf/airtraf-1.1-r4.ebuild b/net-wireless/airtraf/airtraf-1.1-r4.ebuild
new file mode 100644
index 000000000000..c0d5978fdf85
--- /dev/null
+++ b/net-wireless/airtraf/airtraf-1.1-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.elixar.com/"
+SRC_URI="http://www.elixar.com/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-sniffd.patch
+	"${FILESDIR}"/${P}-off-by-one.patch
+	"${FILESDIR}"/${P}-fprintf-format.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^LIBS/s|=.*|= $(shell $(PKG_CONFIG) --libs panel)|' \
+		src/libncurses/Makefile || die
+	sed -i \
+		-e 's|-lpanel -lncurses|$(shell $(PKG_CONFIG) --libs ncurses panel)|' \
+		src/sniffd/Makefile || die
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	# parallel make (bug #297331)
+	emake -C src -j1 \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install () {
+	dobin src/airtraf
+	dodoc Authors COMPATIBILITY docs/airtraf_doc.html
+}
diff --git a/net-wireless/airtraf/files/airtraf-1.1-fno-common.patch b/net-wireless/airtraf/files/airtraf-1.1-fno-common.patch
new file mode 100644
index 000000000000..9945f170d53d
--- /dev/null
+++ b/net-wireless/airtraf/files/airtraf-1.1-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/src/sniffd/capture_engine.c
++++ b/src/sniffd/capture_engine.c
+@@ -52,7 +52,6 @@
+ FILE * capture_stream;
+ FILE * error_stream;
+ 
+-char atime[TIME_TARGET_MAX];
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////
+--- a/src/libcommon/logger.h
++++ b/src/libcommon/logger.h
+@@ -33,6 +33,8 @@
+ #ifndef __logger_h__
+ #define __logger_h__
+ 
++extern char atime[TIME_TARGET_MAX];
++
+ int init_log(int, char*);
+ int write_log(int, char*);
+ void flush_log(int);
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index c26659134bcd..3574072c85d5 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,5 +1,3 @@
-DIST blueberry-1.1.13.tar.gz 1382261 BLAKE2B 5b23429243bc63d864f7176139a577cb5c8aea1f00906c218c66e92b9d679ad793f6429d01f9e49f960674b1ad5100d642075a730db49dd568282ea00089d8a3 SHA512 587165b33f087720f9ae72dfb37feda9c6c3e4c4ad166a5a410c078a63bea0d33182b781f8f0c7840575917d06faec752866009c9b3664241b7ca23ab1586b94
-DIST blueberry-1.2.9.tar.gz 1402410 BLAKE2B 0b816d4ca812b18e00a88d0d5b9cd1d44086a29f656d56cb23eede9b7f5cf7380ecf802ebc04369d39cbff56912292bff10bf31724389ab4a33731d2ce61c822 SHA512 6119cc9a7e1c18db2110f568f9fc8717ff0cc1db5fa8794f95734229cc4ebbc658b9b19c9b545dabdcbfa56c4fe2c5631c5fe2e8675860645790bb1c67aaa8f6
-EBUILD blueberry-1.1.13-r1.ebuild 1337 BLAKE2B cacdc37bd1749bd5796f92f1203d9d43580e2fe2325db1ee3eeaa4e57badff81e44a03bfdec6d25145cfd502fc90735b828538003252a3fdeab02d6896bf035f SHA512 a3e0fd5df76c02c9cb920120a0b5a57dfe777d5cbdfe870d5bc33440a28c4c39890fb86f4cff72bcf0dd86517317dc1759d5aac5fa03720a4e792abd458b20b8
-EBUILD blueberry-1.2.9.ebuild 1197 BLAKE2B 12419093013856054d434ad57066fdf67a4f2febb6beac4de6d636ef646df52005fd3dc5c44cb59ef172b425df2939f74cb331c9aaa8485ca8c9c8bc4a992998 SHA512 34b00c6b907927ba216b1176abb71c218a2eee1e68c58ecc85ef1fce9ac08af26ef936367d37fe523eb8d1e4a973f3ad81900288391a41261dad03de9b4cd4b6
+DIST blueberry-1.3.4.tar.gz 1410366 BLAKE2B a684c30b7457c4df8cc1f5449891cb43d0bc314692ad1d135377c861c669b0f4f8185396f39295268821ac6403dfd035201756dea4974f31066da766e36b559c SHA512 d5ca457ace0d46aab425b6821e690a94375de1222e90d0223afa97de5ce16f77089ba84b1b47a90e6494f34d3bd6824dbd6d2ff1e41e0b9be1d7bc9611abd6db
+EBUILD blueberry-1.3.4.ebuild 1288 BLAKE2B e6a836da4933dd5046db0a0b6c66054b96583e010b068d7e18ff1e0b38dbf9457cfc6fae39bb28743d6aaf223a5d86cce942873ff63f6a65655742b9971da082 SHA512 b57f1316cee9c1b1f81d38d08e4cbb1ea050edfe90bbd3aabf30b6a4723770b3b8f35c1b9364f5f70d325220e66a47f00a4fd826a74b6292a4316d054d501cdb
 MISC metadata.xml 576 BLAKE2B 1c705170b11fd8afef9f65f90743b7d3443b3952c084b771dbf93ea5bb4765cedce34cc818334ec01c577c85774e26fcf28b45d35c601e033b3478cd7713d87a SHA512 0d04db85d6d5ce7df8bdddc00ec8ff040e3a1bfdbde15300d83b4c7d59b8577314b43716909fae926ba5ace3ed75ff9b5fed7e1da3e7f8bc54f4411018d1b445
diff --git a/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild b/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild
deleted file mode 100644
index 82e74e30c65b..000000000000
--- a/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A Bluetooth configuration tool"
-HOMEPAGE="https://github.com/linuxmint/blueberry"
-SRC_URI="https://github.com/linuxmint/blueberry/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	>=net-wireless/gnome-bluetooth-3.14[introspection]
-	net-wireless/bluez[obex]
-	net-wireless/bluez-tools
-	|| (
-		>=sys-apps/util-linux-2.31_rc1
-		net-wireless/rfkill
-	)
-	x11-libs/libnotify[introspection]
-	x11-misc/wmctrl"
-DEPEND="${RDEPEND}"
-
-src_prepare () {
-	sed -i 's@^#!.*python$@#!/usr/bin/python2@' usr/bin/blueberry{,-tray} || die
-	default_src_prepare
-}
-
-src_install() {
-	doins -r etc
-	exeinto /usr/bin
-	doexe usr/bin/*
-	exeinto /usr/lib/blueberry
-	doexe usr/lib/blueberry/*
-	insinto /usr
-	doins -r usr/share
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/net-wireless/blueberry/blueberry-1.2.9.ebuild b/net-wireless/blueberry/blueberry-1.3.4.ebuild
index 6ca6d4fc15ec..9eda79f9577b 100644
--- a/net-wireless/blueberry/blueberry-1.2.9.ebuild
+++ b/net-wireless/blueberry/blueberry-1.3.4.ebuild
@@ -21,6 +21,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/xapp[${PYTHON_USEDEP}]
 	>=net-wireless/gnome-bluetooth-3.14[introspection]
 	net-wireless/bluez[obex]
 	net-wireless/bluez-tools
@@ -32,6 +33,11 @@ RDEPEND="${PYTHON_DEPS}
 	x11-misc/wmctrl"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	python_fix_shebang usr/lib
+}
+
 src_install() {
 	doins -r etc
 	exeinto /usr/bin
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 1904c2856f09..a173e5f5b7af 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,7 +1,7 @@
 AUX crda-3.18-openssl-1.1.0-compatibility.patch 8782 BLAKE2B 7906eedd86aca173199ec957516167cf940d41da668cc7c5b5935232984f88960c1e00c87dfcd03c7d068cdb9168525378c46e1c52b28a9714d14cddce9240df SHA512 417a67139f61c467cd13274d0e6ad1542107dbb00765beed5becccdb64ac0228236498241e1fba9dfd4a5e1acb04ee583c435b699cca9b6a6461e5b7e86328cb
 AUX crda-4.14-do-not-compress-doc.patch 1367 BLAKE2B 021a25a898dc225e52bee293ba94152e5f7e8229c5c0a813a126f239819fd727edfa34c9b85f25e31d7630c13598f797dfcd855d31fd28beec5443866f3841fb SHA512 d3545fff1f6c6ae9ae1ae9c833bb137f84783a32dfb9e2f50075079268f67ee1b001fc904d99c68ff0aad97d674fabd591c1ca2ba378e14551759e56bc3f2e45
 AUX crda-4.14-openssl-1.1.0-compatibility.patch 8821 BLAKE2B 3f679378829d2d39fcac69a111d1caa551cb1b5ee51c34aab48fa3a84847fcb98771126856bc95b6af4462539fed1987682a4528cbc47a17ab03a14b23a3b8fe SHA512 9203965c228bfc7f694380e727ceee0654b18b8da81d49c5d9d379d94087d8f6e972894034c2245086366832d181b7d69180bada5199baff1c90b2012248fc15
-AUX crda-4.14-python-3.patch 2808 BLAKE2B 6353678cf583c83e7f077209b6f6f7b7ff506239958aa20a66c57a47f6a02d7de9003bc344d1b453dd239b87c7b8649e31a6c4f6e7aecfeb6a40375d75519e6f SHA512 7f9a7dc492d5b46f7cfeaf7902cc37be4763bd5dabe049df5eab1d3b903712a43153de65ef9184df364aeaac6f57d73afcd634e3cea8c0ebdb3aee118f1c9364
+AUX crda-4.14-python-3.patch 3022 BLAKE2B b6d78c1a09ec0f848654139e0ba778f5d65d814b9d7c84df3013aec43baf55f9c23367b15454218e39d3a0959355b4fd030dd4584b7420f6835a8ef421dd72c9 SHA512 b953be9da2ed770d89c905257c2e3f04451ce9ee2a61ee9cc18285b3d8209f8665f5f0a2a4ffb8a5211445cb45fe66dc4e3d302e90c4c0030c293c978dd443c6
 AUX crda-cflags.patch 895 BLAKE2B 0a8d8acb268ff58656a5b66a77744c14fd9f92fd6a660132f2a86a88a3cd5bde4bf39709c38f2705fe999bca312a991304b673d4d12a540cecffd1fcc4ec5cc1 SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d
 AUX crda-ldflags.patch 388 BLAKE2B 57d3ce3fccba1db8ad8bbfae2ba8e8dcd03bdd94c424761902bc2ea552c006c3e4ef1d8b913f095ba3601895bc29917d01c1e8f046a159b2b006b174bed7bf62 SHA512 3a53d3567fa9b3ff85d4e443124ea2637e5eb489ade4f160d8f1de92553a3a33c3eb9f9d80005ceac03b50e5c4aa7f0990bca3547c145644ab66985548c32e9f
 AUX crda-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90fbe503130e81fb423e04d3f257e1a1d78db9fef605e42a4d9571c54e8ac9cb8a2569d3c3cd3f5c6d542a295 SHA512 41c98f1e4ca0ae3d22b08086eb54aefd4ec95fed5a6e5fafd55fb6a9b9649ec18f5f65003a1424cf59bf99e266fddf110c92d9e46a4b40a18be5931fc7bbbbeb
@@ -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 2141 BLAKE2B f8ce3772934e945d9222793d4f06a8243df581c1e6f03ef972ad39844fc225bb5675cf3c65c096eb7be13232196f0ca11ace26084b8ef48235a256047effbd02 SHA512 e03b4a5e02ce374bb760ad659e08e165fd7bba6e5547ca6aad933ab54fd3d38fbff746b31df90c1335bed0662d4b86b7600fa3d64a60ad86b1ebae6daf4d809a
+EBUILD crda-3.18-r3.ebuild 2142 BLAKE2B b3735350fef553a7fb1137281fc9eaf3a550dd499be9d162c1c0448b13ff716f00e9e39106e5d473a6f37d8841ff033c087b83b1c1f49654c94b9c25e2982779 SHA512 f28109e1ae3f34d11a8d9186d0279f5b77de7c5c340964f4a776ecf4388a63e7974ed33865863e445d052a9dc90c4d1062258fba63a30b4d3b0a3cb930e7c623
 EBUILD crda-4.14.ebuild 2231 BLAKE2B b85f56aceeaa096887848775d01f5995c27d09e0756a3f92d368f2c82d5cb4aa01451ffe8fd92f9062abdf62a5f485af52ba680f60bfaf833c3db3797f520a37 SHA512 84f6688ee216a8f2f7530f4b17d694facaeee02ceac1a4202eaea6e83c2f92052f5f27eeaa95d0b757df19fdd8aa72ea04f3456168305bee8a3ccd7e94962fbc
 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 42a8e00147ae..362a2c535704 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/files/crda-4.14-python-3.patch b/net-wireless/crda/files/crda-4.14-python-3.patch
index 97db1ac05294..df22a6a4bd44 100644
--- a/net-wireless/crda/files/crda-4.14-python-3.patch
+++ b/net-wireless/crda/files/crda-4.14-python-3.patch
@@ -1,5 +1,7 @@
---- /utils/key2pub.py
-+++ /utils/key2pub.py
+diff --git a/utils/key2pub.py b/utils/key2pub.py
+index 9bb04cd..632e6a6 100755
+--- a/utils/key2pub.py
++++ b/utils/key2pub.py
 @@ -3,20 +3,20 @@
  import sys
  try:
@@ -25,7 +27,7 @@
          val = val[8:]
      vnew.reverse()
      output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
-@@ -34,13 +34,13 @@
+@@ -34,13 +34,13 @@ def print_ssl_64(output, name, val):
      output.write('};\n\n')
  
  def print_ssl_32(output, name, val):
@@ -42,7 +44,7 @@
          val = val[4:]
      vnew.reverse()
      output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
-@@ -80,21 +80,21 @@
+@@ -80,21 +80,21 @@ struct pubkey {
  
  static struct pubkey keys[] = {
  ''')
@@ -67,16 +69,16 @@
          idx += 1
          if idx == 8:
              idx = 0
-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ struct key_params {
  
- static const struct key_params keys[] = {
+ static const struct key_params __attribute__ ((unused)) keys[] = {
  ''')
 -    for n in xrange(n + 1):
 +    for n in range(n + 1):
          output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
      output.write('};\n')
      
-@@ -135,7 +135,7 @@
+@@ -135,7 +135,7 @@ except IndexError:
      mode = None
  
  if not mode in modes:
@@ -85,7 +87,7 @@
      sys.exit(2)
  
  output = open(outfile, 'w')
-@@ -153,3 +153,5 @@
+@@ -153,3 +153,5 @@ for f in files:
      idx += 1
  
  modes[mode][1](output, idx - 1)
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index c0d522d17a9e..bf8a7ed6c449 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -6,7 +6,7 @@ DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
 EBUILD gnuradio-3.6.5.1-r3.ebuild 5185 BLAKE2B 62bbbfaf2b1eb52c03e52b64eed81a8eb8277443f7d96ad3db5d8b37988ea7ef7c8385234df9a16177d2f9c9cf71b095ea0684d7f4fc737c46502dfdf318c8ff SHA512 b5fbdb677e9e9b9e24c220cdc6e5e536419f8323a93771c750b1d737fc5df7095b60d0fad113e510c9e804a1f882cc08f0170cf37b3c3428dc2d602a72181588
-EBUILD gnuradio-3.7.13.5-r1.ebuild 7562 BLAKE2B bb7bc0cbd9459e328ac7421ac307093068bd50f36d65a1a86d0e05d894683dae6a25639de6ccba2d5c641ef25733932d625b3872e46a166d1f887383a391e28e SHA512 3035dc04e101c4469bcfa442987e6b3b317979027bc7ceb35c059f4b5772398ce7511cfd9cf201c269f91a97b69f234186a18bccd8e7491da4ec757b04e0bfb0
-EBUILD gnuradio-3.7.9999.ebuild 7044 BLAKE2B 8790023c7e47ae868bffc857e311981dd8a6ac47d399390bcaf09d25bbcdf3afcbc4a15a747019ff70248c4de009e44075b22abc4b8e7d2909839391d3c2a1d5 SHA512 72b0636cbb1b32b0fb625ce67b21206d741852065cebb5dcca4cbc9ebe7e55d75c896516aa69a3c894816611a35bb4c2674a0211251b833f974504084bf73c4f
-EBUILD gnuradio-9999.ebuild 7021 BLAKE2B a87f63b767d5f9ca490e3a2d3c2bff872cfd67052a4dab9b56a4dd76a4b698ea9aa775575f9ccf1326c3b25baf6676ad924716b289a4d540211a1ba0c8e98836 SHA512 343e65b89adaab9eeb5488da797ab7e62ba4502d0de6b54234a31c08c2b91e7c0cd06fbd07e7b12fb5d8dcd492cfedc6837de9d65534814bfbfd25d3ba237f9b
+EBUILD gnuradio-3.7.13.5-r2.ebuild 7705 BLAKE2B 24752c60e3fac15e0c2f3906fa6a17ca2c8c12a41daa81c20eb6e5c39679028fb2150d1aca9e15ed5f78af2c841e937feab0987dcb8ffe79d3acf335bad35404 SHA512 6a49ed931aadf866a78dc733b2bf7e86d8fa4b02d7587089af2e3982efaf04e710d25418b79b3aa242c324d6b4026435438e0ffd0aee2bdd13084c6a9def7fdf
+EBUILD gnuradio-3.7.9999.ebuild 7187 BLAKE2B 874bd12aa475f4ae983b872a58d639483f028cb23a03f579a7532503c9c7fbebb4a5cecad012f51138bdcc2485cccc6b74bedd5fc332ff4b121462dd895e0853 SHA512 a8a33b42bd8433cf0b162e24f7884a768e6a7ed6720811d126c0d5332fba4e1a59db9fd1a1c3cdf036f4c52e7d7dc08013d21a366e2e1e0960fd44c33b0410b9
+EBUILD gnuradio-9999.ebuild 7164 BLAKE2B 830e9b82735f020a10daa506b1aa3ef9af7ab73cfd08f28fe12296de202b54186ffc44102607f4a3d5edf027a462b4a642d73b7783df63254c1fd5a4ad53b751 SHA512 249d7c9f2f08126fc0afc4e7a68b4f1a19adcc44bab6c9fab9ddbf0173531599d491380df5f90744ca255cc6b1034999f466da45c1d4ef9c061adce560d365ed
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
index afa455f35653..dec78f161e8c 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,7 +59,12 @@ RDEPEND="${PYTHON_DEPS}
 		media-libs/alsa-lib:=
 	)
 	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
+	filter? (
+		|| (
+			sci-libs/scipy-python2[${PYTHON_USEDEP}]
+			sci-libs/scipy[${PYTHON_USEDEP}]
+		)
+	)
 	grc? (
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -85,7 +90,12 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	utils? (
+		|| (
+			dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+		)
+	)
 	vocoder? ( media-sound/gsm
 		>=media-libs/codec2-0.8.1 )
 	wavelet? (
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index ff1b29da54eb..8c07aa105ae0 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -56,7 +56,12 @@ RDEPEND="${PYTHON_DEPS}
 		media-libs/alsa-lib:=
 	)
 	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
+	filter? (
+		|| (
+			sci-libs/scipy-python2[${PYTHON_USEDEP}]
+			sci-libs/scipy[${PYTHON_USEDEP}]
+		)
+	)
 	grc? (
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -75,7 +80,12 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	utils? (
+		|| (
+			dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+		)
+	)
 	vocoder? ( media-sound/gsm
 		>=media-libs/codec2-0.8.1 )
 	wavelet? (
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 3861b55c8576..6687ca881954 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,7 +60,12 @@ RDEPEND="${PYTHON_DEPS}
 		media-libs/alsa-lib:=
 	)
 	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
+	filter? (
+		|| (
+			sci-libs/scipy-python2[${PYTHON_USEDEP}]
+			sci-libs/scipy[${PYTHON_USEDEP}]
+		)
+	)
 	grc? (
 		dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -83,7 +88,12 @@ RDEPEND="${PYTHON_DEPS}
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}]
 		dev-libs/log4cpp )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	utils? (
+		|| (
+			dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+		)
+	)
 	vocoder? ( media-sound/gsm
 		>=media-libs/codec2-0.8.1 )
 	wavelet? (
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index ba2075822728..fc5035429423 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,5 +1,7 @@
 AUX gqrx-bladerf-samplerate.patch 1197 BLAKE2B 1496903e5ae8ce0cba7b0fc30a34d42afe5e76adefc4ab4566fdd5e6c7e88994843c1ba3462be5f30740e35ddbea451317e0910fc5c6fe3f4564d3afc5bff2e4 SHA512 40e02bdaa7af30ae30eb447f01b79776f792a5f30fe3e1d3317d3a40ff8dedb3f19ef13b1e8566781c07ff1086bc919723c2aed940b7fbe88dff9c124116e73f
 DIST gqrx-2.11.5.tar.gz 1329054 BLAKE2B 205bf1d984f18d43c914bb24e59f7ed42e9faf8060b44c2f78f6d1bb7a222d87395c347626802438c45a30225acac18ca3114d412faf3f8385840276c0c08ac8 SHA512 d2928559d377b85ea683839b0e7dd1213038ee350718f9dad5064afacab20b08d1c1edc189ae8c5ae992ad019636c930555f9a441aee88964231d174db25ae6f
+DIST gqrx-2.12.1.tar.gz 1334839 BLAKE2B 9ad8ab710675f4b42ff652d642026aba00dad63867f836662054aaab89cc7788874cc0f47de531257ee901f3bc58a6e6d5aef3c5a4fe30ae367d24fcd87ae763 SHA512 28d3da6c4ff750cf580db658aee267162a64103e9dac1d212f70df6bc602c8d50ccb7aaf88c7e976cfa235b884e02b4994e679f69aed640485c44ed07f183cc9
 EBUILD gqrx-2.11.5-r1.ebuild 1459 BLAKE2B eb187a1ae71a56d79159e3aaf6b15ccc48d81e372b665db9eec4573fbce301cb184fbc3091715fcb9b74c9d285c93c994d4b448d268ad50a00f0e31ae9936c91 SHA512 889b96b65b854bd48949298bb2739b684b1f3db1db6c37e04653afbc1de1af5536967b002fc5145a23059ba19f9c2faa76b43eb980168f397664975d089e28c8
-EBUILD gqrx-9999.ebuild 1398 BLAKE2B 857836230183b383172f2e525addec716adb1294671edb85593a7c41f385fdb0aa1ee35eac8c57b520c72ccd855b5019835b23eb51aecba7a7135586c919cf52 SHA512 9f6aee5bd333f0baf5f9ba214d7dfa71b1b10f3f6ea98044d2dc66546c7d5e5ddb75a22e143d4701a709c0ceee93f1526327f2afb286d63dde13fce78e0d8b1d
+EBUILD gqrx-2.12.1.ebuild 1395 BLAKE2B eba3edcfa3ce0dba98ca2e7271b0ac9e65600a1def80ef1bb41f85ebaacff29bba2a763ba183271e415e7ce6a776f47316197297fdefba594db504de4816900f SHA512 8697e7b3e7601201ad72ade7515ca64993e853bf4c38b04edea36bb485f8ed325d5d7df04aaaf4a8abee68bb8efbd8367c28195a9ddcd04cce5df91d0e117754
+EBUILD gqrx-9999.ebuild 1395 BLAKE2B eba3edcfa3ce0dba98ca2e7271b0ac9e65600a1def80ef1bb41f85ebaacff29bba2a763ba183271e415e7ce6a776f47316197297fdefba594db504de4816900f SHA512 8697e7b3e7601201ad72ade7515ca64993e853bf4c38b04edea36bb485f8ed325d5d7df04aaaf4a8abee68bb8efbd8367c28195a9ddcd04cce5df91d0e117754
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
diff --git a/net-wireless/gqrx/gqrx-2.12.1.ebuild b/net-wireless/gqrx/gqrx-2.12.1.ebuild
new file mode 100644
index 000000000000..0c8ea0281cd0
--- /dev/null
+++ b/net-wireless/gqrx/gqrx-2.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
+HOMEPAGE="http://gqrx.dk/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gr-audio portaudio pulseaudio"
+REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
+
+DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
+	>=net-wireless/gr-osmosdr-0.1.0:=
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	pulseaudio? ( media-sound/pulseaudio:= )
+	portaudio? ( media-libs/portaudio:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if use !pulseaudio; then
+		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
+	fi
+	cmake-utils_src_prepare
+	eapply_user
+}
+
+src_configure() {
+	if use pulseaudio; then
+		LINUX_AUDIO_BACKEND=Pulseaudio
+	elif use portaudio; then
+		LINUX_AUDIO_BACKEND=Portaudio
+	elif use gr-audio; then
+		LINUX_AUDIO_BACKEND=Gr-audio
+	fi
+
+	local mycmakeargs=(
+		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/gqrx
+}
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
index b9b3d7bb2cf0..0c8ea0281cd0 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -34,6 +34,14 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
 	portaudio? ( media-libs/portaudio:= )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	if use !pulseaudio; then
+		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
+	fi
+	cmake-utils_src_prepare
+	eapply_user
+}
+
 src_configure() {
 	if use pulseaudio; then
 		LINUX_AUDIO_BACKEND=Pulseaudio
@@ -49,14 +57,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_prepare() {
-	if use !pulseaudio; then
-		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
-	fi
-	cmake-utils_src_prepare
-	eapply_user
-}
-
 src_install() {
 	dobin "${BUILD_DIR}"/src/gqrx
 }
diff --git a/net-wireless/gr-air-modes/Manifest b/net-wireless/gr-air-modes/Manifest
index 8a90fef8c37b..ef96075f7c4b 100644
--- a/net-wireless/gr-air-modes/Manifest
+++ b/net-wireless/gr-air-modes/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-air-modes-9999.ebuild 955 BLAKE2B 30e10b44fdda43260d3f0485145242f0965f49fa2dac26b76ee372e287e618680698b245700e93037154b96cac4639b83d9bf33b8e1d4c57e7b5f69ed86c33a4 SHA512 e9a225070a96f6da61748f98fc839e59fb0eeabd0a8e76313db7dfe5743fc77773b166fd90a0e49858ad617bb906b31472471f842f38e09100ac79082f939f2f
+EBUILD gr-air-modes-9999.ebuild 1029 BLAKE2B f2488f40e21eecc4a6c8076031059a8a80b8c906b633f5472ee5e12b2bfddfef23e998817d96da4ec52b9f41e6617bbd2f030205cc9440228889b5dac8034d7a SHA512 7853b515d2708fdf9bc0bb1802f61b854ba4ead2b39de3a236bf836d5082bcf0f1ab8a611ee006fd002847b7b64a2675dc8e8c1f90f71c3e8141e5159a82240c
 MISC metadata.xml 447 BLAKE2B 3d205cace1b2c5446d3b3db17116f0e8d071cc1a1e59b17597c1a083b781e6ea1bc9e2f52de22d685ca53a96b08a13965e121f5924559040da23a827243579d3 SHA512 d05f480160792ec408d852a61ddaebe4088e38a7efbee14e8b576fb4ac2e2c98e5196b0c6fe62457e7de9ed2db80317e452061e90d5c6a760f5b5cf941027f0c
diff --git a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
index 4c1532789714..5f10964933fd 100644
--- a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
+++ b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,10 @@ DEPEND="${PYTHON_DEPS}
 	net-wireless/gr-osmosdr
 	fgfs? (
 		games-simulation/flightgear
-		sci-libs/scipy
+		|| (
+			sci-libs/scipy-python2[${PYTHON_USEDEP}]
+			sci-libs/scipy[${PYTHON_USEDEP}]
+		)
 	)
 	rtlsdr? ( net-wireless/rtl-sdr )
 	uhd? ( >=net-wireless/uhd-3.4.0 )
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index de25c721ad2e..4f29d1aafc41 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -3,6 +3,6 @@ AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.4.tar.xz 830548 BLAKE2B 2d03767a5308c72206aefbafce39a241e353c1ef8751758d0a336a7ad5b86ef02062da037db423b805810eb45a9467628cd241682a63835b63e3ea920f39ace9 SHA512 3b06fa24666e7cf37353d95d0e9abc41b8be921ae7313c014f20f704fe7919d154d6a5441c6d87d4cd08ee65e15218ec01f4ff4aafc7e4a358faf3ca4a6dcb18
 EBUILD iwd-1.4-r1.ebuild 4219 BLAKE2B 36f70ad55bc4c2832fcb182999f26ab236ef852c31292c0943d7efb880bb5f8616ba38a84ce47c973c562111d116f2d68c0f55a55c563c7bb44fb3ab5b8ed575 SHA512 af3820df6cbd44468e4f5a109e051cbfdcfd0b05e6666958f5c906963a40a4b27a3e3b0cb5beb0b64b9716e26becd26d430bad75417bf49b688d2f81ad7539ff
-EBUILD iwd-1.4.ebuild 4212 BLAKE2B 5cea209cdf68eba162df00cd033054c22a13733991dca59b217095a1a49099edc47fff59aafbfbba4de4d03d909432a5059ae1a2d5718481f34ea04f6cf25bca SHA512 def9a32ffec626f8338cd02c27ef3fd1df1e2de0fbad0f6a190aef5abdbd0d031bf696e06dbf59d5a433822ef0b1d344b952f7c88b197f6c1caf4c7e9d3df77f
+EBUILD iwd-1.4.ebuild 4211 BLAKE2B 81bb8365ba4b39878b9c4531e1c927ef4a068d9a6d6de9bf40180202c5cc6f75b88cbc8c54da1bf95cb19160def27148385302203ac6a7695ac0ba2da45487aa SHA512 a3f380e75083e90fcdc3510ae779da7392c7e4c11d7a378af567cf97066b93bc028141ae03dc8a9b85f0cf254409288b09ebe3f9c2d54912387bf63ca0c703d4
 EBUILD iwd-9999.ebuild 4203 BLAKE2B a3804e0c45f950489b07e6c4a710f3722148287314539b33887f9b39c87510b27a3632a57b6dd419b7a4dbf575b1d137b64c9506b72508dee09851ef3c63a987 SHA512 87e22d525b0cc8288d28dbc0429cd5588a341ba3a18f4450afe382d3f0cd46a39e92dd913d39d5772438e21c879906f5a51a1a3e44cdcd1f1765880c9100c6cb
 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
index 6a604916fe72..703fc3c680d5 100644
--- a/net-wireless/iwd/iwd-1.4.ebuild
+++ b/net-wireless/iwd/iwd-1.4.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/python-wifi/Manifest b/net-wireless/python-wifi/Manifest
index c69f0a5befa0..86c4a3edb1cb 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 843 BLAKE2B 24d902c41fb72c14feda25b654f5c60477dde348b636a10635184d7063de5cd2f3817ec16d8af4b6a3a5e2d8331799cde5e2c1734ced7539bce2fd73adcebe10 SHA512 017874870a428d267bfcb27223b3684eac2174000e0b3d8e6b6be28b190e1dbe8101370a11180e9557767d07f840caabe6ea68d5050e395b12bb1f4ae98fe8fe
+EBUILD python-wifi-0.5.0-r3.ebuild 844 BLAKE2B 660b5cec5e3e7fcca8e09c93c69f1cc34dba336c944fddd16e416f7f9cae0025cf6876c259034e221ad3764afdee59fbd756c7a104f8e79ff4c9e88d48502e59 SHA512 98fb01d1ce8219f0da25c1ae80f829da9788357a78ed119fc9ca96cf59649a09501a1ae0511509cc244aa70f682ff71e94477fead8f16d66ff3660ff5a0631fd
 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 adf2c5c6b054..934920fa6334 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/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 4249fc5359e7..89e666cf2832 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 1072 BLAKE2B 01bb8430f1e4867ec1b68b11544a0d104ea419e7ad6910d0f17e670635f81b830340f6661b9fda172659273a462f4a18f2196bd7cb1a0725830d60cddc737e79 SHA512 99eb1e6196130b621c83819968c269f36994e0f6c85f8e42a03647af15acd5b8da38a5206f3e88678821981e3fe59da33345120ac5609f09c0c2b49c0cb451af
-EBUILD wireless-regdb-20190603.ebuild 1072 BLAKE2B 01bb8430f1e4867ec1b68b11544a0d104ea419e7ad6910d0f17e670635f81b830340f6661b9fda172659273a462f4a18f2196bd7cb1a0725830d60cddc737e79 SHA512 99eb1e6196130b621c83819968c269f36994e0f6c85f8e42a03647af15acd5b8da38a5206f3e88678821981e3fe59da33345120ac5609f09c0c2b49c0cb451af
+EBUILD wireless-regdb-20190301.ebuild 1073 BLAKE2B 053056bd258c2dcaf320aa6f00602db1024276465ece816067f7d1229bca508f2f4ff9ea359fd622607ef7155ee4b73e7623c455d26f8e8855583bb6c4c8be47 SHA512 808ba6715cb99c5579f5b637af6803e5af09d7ea20e2cf0f2146ff2d55bfbb48ead7d5876fc22869977456a10bdf6bc9e109448561d1dde719685384e049b85c
+EBUILD wireless-regdb-20190603.ebuild 1073 BLAKE2B 053056bd258c2dcaf320aa6f00602db1024276465ece816067f7d1229bca508f2f4ff9ea359fd622607ef7155ee4b73e7623c455d26f8e8855583bb6c4c8be47 SHA512 808ba6715cb99c5579f5b637af6803e5af09d7ea20e2cf0f2146ff2d55bfbb48ead7d5876fc22869977456a10bdf6bc9e109448561d1dde719685384e049b85c
 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 d38887cb9ee6..61b3b1605fae 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 d38887cb9ee6..61b3b1605fae 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}"