gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-wireless
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
66 files changed, 880 insertions, 2357 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index eb6b586e1146..83598cd6a583 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 284f66cca0ed..7fc2c9df90d5 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -10,8 +10,9 @@ AUX broadcom-sta-6.30.223.271-r4-linux-4.15.patch 1343 BLAKE2B ca87ae817cefd6436
 AUX broadcom-sta-6.30.223.271-r4-linux-4.7.patch 3897 BLAKE2B ecf3eb75f8eb3331b0a36b39851536de43cffd3b303db9e9f4fe6fe55d463c3343aba17a99668448427764a719e15e3e862d6a3dc0bc61cb68da9934fb427c6f SHA512 f61ecfb6b8c5a377c7a4da7549c9ec75677782fa2f97e64de0df1259e0ec3b993cfa3eaa4ff50331703ee18ef28f2af0d09839dd3b63ed994e6b29cbfe8ed73f
 AUX broadcom-sta-6.30.223.271-r4-linux-4.8.patch 1835 BLAKE2B 7e091ac44616ea4cfa80b3a5563f4c6a235d2431b911f6bc52074a76b2c1d609dc546430f048abf042f862907f573c6b1dfa24c8c424aeefe73ff13ae3f34900 SHA512 e5959921b6f0cd5d61d7ed568f549b0920f394458c28257c05064b89d7067ce11c8e44ed0e5a48a65bd041c6193d9ae2d02fca2f5efbfb787d3f9001786a4578
 AUX broadcom-sta-6.30.223.271-r5-linux-5.1.patch 829 BLAKE2B 7bb59009307d423e72832d14114b7e6bd016717ace260174b2b9dbc909ec7eb962aec88d930f34ee6c09165e937a2cc271eac7e6b214fe8161a8f76af1aaa83c SHA512 e8780fbff3ed0640b30b44ca777d56bdcf8b23702d4fa827c843919658f022090ca3e2533541f577e7b49133cb2bb3d6ec85bcc9c023a82bea892e231f01a550
+AUX broadcom-sta-6.30.223.271-r5-linux-5.6.patch 3056 BLAKE2B 3842420d177c7faf6ac86e00acd5365cb6499ad82071cf7e37f2b765463c945f9634e73126520934011ee63aefee51937d8ff0baa3b206fc5902f2b15fe151e0 SHA512 9edd068851acf534efa424e9b3b3157e75d029f799c1f3a383eb0a9678fee56d6c01817a055e2fa405bba0c25fa2db89b4665a30a9fd35d4e58056bf85cadabc
 DIST README-broadcom-sta-6.30.223.271.txt 17216 BLAKE2B af6db6e129911d1589d7d6cb7166bee32ce1ca98a4e5c9b3515a44e48681d8a7a7a6b697419b2bcd9c46f0f4ca1f7ece632b63531b4a4ecd91df4f9dddf043c9 SHA512 672ecc5afcd8535a9f8beb4baea5a40c584b7682844e9ff0e4f66b7406b42118a99dce1fcd580118187fdc506781334b8243082def2b78dce916d90c55ab3663
 DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 BLAKE2B 2e3189c468cec50b1a980452a4b2bd0f9657d9adf6fae2a95a8b1c2d1df2f5f6beb4cb903f72f444eddf823fe4375299864cd62191c9d59c4f77598b5d3aa246 SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b
 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 BLAKE2B e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17
-EBUILD broadcom-sta-6.30.223.271-r5.ebuild 3763 BLAKE2B 923c9cf82aa607b7a980c2e8608cdba9ba7c2f1ed76da5f16f648e7a2f6e35e29d32c5264999c78c14b5984aed5bdfd6616d5d17b9988de61740cb443a880281 SHA512 b11a485700e3efb06c310a3b296414dce84ce248db166f8efb04254128e7efc5132ecdf4adcf11cb5c254701f590812a850de7d4c8aa0bca79284eeb514afd55
+EBUILD broadcom-sta-6.30.223.271-r5.ebuild 3817 BLAKE2B 4817e0b2188686ba4af9982cfa269898348f25a2d18f1f8547f929fb94f52ae60b95a9fb3e3316500bdf8a5f5556c3ae818b4e5c3a15e87e56292cdfc1150014 SHA512 936c80d538fa007c564a268d2db37cd982c287e5c7be6b31ce4895e38d4cfb5b573750d1b0f0f93a6ebceda19991ff983aef17f5c503d9d8e4be4dfbee93a9e5
 MISC metadata.xml 249 BLAKE2B 4a3b51bf90b3ec35dd72dca3b3c73fb89d3e3d08c0989cd7939205ae9d655200886882c2de26146caac3f42ff06ab4a898b85325bd80e69f39491bf4c34ae89e SHA512 4211cb5a85b6a437c0d1727891123af70f296e685c9d59ead2032abbe19d3828fb83d59e559056455ad8b9aadd6136141ab7f9edaff2d55ce2d86b1d698722ce
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
index 91581b52a4e4..b84669a99696 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.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
@@ -84,6 +84,7 @@ PATCHES=(
 		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch"
 		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch"
 		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.6.patch"
 )
 
 src_install() {
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.6.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.6.patch
new file mode 100644
index 000000000000..71264346f86e
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.6.patch
@@ -0,0 +1,88 @@
+From: Herman van Hazendonk <github.com@herrie.org>
+Date: Tue, 31 Mar 2020 17:09:55 +0200
+Subject: [PATCH] Add fixes for 5.6 kernel
+Origin: https://salsa.debian.org/Herrie82-guest/broadcom-sta/-/merge_requests/1
+
+Use ioremap instead of ioremap_nocache and proc_ops instead of
+file_operations on Linux kernel 5.6 and above.
+
+<rosh> Patch amended to adapt i386 arch.
+---
+ src/shared/linux_osl.c |  6 +++++-
+ src/wl/sys/wl_linux.c  | 21 ++++++++++++++++++++-
+ 2 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+index b24a973..9bce9b1 100644
+--- a/src/shared/linux_osl.c
++++ b/src/shared/linux_osl.c
+@@ -946,7 +946,11 @@ osl_getcycles(void)
+ void *
+ osl_reg_map(uint32 pa, uint size)
+ {
+-	return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++		return (ioremap((unsigned long)pa, (unsigned long)size));
++	#else
++		return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
++	#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+ }
+ 
+ void
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index ab7b883..10621c2 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -590,10 +590,17 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
+ 	}
+ 	wl->bcm_bustype = bustype;
+ 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++	if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
++		WL_ERROR(("wl%d: ioremap() failed\n", unit));
++		goto fail;
++	}
++	#else
+ 	if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
+ 		WL_ERROR(("wl%d: ioremap() failed\n", unit));
+ 		goto fail;
+ 	}
++	#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+ 
+ 	wl->bar1_addr = bar1_addr;
+ 	wl->bar1_size = bar1_size;
+@@ -780,8 +787,13 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ 	if ((val & 0x0000ff00) != 0)
+ 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+ 		bar1_size = pci_resource_len(pdev, 2);
++		#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++		bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
++			bar1_size);
++		#else
+ 		bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
+ 			bar1_size);
++		#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+ 	wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
+ 		pdev->irq, bar1_addr, bar1_size);
+ 
+@@ -3354,12 +3366,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t
+ }
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++static const struct proc_ops wl_fops = {
++	.proc_read	= wl_proc_read,
++	.proc_write	= wl_proc_write,
++};
++#else
+ static const struct file_operations wl_fops = {
+ 	.owner	= THIS_MODULE,
+ 	.read	= wl_proc_read,
+ 	.write	= wl_proc_write,
+ };
+-#endif
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) */
+ 
+ static int
+ wl_reg_proc_entry(wl_info_t *wl)
diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index 431a684b38e1..021418417b47 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,4 +1,4 @@
 DIST chirp-daily-20200430.tar.gz 896763 BLAKE2B a0f318499e76ff9c297c4eeff381650d98ea03d20a0d20d7751485376a9299ba0f59aa88340a0f23cdf4bc70f0038b5376c2c78beb3bc593a09f7a7af22b9021 SHA512 f7b0d6d23df2b85d714c2fabefcc32cf5f30ceb7daca6a5982d47962a1fe4d4b210729d0d78cef28af4f21fcfbc9e4d0e6585b5e841220e9f8b5a7fcad1dd2b0
-EBUILD chirp-20200430.ebuild 1145 BLAKE2B 4a70c363ba60697332975eb4e70f83fa90f9ee7819a45d8c41978a7baa6a874eaafbd10f39050281a23e2be7f884168942fe8b7206dfa12761e0c994d7311a29 SHA512 1b59ac9bb05ade9654392d141f89a4b9cf68e284e0903f01ea1b969b4a88729d730d06b682f62ddd95384750ffcaf3c564aaee7a9caa0dec4e5a3cb443f0eb07
-EBUILD chirp-99999999.ebuild 1145 BLAKE2B 70b7ad1dfee4f5f36f19712b96101ea7369a5af8c56893871a7a72de72aee3eb2f7e75f5e80dd21bb6cc6a6959fa88f3e985080cb48110f046801929cbdb34dd SHA512 aa67f1abdc2e015ac1f48b6bf411be3ea0772962013a83a684cd1dec0dec6e67f383b8b3fbad8202c230574e3285362bd813471a0ad35eb8b839d8d1e0f61a4d
+EBUILD chirp-20200430.ebuild 1147 BLAKE2B eaf2ad93713dbe5900ca388cf84e1beae4d03093fcfbd07fca7a04d857d95d6028fcf2e24d0f77ee06186f190b1862b183af5e21803693f04f31e9b31d779890 SHA512 79b5ca20ec1dc2bdb92c6d24ff496fe0685593fd66dba5c0f8d75660d310dbb6e8e2922d0585ef37bbbd4fe7bad2a827d44fa4ce86eb98a648ad8bd2b94debe1
+EBUILD chirp-99999999.ebuild 1147 BLAKE2B eaf2ad93713dbe5900ca388cf84e1beae4d03093fcfbd07fca7a04d857d95d6028fcf2e24d0f77ee06186f190b1862b183af5e21803693f04f31e9b31d779890 SHA512 79b5ca20ec1dc2bdb92c6d24ff496fe0685593fd66dba5c0f8d75660d310dbb6e8e2922d0585ef37bbbd4fe7bad2a827d44fa4ce86eb98a648ad8bd2b94debe1
 MISC metadata.xml 457 BLAKE2B 1f7caba85f5961ded80d4d421e260465f69de0549bf2f50186bbad8d75ff090e6b6bbf8e2a73b732b164f8210faec27051ae24e2fe677fc3a00c0960e7b39d38 SHA512 748db876146f4074e0ea1290e451f3f06531fc24ea823eff121dfa6ac58a95af0cd819ae0832417a74725a0ff61384c921906050128d144412c9f3b56edf8c67
diff --git a/net-wireless/chirp/chirp-20200430.ebuild b/net-wireless/chirp/chirp-20200430.ebuild
index b82274bfdd51..461b1ed5328b 100644
--- a/net-wireless/chirp/chirp-20200430.ebuild
+++ b/net-wireless/chirp/chirp-20200430.ebuild
@@ -12,14 +12,14 @@ fi
 inherit distutils-r1 xdg-utils ${SCM}
 
 DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="http://chirp.danplanet.com"
+HOMEPAGE="https://chirp.danplanet.com"
 
 RESTRICT="test"
 if [[ ${PV} == "99999999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
+	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-daily-${PV}"
 fi
 LICENSE="GPL-3"
diff --git a/net-wireless/chirp/chirp-99999999.ebuild b/net-wireless/chirp/chirp-99999999.ebuild
index 0bfe51e65750..461b1ed5328b 100644
--- a/net-wireless/chirp/chirp-99999999.ebuild
+++ b/net-wireless/chirp/chirp-99999999.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
@@ -12,14 +12,14 @@ fi
 inherit distutils-r1 xdg-utils ${SCM}
 
 DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="http://chirp.danplanet.com"
+HOMEPAGE="https://chirp.danplanet.com"
 
 RESTRICT="test"
 if [[ ${PV} == "99999999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
+	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-daily-${PV}"
 fi
 LICENSE="GPL-3"
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index c915634d2d4a..9e069e5e67a6 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,6 +1,4 @@
-DIST dump1090-1.15_pre20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3
 DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b
-EBUILD dump1090-1.15_pre20180509.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
-EBUILD dump1090-3.7.2.ebuild 1565 BLAKE2B 8963955f5180a8ec16b3fd406a4b66b671a7e391d41cb30c717e41416c87b323879e835b1fd34c257e0c8e73e8d9c27aeec41b6bb091a357198d0043d3248afa SHA512 ed26737b326570a5af8e6c1725b6f65380c2cf056c1c8fc07cdaa0a5ecb325e8add1b33348681bf9d57f75603e881751ee7e881b5eb7e260185f09ae556129fe
-EBUILD dump1090-9999.ebuild 1558 BLAKE2B c300d6d813531d99ee7e9bae8213dfdfa908b90adda44618ab0da162c89b0ccd4f623f90bcdf6b0ae5cec5f1e485c5abad39297d29c02087d27be0275f965a83 SHA512 290bf679ed1b7ed989f8212e32794a91fd255d2bf4d09648383af6620cb6cffc28752731c45c2c8394581f66361eb5a1b61478d8df8cc2360575689a0e60032c
+EBUILD dump1090-3.7.2.ebuild 1543 BLAKE2B ef4ea5495cd0a264c993ba40bc0a2d564f497b56b8248dfbbb4323bb293159017ac729eb5e17bcdcecd7e56bd04a001a9613e6fc986e3d6b8932039bfccaf272 SHA512 d70dbea5cef1ea41cfbfa430f8800057e12f5bb2a265368d5e7b6310f5386e2a4ed042ed971738efc242df37e098228371c999cf7596bd179d38a48cf58efd6a
+EBUILD dump1090-9999.ebuild 1545 BLAKE2B f4ad78598d6b99c66fa7eb716ecdda2d2091fb1a3e3722d9922f961a6ed58f8ea699c98a1fab6e6fbb4c10a20630955648851defcbeffd9e028b94e74e9fdbe5 SHA512 bc82f2db887f9290883bc82948a43793f5c953fc77dd3bdfb9a58dd405d71444204421bbfaef7767120b46d26379cc1376e8bd30d6706b05f24ad72c9c51630f
 MISC metadata.xml 475 BLAKE2B 65a7e4651f29eabc99e389d7ec78482bb20b87891e4313cd5d8f9b70d6f6567591dc30b8f81ef8b81d37f0a83fcde56b7616b142105639609f82054162ff7e4b SHA512 c91e0b24df8c2a90daa48fb1f94e3968fa4586b986e05d853d937d4a570d3828216840dd2c4babe0f5ee257f19079c94461a230a2327e9d2c2966d7b01d68999
diff --git a/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild b/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
deleted file mode 100644
index 556e4a14a698..000000000000
--- a/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="simple Mode S decoder for RTLSDR devices"
-#Original repo
-#HOMEPAGE="https://github.com/antirez/dump1090"
-#Repo that has actually been touched recenly
-HOMEPAGE="https://github.com/mutability/dump1090"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mutability/${PN}.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
-	SRC_URI="https://github.com/mutability/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-wireless/rtl-sdr
-		virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		UNAME="Linux" \
-		DUMP1090_VERSION=${PV} \
-		CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr) ${CFLAGS}" \
-		EXTRACFLAGS="-DHTMLPATH=\\\"/usr/share/dump1090/html\\\"" \
-		LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread"
-}
-
-src_install() {
-	dobin ${PN}
-	dobin view1090
-	dodoc README.md
-
-	insinto /usr/share/${PN}/html
-	doins -r public_html/*
-
-	insinto /usr/share/${PN}/tools
-	doins -r tools/*
-
-	newdoc debian/lighttpd/89-dump1090.conf lighttpd.conf
-	newdoc debian/nginx/dump1090-mutability nginx.conf
-}
diff --git a/net-wireless/dump1090/dump1090-3.7.2.ebuild b/net-wireless/dump1090/dump1090-3.7.2.ebuild
index bb2497770e1e..742de05fd100 100644
--- a/net-wireless/dump1090/dump1090-3.7.2.ebuild
+++ b/net-wireless/dump1090/dump1090-3.7.2.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="https://github.com/flightaware/dump1090"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
-	KEYWORDS="amd64 x86"
 else
 	KEYWORDS="amd64 x86"
 	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index a34578ba1b3d..f0099d87455f 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-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
@@ -16,7 +16,6 @@ HOMEPAGE="https://github.com/flightaware/dump1090"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 0ecb89c0ca90..b242b17fd321 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,12 +1,11 @@
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf156a83f6b463b74398a6bb17f70a0917bdded1e585fe1ead61dd38f5aeb9020fac256a6f5caf9e1f638e214035fb8ec3b8ef7c SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768
 AUX gnuradio-3.7.13.5-boost-1.70-asio.patch 769 BLAKE2B 19a0f56540911443a8b2b8af3f16b3a784ae760ac60a017f5d2d642a6612c4c4f310df5937ba1d815b9cf9ff8e7d5de660876140f6821d2ab59acf94270ccbe6 SHA512 b3270301945489ac6cb301f30c28bea4b9d59ee7cb2a0e5a162e8ff514e0173d849236db8c3e60fa028a9df2304fc22ce73b7eabb525e567867ad72d7cd46dd7
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
-DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
 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 5339 BLAKE2B 40342241899afb64e9ef4bd4c3ddf74e488dfcef7290c733589868bc17cb12bb9f4dadfccb987817c278921e2606a5fbec15a136823839df696c689cda104548 SHA512 d7427110295bbe6c561ff98b859725498b93e4a479e73e17a6e0dbf766ef9c3d5e18f66ab61ed98c01ef4655d225d45c49f0d9be5e26f9f7cce5e990531535c4
+DIST gnuradio-3.8.1.0.tar.xz 2436488 BLAKE2B f3919b458987c9dc72be2d9400473d64cc95870f4bf3a31b74c2ee9df8f291b6ca8e44d57269ad0af5e2fd0a22f777999986685f53665057f9a54478fa840479 SHA512 81e68db79b0927830a86d21f851f183becfad3e9b8b9b8379698c0d96d3f906b9b1b9292198829ce3d3c73fc29547e42a2532db62218d0b534bf02bf7a02fdde
 EBUILD gnuradio-3.7.13.5-r3.ebuild 7959 BLAKE2B bc68f79eb279d53a1e25fcb534882716ad9e4c129e892367f8ba88e2da175c0422d3ee8e37f4c4f37c8b9bdc498c4a253119cbee26c72c4aae29c1974b5d5efa SHA512 f4d7d68b943b950d5517a8705674c293635928189cce3cc161534f36401a860d134d528108305fcb60390fc437566ec18cab2bb1e86beca3cb242e2856d50544
-EBUILD gnuradio-3.7.9999.ebuild 7383 BLAKE2B c6178e81d4a1a982a8cc9a305faad53cbd04836a4a2ddc6aa6f10785f09ab40d3c3ac5d4a8a41b1dbd0ee5529409e8b7b1ca869525a56a424dcfe535597f6bd0 SHA512 566f559aed55f2e8f58d4818c90722b20a13d242d155a0512e17c923a4beab9aaa1c1c86290618cba78c7ec3868b7414518c1df428e36b2cb649631179222853
-EBUILD gnuradio-9999.ebuild 7340 BLAKE2B 3184d2a662f4b5b1974bd3b520e3d03a04098b23196f5cd346dbda30a4a05e3b801231dcd171e8aa3f5075452574d73a50d97e6473f88f4ad8cb9d56bf0df930 SHA512 74975e565a74ac889d37f299a2bcdc06a87f9e6fb63da0d9fbfea4df3dab3812c82f1740736042f09223e695302fd4bd7cbe43503bebee2dac33bb1df898b7e9
-MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
+EBUILD gnuradio-3.8.1.0-r1.ebuild 5995 BLAKE2B cb288a4e5610db280d7f508c22084a94c8a7482333a9e9704b28f6bf71c8b32f25f68c9fcd1d4488cd230fca8fd5bc965d8956259090d031116678820ec1686d SHA512 27c9e8e47489fd91464217756626848b04c749a181ff71e8f983a227d3a70e52e8d4c687d25c4b6671654fc12956cb226249525164d07345c81001aab462e14c
+EBUILD gnuradio-9999.ebuild 6019 BLAKE2B e620da24a69f4b285e34752cac338dff0343a0f77501f8fcd93c76aa860328cc55b8b128ea37fcb6318fcdcb97888edf43dd083f6786cc284ccbafc7fee465f0 SHA512 babb6b819b29a57497b56f555adf45ffc688747dab5f1a19a82297eb1801a5b75a129abda8115d7f5495e675afc2248764002553d5fa47afc2c2c7451b53d1ac
+MISC metadata.xml 1864 BLAKE2B 770bdfc6a1344b8b199d32e3eafed27340c0bee307da9395915518041b4bede6a72fc0b984e8af02ca9a1c0e15558552c35156c31a80f990acb90548c0de6fa9 SHA512 93a9d4bf34b36a2b30c4be255e97d0f5cd220643357ec43bc59f4f46f9fca9f825df17add6245cf46710a328f1f48e81513be60a1f880c4bcd6c857e3f403d0b
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
deleted file mode 100644
index a38d393dfebb..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
+++ /dev/null
@@ -1,193 +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 cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio sdl uhd +utils wavelet"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		analog? ( filter )
-		digital? ( filter analog )
-		pager? ( filter analog )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.7 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
-	')
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-util/cppunit
-	sci-libs/fftw:3.0=
-	fcd? ( virtual/libusb:1 )
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_SINGLE_USEDEP}]
-	)
-	grc? (
-		$(python_gen_cond_dep '
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	sdl? ( media-libs/libsdl )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_SINGLE_USEDEP}] )
-	wavelet? (
-		sci-libs/gsl
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	$(python_gen_cond_dep '
-		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-		doc? (
-			>=app-doc/doxygen-1.5.7.1
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	grc? (
-		x11-misc/xdg-utils
-	)
-	oss? (
-		virtual/os-headers
-	)
-"
-
-src_prepare() {
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF}
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	mycmakeargs=(
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		-DENABLE_GR_QTGUI=OFF \
-		-DENABLE_GR_WXGUI=OFF \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
deleted file mode 100644
index f8ecf5a77873..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint-3.7"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
-	)
-	fcd? ( virtual/libusb:1 )
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
-		!<=dev-libs/boost-1.52.0-r6:0/1.52
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		filter? (
-			|| (
-				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		grc? (
-			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		utils? (
-			|| (
-				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		wxwidgets? (
-			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-	')
-	"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	if [[ ${PV} == "9999" ]]; then
-		true
-	else
-		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
-	fi
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-
-	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	#zeromq missing deps isn't fatal
-	python_export PYTHON_SITEDIR
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
-		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_ATSC="$(usex atsc)"
-		-DENABLE_GR_CHANNELS="$(usex channels)"
-		-DENABLE_GR_DIGITAL="$(usex digital)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_SPHINX="$(usex doc)"
-		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FCD="$(usex fcd)"
-		-DENABLE_GR_FEC="$(usex fec)"
-		-DENABLE_GR_FILTER="$(usex filter)"
-		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
-		-DENABLE_GR_LOG="$(usex log)"
-		-DENABLE_GR_NOAA="$(usex noaa)"
-		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
-		-DENABLE_GR_PAGER="$(usex pager)"
-		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_TRELLIS="$(usex trellis)"
-		-DENABLE_GR_UHD="$(usex uhd)"
-		-DENABLE_GR_UTILS="$(usex utils)"
-		-DENABLE_GR_VOCODER="$(usex vocoder)"
-		-DENABLE_GR_WAVELET="$(usex wavelet)"
-		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
-		-DENABLE_GR_QTGUI=OFF
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	if use doc || use examples; then
-		#this doesn't appear useful
-		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/scripts/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
new file mode 100644
index 000000000000..3fd0a24eac18
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1 virtualx xdg-utils desktop
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.8"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	sci-libs/fftw:3.0=
+	sci-libs/mpir
+	sci-libs/volk
+	alsa? ( media-libs/alsa-lib:= )
+	fec? (
+		sci-libs/gsl
+		sci-libs/scipy
+	)
+	filter? ( sci-libs/scipy )
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( sci-libs/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1
+	)
+	wavelet? ( sci-libs/gsl
+			dev-libs/gmp
+			sci-libs/lapack
+			)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+"
+
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
+DEPEND="${RDEPEND}
+	!<net-wireless/gnuradio-3.8
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test()
+{
+	virtx cmake_src_test
+}
+
+pkg_postinst()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 7bbe445db144..aa068b0e06b5 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
+inherit cmake python-single-r1 virtualx xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="https://www.gnuradio.org/"
@@ -13,107 +13,101 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="pybind"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
-if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint"
-fi
 
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-RESTRICT="!test? ( test )"
+IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		qt5? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
 
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
+	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
+	sci-libs/mpir
+	sci-libs/volk
+	alsa? ( media-libs/alsa-lib:= )
+	fec? (
+		sci-libs/gsl
+		sci-libs/scipy
 	)
-	fcd? ( virtual/libusb:1 )
-	jack? (
-		media-sound/jack-audio-connection-kit
+	filter? ( sci-libs/scipy )
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
 	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
-		dev-libs/log4cpp )
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
+	trellis? ( sci-libs/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
 	)
-	zeromq? ( >=net-libs/zeromq-2.1.11
-			dev-libs/gmp:= )
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		)
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		filter? (
-			|| (
-				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		grc? (
-			dev-python/pygobject:*[cairo(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		)
-		qt5? (
-			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			x11-libs/qwt:6[qt5(+)]
-		)
-		utils? (
-			|| (
-				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1
+	)
+	wavelet? ( sci-libs/gsl
+			dev-libs/gmp
+			sci-libs/lapack
 			)
-		)
-	')
-	"
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+"
 
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
 DEPEND="${RDEPEND}
+	!<net-wireless/gnuradio-3.8
 	app-text/docbook-xml-dtd:4.2
 	>=dev-lang/swig-3.0.5
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
 	)
 	grc? ( x11-misc/xdg-utils )
 	oss? ( virtual/os-headers )
@@ -122,52 +116,35 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	gnome2_environment_reset #534582
+	xdg_environment_reset #534582
 
-	if [[ ${PV} == "9999" ]]; then
-		true
-	else
-		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
-	fi
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-
-	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
-	python_export PYTHON_SITEDIR
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
 		-DENABLE_PYTHON=ON
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
 		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_ATSC="$(usex atsc)"
 		-DENABLE_GR_CHANNELS="$(usex channels)"
 		-DENABLE_GR_DIGITAL="$(usex digital)"
 		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_SPHINX="$(usex doc)"
 		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FCD="$(usex fcd)"
 		-DENABLE_GR_FEC="$(usex fec)"
 		-DENABLE_GR_FILTER="$(usex filter)"
 		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
-		-DENABLE_GR_LOG="$(usex log)"
-		-DENABLE_GR_NOAA="$(usex noaa)"
-		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
-		-DENABLE_GR_PAGER="$(usex pager)"
-		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
 		-DENABLE_TESTING="$(usex test)"
 		-DENABLE_GR_TRELLIS="$(usex trellis)"
 		-DENABLE_GR_UHD="$(usex uhd)"
@@ -175,21 +152,18 @@ src_configure() {
 		-DENABLE_GR_VOCODER="$(usex vocoder)"
 		-DENABLE_GR_WAVELET="$(usex wavelet)"
 		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DDESIRED_QT_VERSION="$(usex qt5 5)"
 		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
 		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use examples ; then
 		dodir /usr/share/doc/${PF}/
@@ -205,7 +179,7 @@ src_install() {
 		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
 	fi
 
-	# We install the mimetypes to the correct locations from the ebuild
+	# Remove duplicated icons, MIME and desktop files and installation script
 	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
 	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
 
@@ -220,46 +194,30 @@ src_install() {
 	fi
 
 	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
 }
 
 src_test()
 {
-	ctest -E qtgui
+	virtx cmake_src_test
 }
 
 pkg_postinst()
 {
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
 	if use grc ; then
 		xdg_desktop_database_update
+		xdg_icon_cache_update
 		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
 	fi
 }
 
 pkg_postrm()
 {
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
 	if use grc ; then
 		xdg_desktop_database_update
+		xdg_icon_cache_update
 		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
 	fi
 }
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index c1685236ff6d..5d03b8a37dbf 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="filter">enable filter signal processing blocks</flag>
 		<flag name="grc">enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>
 		<flag name="log">enable logging to console and files</flag>
+		<flag name="modtool">enable modtool for editing GNU Radio modules and components</flag>
 		<flag name="noaa">enable NOAA POES HRPT receiver blocks</flag>
 		<flag name="pager">enable pager signal processing blocks</flag>
 		<flag name="performance-counters">enable block performance counters</flag>
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index fc5035429423..593891db1828 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,7 +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-2.12.1.ebuild 1395 BLAKE2B eba3edcfa3ce0dba98ca2e7271b0ac9e65600a1def80ef1bb41f85ebaacff29bba2a763ba183271e415e7ce6a776f47316197297fdefba594db504de4816900f SHA512 8697e7b3e7601201ad72ade7515ca64993e853bf4c38b04edea36bb485f8ed325d5d7df04aaaf4a8abee68bb8efbd8367c28195a9ddcd04cce5df91d0e117754
-EBUILD gqrx-9999.ebuild 1395 BLAKE2B eba3edcfa3ce0dba98ca2e7271b0ac9e65600a1def80ef1bb41f85ebaacff29bba2a763ba183271e415e7ce6a776f47316197297fdefba594db504de4816900f SHA512 8697e7b3e7601201ad72ade7515ca64993e853bf4c38b04edea36bb485f8ed325d5d7df04aaaf4a8abee68bb8efbd8367c28195a9ddcd04cce5df91d0e117754
+EBUILD gqrx-2.11.5-r1.ebuild 1460 BLAKE2B 88cf1bfa99c38b3b4bf74de16b0cd3d624f24fe9a7d8801ea0fc1e79114fea5c2eac6ec441fa6da08a31317b87c7a7266063b4867b3c33d32f7a5b37961fe041 SHA512 4dda5191329758fd82c199a595e44a2e2aae879ecc603ff975e87121713a628f6a1e7d8a78456d77bdb20c6f9804eda1dcf3314e97c5a1fc21ed6d3e78dd2aa4
+EBUILD gqrx-2.12.1.ebuild 1396 BLAKE2B 92ba0267d2583fb7d303bfd738a052870b9c3b867a1cacb0a805175d2788917ebd00556e0319f6d6ad1d6a5894bbfca578cf2c3cb89bf269d05e2d5d200b2589 SHA512 dea8b2cf69f669556478326aac9c6c7212795b16503c1c7808fe556692249edb63941ff345420f0f19f65861340503994a381a3bd0a645dfd21dd36a4004f389
+EBUILD gqrx-9999.ebuild 1396 BLAKE2B 92ba0267d2583fb7d303bfd738a052870b9c3b867a1cacb0a805175d2788917ebd00556e0319f6d6ad1d6a5894bbfca578cf2c3cb89bf269d05e2d5d200b2589 SHA512 dea8b2cf69f669556478326aac9c6c7212795b16503c1c7808fe556692249edb63941ff345420f0f19f65861340503994a381a3bd0a645dfd21dd36a4004f389
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
diff --git a/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
index 827cbf70e3de..982b78c3a0f2 100644
--- a/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
+++ b/net-wireless/gqrx/gqrx-2.11.5-r1.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils eutils
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
+HOMEPAGE="https://gqrx.dk/"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
diff --git a/net-wireless/gqrx/gqrx-2.12.1.ebuild b/net-wireless/gqrx/gqrx-2.12.1.ebuild
index 0c8ea0281cd0..5497f6b12fd5 100644
--- a/net-wireless/gqrx/gqrx-2.12.1.ebuild
+++ b/net-wireless/gqrx/gqrx-2.12.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake-utils
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
+HOMEPAGE="https://gqrx.dk/"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
index 0c8ea0281cd0..5497f6b12fd5 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake-utils
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
+HOMEPAGE="https://gqrx.dk/"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index 12909b33d6fd..be91a7f66642 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,6 @@
-DIST gr-ieee802154-0.0_p20180402.tar.gz 195464 BLAKE2B 391bd4eefb5a90135a084a94c2edd83e6f2c2bd6dca26be4d9a54448382d5ee463e1740c305e9583be0107b424c67e74fac84ece147844e7c2a63f6096c7dd36 SHA512 90f164bdcd636dee68a49fe844901ca73e1f743fdeacd8019edddc57c681ec3d1fcfe209d8abd89e2013c2c2c436b7992fe0b0dbe9c88c04352aebc0813a9d96
-EBUILD gr-ieee802154-0.0_p20180402.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
-EBUILD gr-ieee802154-9999.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
+DIST gr-ieee802154-0.0_p20190606.tar.gz 195541 BLAKE2B f565808788c463816633774362be0bf6e6900db52051ef4f8e2eed5b110c7b9edcf05458f8a4a8e3afef59c4a76101a5606ea9c9023ad922162ee9466cc7e343 SHA512 b430ee6c16356307566619cd50258c3fd05ca198a67f0b47eea6b8d1038de6cc070823dd7392a56c4308cd74495802b4b52a4a425ce43ce4afb56386ec5fa39a
+DIST gr-ieee802154-0.0_p20191006.tar.gz 94443 BLAKE2B f561b401b97741e6a06d36b97be765f66778002c6ea7814ffcc08e7aa93d6236705a25c1f32d536d3e2d2193b92608cdd469ba086f459f0f8290c74f52297d6a SHA512 1c552cfe3739165382c36aeb8f556b17ee7925459d74c96d36a7b1f821e177860ddab601c87184cd33db9c97d1231edeb4267bbfbf9df198708db692e27a1a86
+EBUILD gr-ieee802154-0.0_p20190606.ebuild 1351 BLAKE2B 268f659fe1b7219fa2e515613fcbe0052637b847996193e436e87d7866783c54ae30d85a43657c030fe73b0f1f7d87558b936044e3abe85b3706ae4e85da1ec1 SHA512 68fa564c2187038c01221086ca7a7a86413c5bb6199a276d289722eb81fbe1a3f2e3803577aaeb1253ec6afbc6d5d5fdb3d22b6f9bfa75c3e384b69afad75183
+EBUILD gr-ieee802154-0.0_p20191006.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
+EBUILD gr-ieee802154-9999.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
index e99620f1b2aa..89e8afbf67b3 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
 	KEYWORDS=""
 else
-	COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569"
+	COMMIT="d3d94023c71af9e6d7721f7412fba88ff5325234"
 	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
@@ -23,15 +23,13 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
-#cppunit is listed in cmake, but only needed for tests and there are no tests
-#	dev-util/cppunit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -40,10 +38,14 @@ src_prepare() {
 	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
 	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
 	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
+	)
 	cmake-utils_src_configure
 }
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
new file mode 100644
index 000000000000..48499a6bf347
--- /dev/null
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="IEEE 802.15.4 ZigBee Transceiver"
+HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
+	KEYWORDS=""
+else
+	COMMIT="a3c79af96e18de3eb3a76659e1669a370efccf17"
+	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-libs/gmp
+	sci-libs/volk
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	#although cppunit is not used, it fails if it isn't there, fix it
+	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
+	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
+	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
index e99620f1b2aa..48499a6bf347 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.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=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
 	KEYWORDS=""
 else
-	COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569"
+	COMMIT="a3c79af96e18de3eb3a76659e1669a370efccf17"
 	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
@@ -23,15 +23,15 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
+	dev-libs/gmp
+	sci-libs/volk
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
-#cppunit is listed in cmake, but only needed for tests and there are no tests
-#	dev-util/cppunit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -40,10 +40,19 @@ src_prepare() {
 	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
 	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
 	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
+	)
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index b54aa8912b65..69cebe5eca97 100644
--- a/net-wireless/gr-iio/Manifest
+++ b/net-wireless/gr-iio/Manifest
@@ -1,4 +1,6 @@
 DIST gr-iio-0.3.tar.gz 55090 BLAKE2B 3c89567a921e79261434eefb0706a53e10553aaecd4b6f913e3cadd8714b1d5a089b0ff0d66e9815825d57e21050a4a726a3d095eacda634f8434ab6e4726224 SHA512 2618790f5e1a56af2bcb045871f27d8d5ef37c8708e84dd413ce8e5094bb72d59f7b37798ab0c3ab0bc56d70baeb77bae26f5e1125e1a2d251396e84ea6cde02
-EBUILD gr-iio-0.3-r2.ebuild 789 BLAKE2B 3bfd3e8b59f16c7c68840a1fcb4741ff29e1d48e08d1ceb0f39b9f9f8ca7dcf201cceeedad2b935d2c5c4bd8516e6363a3faee350150dbc541fc014d01b556b2 SHA512 e33665008b48fc3473516ccc5682f309de134e2e3f7d76842931fbdf52990ee532fb6dbbc0c9f702f749828ade080eaedd90612e5ba8630f0c269b81b8cae50e
-EBUILD gr-iio-9999.ebuild 789 BLAKE2B 3bfd3e8b59f16c7c68840a1fcb4741ff29e1d48e08d1ceb0f39b9f9f8ca7dcf201cceeedad2b935d2c5c4bd8516e6363a3faee350150dbc541fc014d01b556b2 SHA512 e33665008b48fc3473516ccc5682f309de134e2e3f7d76842931fbdf52990ee532fb6dbbc0c9f702f749828ade080eaedd90612e5ba8630f0c269b81b8cae50e
+DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c
+EBUILD gr-iio-0.3-r3.ebuild 787 BLAKE2B 09d0be1cc71419bd6860607576addfde2c65eff09cc7f60182467dcee686d6a044fe033a653b1db27971d68eee94a6ba7c4f6f7827ecc08191798a0f50a89938 SHA512 688f3b54237474f15eaa535b37025c0173cfd5034d78ef30524634700182a464f35f6c3805bf03cbc2de693a3dc0a902e475b61cc3c3894685fd4af7fb1d24ef
+EBUILD gr-iio-0.3_p20191219-r1.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
+EBUILD gr-iio-9999.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
 MISC metadata.xml 434 BLAKE2B 565c3b42597436890ea7bc2d5b13d16720480e8932878c73bc3efe0708ca6ad2e900b7595248dfc0e25fbca17ad3f216bdfc02c0f29519013db5ac8137a09a7c SHA512 1e970d2cfc935f25ad3cde099739a9574c8bcae6a4e8c59d7aba6bd01319155d9bfc80124d2dad649f24aa7a937bdad7cc843525282f72b10e5e999eca7a4f49
diff --git a/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild b/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
index ed62ac0d9684..cc5dd36528ff 100644
--- a/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
+++ b/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -22,7 +22,7 @@ SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7.0:=
+	=net-wireless/gnuradio-3.7*:=
 	dev-libs/boost:=
 	net-libs/libiio:=
 	net-libs/libad9361-iio:="
diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
new file mode 100644
index 000000000000..b86aad9b816d
--- /dev/null
+++ b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="GNU Radio IIO Blocks"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
+	EGIT_BRANCH="upgrade-3.8"
+	inherit git-r3
+	KEYWORDS=""
+else
+	COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb"
+	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	=net-wireless/gnuradio-3.8*:=
+	dev-libs/boost:=
+	net-libs/libiio:=
+	dev-libs/gmp
+	sci-libs/volk
+	net-libs/libad9361-iio:="
+
+DEPEND="${RDEPEND}
+	sys-devel/flex:=
+	sys-devel/bison:=
+	dev-util/cppunit:=
+	dev-lang/swig:0"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild
index ed62ac0d9684..b86aad9b816d 100644
--- a/net-wireless/gr-iio/gr-iio-9999.ebuild
+++ b/net-wireless/gr-iio/gr-iio-9999.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="GNU Radio IIO Blocks"
 HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
+	EGIT_BRANCH="upgrade-3.8"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb"
+	SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="GPL-3+"
@@ -22,9 +25,11 @@ SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7.0:=
+	=net-wireless/gnuradio-3.8*:=
 	dev-libs/boost:=
 	net-libs/libiio:=
+	dev-libs/gmp
+	sci-libs/volk
 	net-libs/libad9361-iio:="
 
 DEPEND="${RDEPEND}
@@ -32,3 +37,8 @@ DEPEND="${RDEPEND}
 	sys-devel/bison:=
 	dev-util/cppunit:=
 	dev-lang/swig:0"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index ad4fed5e84b7..d5240d4f0ee5 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,4 +1,6 @@
-DIST gr-iqbal-0.37.2.tar.xz 71340 BLAKE2B 1605c520a7ff0088a24ea79e181b36261cdf849438aa3ef4a499228a372297017d3bbc4c96279f9b1bceb7b690aa7b6081b6e970a337e03c766dab5149fff199 SHA512 00037a535219ebe3b5244d4a09355cc74bf17aa6a935bff135e9d7c7c7f6bc1c8b7a29edc02132dbacda2c41efa3613c09e6fdc222472e58d88c4c076736842e
-EBUILD gr-iqbal-0.37.2.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
-EBUILD gr-iqbal-9999.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
+DIST gr-iqbal-0.37.3.tar.gz 105924 BLAKE2B 25eddc718e2b6d5c679a0d6f199d9d49ff69b535502bf9449d7561ae8c172014a5058cee7ef692a36ec518408747d63d01a23c963f45a5d4b5f58175c49f5bbc SHA512 04ac24e2cc8ebf458088e4d8b005818d3f2496fdc801779dc276c21ee751520039078d5157022a886494f8d62b586d69c703e83fb0539e775ce95e3ca34cf374
+DIST gr-iqbal-0.38.1.tar.gz 106392 BLAKE2B 009f36dcf34127e80d8afa91196906a2b2dc8696dd16f9e7d6d9011d9baf2e4c2dfac78eb1acabcbe52dd88ce08b15f8da407b141585f2c60fd63549218576e0 SHA512 b2f74bba560478b746ad1b11d70202fa2d396462f4806918379543fc69a915346745b34f9ffb2914091ec677295f6f378a5b22641c26aa37c5e23092623b5cee
+EBUILD gr-iqbal-0.37.3.ebuild 708 BLAKE2B b02d0481770d6b05038a0eec9b5f69bcb02866e6436229f523cc204faace02ba17f0350e3ecff4d3827d3a10e6d3ada25a7fb16523f81ef268ec29df5002f2fe SHA512 d93be823cf734ce2a96aa0fe7ea4a25dc590c1fd90f5320caf340b9dfda90c2da1108d5b0195dd6ea3a949ca1d38b194ab32f60d6fb65147ef158d9dbf6cf1e1
+EBUILD gr-iqbal-0.38.1.ebuild 912 BLAKE2B 17d764c21c903e23d26cea4865452b10c306201eede2f0c72efa84465711da79bf9c90e9218bf8f716017e0334cb94324b43ed647d45ec16e422517e20c82278 SHA512 73a7ef378432c2b9cc7ecf738fbc3dd8460c07f67ab646b164205253ed09ace59fa06cfba0aa6ecec7c29123b2396ee6e0db79e40f28192bf44fcccc79163dc4
+EBUILD gr-iqbal-9999.ebuild 912 BLAKE2B 17d764c21c903e23d26cea4865452b10c306201eede2f0c72efa84465711da79bf9c90e9218bf8f716017e0334cb94324b43ed647d45ec16e422517e20c82278 SHA512 73a7ef378432c2b9cc7ecf738fbc3dd8460c07f67ab646b164205253ed09ace59fa06cfba0aa6ecec7c29123b2396ee6e0db79e40f28192bf44fcccc79163dc4
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
index 1ed8501d81d5..c1920c8ed5ed 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -11,11 +11,9 @@ HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.osmocom.org/gr-iqbal"
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
 else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -23,9 +21,9 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
new file mode 100644
index 000000000000..716aaa6176fc
--- /dev/null
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8})
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="gnuradio I/Q balancing"
+HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
+else
+	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	net-libs/libosmo-dsp:=
+	dev-libs/boost:=
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN="$(usex doc)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index 1ed8501d81d5..716aaa6176fc 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.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=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8})
 
 inherit cmake-utils python-single-r1
 
@@ -11,21 +11,31 @@ HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.osmocom.org/gr-iqbal"
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
 else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE=""
+IUSE="doc"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN="$(usex doc)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 73da69406661..c43557d7aff7 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,6 @@
-AUX csete-iio.patch 18603 BLAKE2B 437bc8318e88090012cfc98a1b5910ade54b191abb6cb96ea82ba1974c68682477d7429489546fca21ce19d3b9042d6321146d34c0cf8bf94f591bf8da576a39 SHA512 b8c41a1df12a1a74a4d491e694e89d9de753791a433da4d8451c2b20a3e448312316cf66b8bd7d2c1445d91e483331c4328e0acc738fc0dc61ab98b30d48a14a
-DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
 DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
-EBUILD gr-osmosdr-0.1.4_p20180626-r5.ebuild 2205 BLAKE2B 4120f8b37dca5a30a842b6a6d37ce8dd36b04ac8bb55a034b6578bc3fa089962041bdf948ff06e1c8f0004076d8f4e094c9d6e1d8aa04908511f0e49d0c87642 SHA512 6954a1bba9e4f3f5010722e095803c00ff2125d03ba806f255546d655d25eb89ba88c485aeead5cd8505a1cdbee64dab04b521d62f5140b84d912b6a236794d3
-EBUILD gr-osmosdr-0.1.5.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
-EBUILD gr-osmosdr-9999.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
-MISC metadata.xml 1064 BLAKE2B 5f01d598ec69e9f78d594a33487b58242049b020461fbae3e2eaf51d4d894c01c9bc73af28b101bc855e09567c16176d56fbe52b77b7cb719ce2d8ef3f6459a9 SHA512 8f4b7a3cbdf0b0edb3e707cb8c44d5e40e72dc87d36312865647996181c419f4a67c6783110abbdb150264ca9e49cca3264ba39098acf0b05955dff3fdf29072
+DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B 036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1 SHA512 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
+EBUILD gr-osmosdr-0.1.5-r1.ebuild 1926 BLAKE2B a61337ac088431d18e5e2bd04b0bcf8c60b1519e07c0b86a61dbb23e74346796fdf1ff6a16258365f88f2bab3628934fafd8774d728c5f50befb2d68e3f9a5ce SHA512 3ebb20e9c58fd195b6c59d885cd0f4f6cc88af32dabd0cc2da2567eb0aa997cdbf72b616ad375350faa43c87bc3c4baae7dc3160d8e80c468bd47985c7c4383c
+EBUILD gr-osmosdr-0.2.0.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
+EBUILD gr-osmosdr-9999.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
+MISC metadata.xml 965 BLAKE2B 6dbc466abe93e1ffef58f8f07ac4326ced3e9399c86fcb3135c16293065d0c9dfca6584e527b1d60f4fbaee6322ff6ed7a5c5a8ae20c8f985d0488a94352e8ea SHA512 2c744ddfec67ffd438ea76afc037e6ff7480d5349b63e00ac74dff191f33f3f9ecde08ee167b568b64a7dea33d3efbf67be582f1613bd8f8a5e0d29275a8da77
diff --git a/net-wireless/gr-osmosdr/files/csete-iio.patch b/net-wireless/gr-osmosdr/files/csete-iio.patch
deleted file mode 100644
index 678a8599d058..000000000000
--- a/net-wireless/gr-osmosdr/files/csete-iio.patch
+++ /dev/null
@@ -1,640 +0,0 @@
-From 0eaf819be8a40896dfc3d810685a609a867a42e9 Mon Sep 17 00:00:00 2001
-From: Alexandru Csete <oz9aec@gmail.com>
-Date: Mon, 13 Feb 2017 01:05:50 +0100
-Subject: [PATCH] Add PlutoSDR source through gr-iio
-
----
- CMakeLists.txt                      |   1 +
- cmake/Modules/FindGnuradioIIO.cmake |  34 ++++
- cmake/Modules/FindIIO.cmake         |  28 +++
- lib/CMakeLists.txt                  |   8 +
- lib/config.h.in                     |   1 +
- lib/device.cc                       |   8 +
- lib/plutosdr/CMakeLists.txt         |  39 +++++
- lib/plutosdr/plutosdr_source_c.cc   | 262 ++++++++++++++++++++++++++++
- lib/plutosdr/plutosdr_source_c.h    | 105 +++++++++++
- lib/source_impl.cc                  |  18 ++
- 10 files changed, 504 insertions(+)
- create mode 100644 cmake/Modules/FindGnuradioIIO.cmake
- create mode 100644 cmake/Modules/FindIIO.cmake
- create mode 100644 lib/plutosdr/CMakeLists.txt
- create mode 100644 lib/plutosdr/plutosdr_source_c.cc
- create mode 100644 lib/plutosdr/plutosdr_source_c.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 296456d..7871f39 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -159,6 +159,7 @@ endif()
- find_package(GnuradioIQBalance)
- find_package(UHD)
- find_package(GnuradioUHD)
-+find_package(GnuradioIIO)
- find_package(GnuradioFCD)
- find_package(GnuradioFCDPP)
- find_package(LibOsmoSDR)
-diff --git a/cmake/Modules/FindGnuradioIIO.cmake b/cmake/Modules/FindGnuradioIIO.cmake
-new file mode 100644
-index 0000000..d3c011a
---- /dev/null
-+++ b/cmake/Modules/FindGnuradioIIO.cmake
-@@ -0,0 +1,34 @@
-+INCLUDE(FindPkgConfig)
-+PKG_CHECK_MODULES(PC_GNURADIO_IIO gnuradio-iio)
-+
-+FIND_PATH(
-+    GNURADIO_IIO_INCLUDE_DIRS
-+    NAMES gnuradio/iio/api.h
-+    HINTS $ENV{GNURADIO_IIO_DIR}/include
-+        ${PC_GNURADIO_IIO_INCLUDEDIR}
-+    PATHS /usr/local/include
-+          /usr/include
-+)
-+
-+FIND_LIBRARY(
-+    GNURADIO_IIO_LIBRARIES
-+    NAMES gnuradio-iio
-+    HINTS $ENV{GNURADIO_IIO_DIR}/lib
-+        ${PC_GNURADIO_IIO_LIBDIR}
-+    PATHS /usr/local/lib
-+          /usr/local/lib64
-+          /usr/lib
-+          /usr/lib64
-+)
-+
-+if(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+  set(GNURADIO_IIO_FOUND TRUE CACHE INTERNAL "gnuradio-iio found")
-+  message(STATUS "Found gnuradio-iio: ${GNURADIO_IIO_INCLUDE_DIRS}, ${GNURADIO_IIO_LIBRARIES}")
-+else(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+  set(GNURADIO_IIO_FOUND FALSE CACHE INTERNAL "gnuradio-iio found")
-+  message(STATUS "gnuradio-iio not found.")
-+endif(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_IIO DEFAULT_MSG GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
-+MARK_AS_ADVANCED(GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
-diff --git a/cmake/Modules/FindIIO.cmake b/cmake/Modules/FindIIO.cmake
-new file mode 100644
-index 0000000..bb87a4b
---- /dev/null
-+++ b/cmake/Modules/FindIIO.cmake
-@@ -0,0 +1,28 @@
-+########################################################################
-+# Find the IIO userspace library
-+########################################################################
-+
-+INCLUDE(FindPkgConfig)
-+PKG_CHECK_MODULES(PC_IIO iio)
-+
-+FIND_PATH(
-+    IIO_INCLUDE_DIRS
-+    NAMES iio.h
-+    HINTS $ENV{IIO_DIR}/include
-+        ${PC_IIO_INCLUDEDIR}
-+    PATHS /usr/local/include
-+          /usr/include
-+)
-+
-+FIND_LIBRARY(
-+    IIO_LIBRARIES
-+    NAMES iio
-+    HINTS $ENV{IIO_DIR}/lib
-+        ${PC_IIO_LIBDIR}
-+    PATHS /usr/local/lib
-+          /usr/lib
-+)
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(IIO DEFAULT_MSG IIO_LIBRARIES IIO_INCLUDE_DIRS)
-+MARK_AS_ADVANCED(IIO_LIBRARIES IIO_INCLUDE_DIRS)
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index c05b8d9..936d84b 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -174,6 +174,14 @@ if(ENABLE_UHD)
- GR_INCLUDE_SUBDIRECTORY(uhd)
- endif(ENABLE_UHD)
- 
-+########################################################################
-+# Setup IIO component
-+########################################################################
-+GR_REGISTER_COMPONENT("IIO Devices" ENABLE_IIO GNURADIO_IIO_FOUND)
-+if(ENABLE_IIO)
-+GR_INCLUDE_SUBDIRECTORY(plutosdr)
-+endif(ENABLE_IIO)
-+
- ########################################################################
- # Setup MiriSDR component
- ########################################################################
-diff --git a/lib/config.h.in b/lib/config.h.in
-index 42e72f1..0fe2731 100644
---- a/lib/config.h.in
-+++ b/lib/config.h.in
-@@ -10,6 +10,7 @@
- #cmakedefine ENABLE_RTL
- #cmakedefine ENABLE_RTL_TCP
- #cmakedefine ENABLE_UHD
-+#cmakedefine ENABLE_IIO
- #cmakedefine ENABLE_MIRI
- #cmakedefine ENABLE_SDRPLAY
- #cmakedefine ENABLE_HACKRF
-diff --git a/lib/device.cc b/lib/device.cc
-index 025a22b..77b271f 100644
---- a/lib/device.cc
-+++ b/lib/device.cc
-@@ -54,6 +54,10 @@
- #include <uhd_source_c.h>
- #endif
- 
-+#ifdef ENABLE_IIO
-+#include <plutosdr_source_c.h>
-+#endif
-+
- #ifdef ENABLE_MIRI
- #include <miri_source_c.h>
- #endif
-@@ -162,6 +166,10 @@ devices_t device::find(const device_t &hint)
-   BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
-     devices.push_back( device_t(dev) );
- #endif
-+#ifdef ENABLE_IIO
-+  BOOST_FOREACH( std::string dev, plutosdr_source_c::get_devices() )
-+    devices.push_back( device_t(dev) );
-+#endif
- #ifdef ENABLE_MIRI
-   BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
-     devices.push_back( device_t(dev) );
-diff --git a/lib/plutosdr/CMakeLists.txt b/lib/plutosdr/CMakeLists.txt
-new file mode 100644
-index 0000000..b335885
---- /dev/null
-+++ b/lib/plutosdr/CMakeLists.txt
-@@ -0,0 +1,39 @@
-+# Copyright 2012 Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Radio
-+#
-+# GNU Radio is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GNU Radio is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Radio; see the file COPYING.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street,
-+# Boston, MA 02110-1301, USA.
-+
-+########################################################################
-+# This file included, use CMake directory variables
-+########################################################################
-+
-+include_directories(
-+    ${CMAKE_CURRENT_SOURCE_DIR}
-+    ${GNURADIO_IIO_INCLUDE_DIRS}
-+    ${IIO_INCLUDE_DIRS}
-+)
-+
-+set(iio_srcs
-+#    ${CMAKE_CURRENT_SOURCE_DIR}/iio_sink_c.cc
-+    ${CMAKE_CURRENT_SOURCE_DIR}/plutosdr_source_c.cc
-+)
-+
-+########################################################################
-+# Append gnuradio-osmosdr library sources
-+########################################################################
-+list(APPEND gr_osmosdr_srcs ${iio_srcs})
-+list(APPEND gr_osmosdr_libs ${GNURADIO_IIO_LIBRARIES} ${IIO_LIBRARIES})
-diff --git a/lib/plutosdr/plutosdr_source_c.cc b/lib/plutosdr/plutosdr_source_c.cc
-new file mode 100644
-index 0000000..009d4b2
---- /dev/null
-+++ b/lib/plutosdr/plutosdr_source_c.cc
-@@ -0,0 +1,262 @@
-+/* -*- c++ -*- */
-+/*
-+ * Copyright 2017 Dimitri Stolnikov <horiz0n@gmx.net>
-+ *
-+ * GNU Radio is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3, or (at your option)
-+ * any later version.
-+ *
-+ * GNU Radio is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with GNU Radio; see the file COPYING.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street,
-+ * Boston, MA 02110-1301, USA.
-+ */
-+#include <boost/assign.hpp>
-+#include <iostream>
-+
-+#include "arg_helpers.h"
-+#include "osmosdr/source.h"
-+#include "plutosdr_source_c.h"
-+
-+using namespace boost::assign;
-+
-+plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args)
-+{
-+  return gnuradio::get_initial_sptr(new plutosdr_source_c(args));
-+}
-+
-+plutosdr_source_c::plutosdr_source_c(const std::string &args) :
-+    gr::hier_block2("plutosdr_source_c",
-+                   gr::io_signature::make(0, 0, 0),
-+                   gr::io_signature::make(1, 1, sizeof(gr_complex)))
-+{
-+  uri = "ip:pluto.local";
-+  frequency = 434000000;
-+  samplerate = 2500000;
-+  decimation = 0;
-+  bandwidth = 2000000;
-+  buffer_size = 0x4000;
-+  quadrature = true;
-+  rfdc = true;
-+  bbdc = true;
-+  gain_auto = false;
-+  gain_value = 50;
-+  filter = "";
-+  filter_auto = true;
-+  _freq_corr = 0.0;
-+
-+  dict_t dict = params_to_dict(args);
-+  if (dict.count("uri"))
-+    uri = boost::lexical_cast< std::string >( dict["uri"] );
-+
-+  std::cerr << "Using PlutoSDR URI = " << uri << std::endl;
-+
-+  _src = gr::iio::pluto_source::make(uri, frequency, samplerate,
-+                                     bandwidth, buffer_size,
-+                                     quadrature, rfdc, bbdc,
-+                                     "manual", gain_value,
-+                                     filter.c_str(), filter_auto);
-+
-+  connect( _src, 0, self(), 0 );
-+}
-+
-+plutosdr_source_c::~plutosdr_source_c()
-+{
-+}
-+
-+std::vector< std::string > plutosdr_source_c::get_devices()
-+{
-+  std::vector< std::string > devices;
-+
-+  std::string args = "plutosdr,label='PlutoSDR'";
-+
-+  devices.push_back( args );
-+
-+  return devices;
-+}
-+
-+std::string plutosdr_source_c::name()
-+{
-+  return "PlutoSDR";
-+}
-+
-+size_t plutosdr_source_c::get_num_channels()
-+{
-+  return output_signature()->max_streams();
-+}
-+
-+osmosdr::meta_range_t plutosdr_source_c::get_sample_rates( void )
-+{
-+  osmosdr::meta_range_t rates;
-+
-+  rates += osmosdr::range_t( 2500000 );
-+  rates += osmosdr::range_t( 5000000 );
-+  rates += osmosdr::range_t( 10000000 );
-+  rates += osmosdr::range_t( 20000000 );
-+
-+  return rates;
-+}
-+
-+double plutosdr_source_c::set_sample_rate( double rate )
-+{
-+  samplerate = (unsigned long) rate;
-+  set_params();
-+
-+  return samplerate;
-+}
-+
-+double plutosdr_source_c::get_sample_rate( void )
-+{
-+  return samplerate;
-+}
-+
-+osmosdr::freq_range_t plutosdr_source_c::get_freq_range( size_t chan )
-+{
-+  osmosdr::freq_range_t range;
-+
-+  range += osmosdr::range_t( 70.0e6, 6000.0e6, 1.0 );
-+
-+  return range;
-+}
-+
-+double plutosdr_source_c::set_center_freq( double freq, size_t chan )
-+{
-+  frequency = (unsigned long long) freq;
-+  set_params();
-+
-+  return freq;
-+}
-+
-+double plutosdr_source_c::get_center_freq( size_t chan )
-+{
-+  return frequency;
-+}
-+
-+double plutosdr_source_c::set_freq_corr( double ppm, size_t chan)
-+{
-+  _freq_corr = ppm;
-+  set_params();
-+
-+  return ppm;
-+}
-+
-+double plutosdr_source_c::get_freq_corr( size_t chan)
-+{
-+  return _freq_corr;
-+}
-+
-+std::vector<std::string> plutosdr_source_c::get_gain_names( size_t chan )
-+{
-+  std::vector< std::string > gains;
-+
-+  gains.push_back( "RF" );
-+
-+  return gains;
-+}
-+
-+osmosdr::gain_range_t plutosdr_source_c::get_gain_range( size_t chan)
-+{
-+  osmosdr::gain_range_t range;
-+  range += osmosdr::range_t( -10, 77, 1 );   // https://wiki.analog.com/resources/tools-software/linux-drivers/iio-transceiver/ad9361#rx_gain_control
-+
-+  return range;
-+}
-+
-+osmosdr::gain_range_t plutosdr_source_c::get_gain_range( const std::string & name,
-+                                                         size_t chan)
-+{
-+  osmosdr::gain_range_t range;
-+
-+  range += osmosdr::range_t( -10, 77, 1 );
-+
-+  return range;
-+}
-+
-+bool plutosdr_source_c::set_gain_mode( bool automatic, size_t chan )
-+{
-+  gain_auto = automatic;
-+  set_params();
-+
-+  return automatic;
-+}
-+
-+bool plutosdr_source_c::get_gain_mode( size_t chan )
-+{
-+  return gain_auto;
-+}
-+
-+double plutosdr_source_c::set_gain( double gain, size_t chan )
-+{
-+  gain_value = gain;
-+  set_params();
-+
-+  return gain;
-+}
-+
-+double plutosdr_source_c::set_gain( double gain, const std::string & name, size_t chan )
-+{
-+  gain_value = gain;
-+  set_params();
-+
-+  return gain;
-+}
-+
-+double plutosdr_source_c::get_gain( size_t chan )
-+{
-+  return gain_value;
-+}
-+
-+double plutosdr_source_c::get_gain( const std::string & name, size_t chan )
-+{
-+  return gain_value;
-+}
-+
-+std::vector< std::string > plutosdr_source_c::get_antennas( size_t chan )
-+{
-+  std::vector< std::string > antennas;
-+
-+  antennas += get_antenna( chan );
-+
-+  return antennas;
-+}
-+
-+std::string plutosdr_source_c::set_antenna( const std::string & antenna, size_t chan )
-+{
-+  return get_antenna( chan );
-+}
-+
-+std::string plutosdr_source_c::get_antenna( size_t chan )
-+{
-+  return "A_BALANCED";
-+}
-+
-+double plutosdr_source_c::set_bandwidth( double bw, size_t chan )
-+{
-+  if (bw == 0.0)
-+    bw = 0.8 * samplerate;  // auto bandwidth
-+
-+  bandwidth = (unsigned long)bw;
-+  set_params();
-+  return bandwidth;
-+}
-+
-+double plutosdr_source_c::get_bandwidth( size_t chan )
-+{
-+  return bandwidth;
-+}
-+
-+void plutosdr_source_c::set_params( void )
-+{
-+  unsigned long long freq = ((double)frequency * (1.0 + _freq_corr * 0.000001));
-+
-+  // FIXME: gain_mode string can be manual / slow_attack / fast_attack / hybrid
-+  _src->set_params( freq, samplerate, bandwidth, quadrature, rfdc, bbdc,
-+                    gain_auto ? "fast_attack" : "manual", gain_value,
-+                    filter.c_str(), filter_auto );
-+}
-diff --git a/lib/plutosdr/plutosdr_source_c.h b/lib/plutosdr/plutosdr_source_c.h
-new file mode 100644
-index 0000000..efac91f
---- /dev/null
-+++ b/lib/plutosdr/plutosdr_source_c.h
-@@ -0,0 +1,105 @@
-+/* -*- c++ -*- */
-+/*
-+ * Copyright 2017 Dimitri Stolnikov <horiz0n@gmx.net>
-+ *
-+ * GNU Radio is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3, or (at your option)
-+ * any later version.
-+ *
-+ * GNU Radio is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with GNU Radio; see the file COPYING.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street,
-+ * Boston, MA 02110-1301, USA.
-+ */
-+#ifndef PLUTOSDR_SOURCE_C_H
-+#define PLUTOSDR_SOURCE_C_H
-+
-+#include <gnuradio/blocks/float_to_complex.h>
-+#include <gnuradio/blocks/short_to_float.h>
-+#include <gnuradio/hier_block2.h>
-+#include <gnuradio/iio/pluto_source.h>
-+
-+#include "source_iface.h"
-+
-+class plutosdr_source_c;
-+
-+typedef boost::shared_ptr< plutosdr_source_c > plutosdr_source_c_sptr;
-+
-+plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args = "");
-+
-+class plutosdr_source_c :
-+    public gr::hier_block2,
-+    public source_iface
-+{
-+private:
-+  friend plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args);
-+
-+  plutosdr_source_c(const std::string &args);
-+
-+public:
-+  ~plutosdr_source_c();
-+
-+  static std::vector< std::string > get_devices();
-+
-+  std::string name();
-+
-+  size_t get_num_channels( void );
-+
-+  osmosdr::meta_range_t get_sample_rates( void );
-+  double set_sample_rate( double rate );
-+  double get_sample_rate( void );
-+
-+  osmosdr::freq_range_t get_freq_range( size_t chan = 0 );
-+  double set_center_freq( double freq, size_t chan = 0 );
-+  double get_center_freq( size_t chan = 0 );
-+
-+  double set_freq_corr( double ppm, size_t chan = 0 );
-+  double get_freq_corr( size_t chan = 0 );
-+
-+  std::vector<std::string> get_gain_names( size_t chan = 0 );
-+  osmosdr::gain_range_t get_gain_range( size_t chan = 0 );
-+  osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 );
-+  bool set_gain_mode( bool automatic, size_t chan = 0 );
-+  bool get_gain_mode( size_t chan = 0 );
-+  double set_gain( double gain, size_t chan = 0 );
-+  double set_gain( double gain, const std::string & name, size_t chan = 0 );
-+  double get_gain( size_t chan = 0 );
-+  double get_gain( const std::string & name, size_t chan = 0 );
-+
-+  std::vector< std::string > get_antennas( size_t chan = 0 );
-+  std::string set_antenna( const std::string & antenna, size_t chan = 0 );
-+  std::string get_antenna( size_t chan = 0 );
-+
-+  double set_bandwidth( double bw, size_t chan = 0 );
-+  double get_bandwidth( size_t chan = 0 );
-+
-+private:
-+
-+  void set_params(void);
-+
-+  gr::iio::pluto_source::sptr       _src;
-+
-+  std::string   uri;
-+  unsigned long long frequency;
-+  unsigned long samplerate;
-+  unsigned long decimation;
-+  unsigned long bandwidth;
-+  unsigned long buffer_size;
-+  bool quadrature;
-+  bool rfdc;
-+  bool bbdc;
-+  bool          gain_auto;
-+  double        gain_value;
-+  std::string   filter;
-+  bool          filter_auto;
-+
-+  double _freq_corr;
-+};
-+
-+#endif // PLUTOSDR_SOURCE_C_H
-diff --git a/lib/source_impl.cc b/lib/source_impl.cc
-index a28f314..2a153bc 100644
---- a/lib/source_impl.cc
-+++ b/lib/source_impl.cc
-@@ -56,6 +56,10 @@
- #include <uhd_source_c.h>
- #endif
- 
-+#ifdef ENABLE_IIO
-+#include <plutosdr_source_c.h>
-+#endif
-+
- #ifdef ENABLE_MIRI
- #include <miri_source_c.h>
- #endif
-@@ -144,6 +148,9 @@ source_impl::source_impl( const std::string &args )
- #ifdef ENABLE_UHD
-   dev_types.push_back("uhd");
- #endif
-+#ifdef ENABLE_IIO
-+  dev_types.push_back("plutosdr");
-+#endif
- #ifdef ENABLE_MIRI
-   dev_types.push_back("miri");
- #endif
-@@ -216,6 +223,10 @@ source_impl::source_impl( const std::string &args )
-     BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
-       dev_list.push_back( dev );
- #endif
-+#ifdef ENABLE_IIO
-+    BOOST_FOREACH( std::string dev, plutosdr_source_c::get_devices() )
-+      dev_list.push_back( dev );
-+#endif
- #ifdef ENABLE_MIRI
-     BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
-       dev_list.push_back( dev );
-@@ -316,6 +327,13 @@ source_impl::source_impl( const std::string &args )
-     }
- #endif
- 
-+#ifdef ENABLE_IIO
-+    if ( dict.count("plutosdr") ) {
-+      plutosdr_source_c_sptr src = make_plutosdr_source_c( arg );
-+      block = src; iface = src.get();
-+    }
-+#endif
-+
- #ifdef ENABLE_MIRI
-     if ( dict.count("miri") ) {
-       miri_source_c_sptr src = make_miri_source_c( arg );
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
index 69775452090e..53e6a3392760 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
@@ -23,7 +23,7 @@ IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uh
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.7*:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
index eb6cdd6fe1d5..f77ffadc343b 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.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=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -11,51 +11,41 @@ HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
 else
-	#SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
-	#git clone git://git.osmocom.org/gr-osmosdr.git
-	#cd gr-osmosdr
-	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/volk
+	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
-	iio? ( net-wireless/gr-iio )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-src_prepare() {
-	eapply "${FILESDIR}/csete-iio.patch"
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
+		-DENABLE_AIRSPY="$(usex airspy)"
 		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_FCD="$(usex fcd)"
 		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IIO="$(usex iio)"
 		-DENABLE_IQBALANCE="$(usex iqbalance)"
 		-DENABLE_MIRI="$(usex mirisdr)"
 		-DENABLE_PYTHON="$(usex python)"
@@ -74,5 +64,7 @@ src_install() {
 	cmake-utils_src_install
 	if use python; then
 		python_fix_shebang "${ED}"/usr/bin
+		python_optimize
 	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 69775452090e..f77ffadc343b 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -19,11 +19,12 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/volk
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
@@ -33,8 +34,7 @@ RDEPEND="${PYTHON_DEPS}
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -45,7 +45,6 @@ src_configure() {
 		-DENABLE_FILE=ON
 		-DENABLE_AIRSPY="$(usex airspy)"
 		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_FCD="$(usex fcd)"
 		-DENABLE_HACKRF="$(usex hackrf)"
 		-DENABLE_IQBALANCE="$(usex iqbalance)"
 		-DENABLE_MIRI="$(usex mirisdr)"
@@ -65,5 +64,7 @@ src_install() {
 	cmake-utils_src_install
 	if use python; then
 		python_fix_shebang "${ED}"/usr/bin
+		python_optimize
 	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index daafe681c99c..68a1bf0f0a5c 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -10,7 +10,6 @@
 	<flag name="bladerf">Build with Nuand BladeRF support</flag>
 	<flag name="fcd">Build with Funcube Dongle support</flag>
 	<flag name="hackrf">Build with Great Scott Gadgets HackRF support</flag>
-	<flag name="iio">Build with Industrial IO support for devices such as Analog Devices Pluto</flag>
 	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
 	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
 	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index aa9f2d43f7b2..35b24c2c72ff 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,2 +1,6 @@
-EBUILD gr-paint-9999.ebuild 917 BLAKE2B 03c173165eedabead625e867712e792f48bd99b0fe7a39b0760bebc699458866e1ca7836a063c995a4e3556aff20ee74cf0c7e493a82692d5a3331dbc97561dd SHA512 128a122b5ebd7782a6cf693554730f53931dbc9d0288be192149a06300a56fefb01f4d46610df41c1bb2739ffec6a13a4e7eeaa1a675db22ac30b1c50efc9f16
+DIST gr-paint-0.0_p20200418.tar.gz 2129751 BLAKE2B 8767ff1ec791352dc701d0f7f68bbbd4088073379b4116ff2dbf2120b5e6e9b1a87ba0b0554a8489dc9b93cdb2ea5e3a8596b09482512fd1b10ea25d5b5c0fe9 SHA512 5f52e2baa090ed80d8a5b75846821b47163dcc055b94201fb59788bd85769a4e3f8c18654de45e68cb4088681b2db8b2327b5d14f176872bfe8bb2e01d7b6bfb
+DIST gr-paint-0.0_p20200517.tar.gz 1588114 BLAKE2B dffae6fdd6832ef7a39911b5f20d385e1691021e49659c36244c4aa1086fa74f4f59aceb4f208a24dd76854455183644c8f7db7e6ed0600664dc02f08e6682c5 SHA512 00b508b08baafd02e69197028a6408da81f5d1bf3dfe6d3229f248d60503ccec48f3fa0491bb785ed1ece40ea90d34544bc3b62e4506459488d56540b9d519c2
+EBUILD gr-paint-0.0_p20200418.ebuild 1098 BLAKE2B 1578dfee76801a9d4c8896794771cd913d25e6e700e89b3adfe4acfa72f4c16ea56827e61bb94949f1b50da968ffbe6df544a142d99c1b62b21e4a404ce1d90a SHA512 7fbd7d8090c1bf535702245e15eaaf0192dd9098657e4f918250d5f6957ddda066ea62a028a70df1e184161929802392fb3ea3a0913a3d99e7fcebac2e93287f
+EBUILD gr-paint-0.0_p20200517.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
+EBUILD gr-paint-9999.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
 MISC metadata.xml 426 BLAKE2B c0655dfe4af8bc17dc267dcadf37625b86e4830bc565044fe43b0911d166a19d6ab56dc73d2ad37890e5d0f83ca52fd078034fd6675310447361cebd2730b704 SHA512 10082af73f8e1acbf8a97062d4802b8ae6a3f187034933c7a14fe932aac3e654b3dde399ec33b3cf174c528ac77d41f2ab75969e39cb6e2f9c343ce52f7d0b64
diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild
new file mode 100644
index 000000000000..d8339979c4e2
--- /dev/null
+++ b/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint.git"
+else
+	COMMIT="e36b2c638061d14f1b3c3bf3e889a8c99c273930"
+	SRC_URI="https://github.com/drmpeg/gr-paint/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64"
+fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Paints monochrome images into the waterfall of a receiver"
+HOMEPAGE="https://github.com/drmpeg/gr-paint"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	=net-wireless/gnuradio-3.7*:=[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick
+"
+BDEPEND="
+	dev-lang/swig
+	dev-util/cppunit
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild
new file mode 100644
index 000000000000..132442bd9f33
--- /dev/null
+++ b/net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint38.git"
+else
+	COMMIT="9cb4eabe3b570ccd1f53837681607d73501b5c1e"
+	SRC_URI="https://github.com/drmpeg/gr-paint38/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}38-${COMMIT}"
+	KEYWORDS="~amd64"
+fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Paints monochrome images into the waterfall of a receiver"
+HOMEPAGE="https://github.com/drmpeg/gr-paint"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+#< drmpeg> What tests?
+RESTRICT="test"
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-libs/gmp
+	sci-libs/volk
+	=net-wireless/gnuradio-3.8*:=[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick
+"
+BDEPEND="
+	dev-lang/swig
+	dev-util/cppunit
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-paint/gr-paint-9999.ebuild b/net-wireless/gr-paint/gr-paint-9999.ebuild
index 7f891f888a4e..132442bd9f33 100644
--- a/net-wireless/gr-paint/gr-paint-9999.ebuild
+++ b/net-wireless/gr-paint/gr-paint-9999.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint.git"
+	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint38.git"
 else
-	KEYWORDS=""
+	COMMIT="9cb4eabe3b570ccd1f53837681607d73501b5c1e"
+	SRC_URI="https://github.com/drmpeg/gr-paint38/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}38-${COMMIT}"
+	KEYWORDS="~amd64"
 fi
 inherit cmake-utils python-single-r1
 
@@ -21,12 +24,16 @@ SLOT="0"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+#< drmpeg> What tests?
+RESTRICT="test"
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
-	net-wireless/gnuradio:=[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/gmp
+	sci-libs/volk
+	=net-wireless/gnuradio-3.8*:=[${PYTHON_SINGLE_USEDEP}]
 "
 RDEPEND="${DEPEND}
 	media-gfx/imagemagick
@@ -45,3 +52,8 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize
+}
diff --git a/net-wireless/hostap-utils/Manifest b/net-wireless/hostap-utils/Manifest
index eb184b4c5d5f..a32e9178c884 100644
--- a/net-wireless/hostap-utils/Manifest
+++ b/net-wireless/hostap-utils/Manifest
@@ -1,4 +1,4 @@
 AUX hostap-utils-0.4.7-makefile.patch 860 BLAKE2B e1f27d3da73e6cf0c9a6b2eb7ebf738e8dc67f0f815edceb8c317472f72abb7e72b29870a2be82e74a35084cb0dbc12eec5e11a6770baeb3d0a4295db40b7ac9 SHA512 a84f1c078538b6df6542b67e71e0ec97e7d3cd2624f0cbd56e5ff6f976b0504f4f0e2b6fd148148d36133aaa406fb31acde7d45d1e1c2f25f015c430128b97f0
 DIST hostap-utils-0.4.7.tar.gz 60782 BLAKE2B 6e56488df1bde9de13724df39606a8eb125a67d9f1b14e80fd58cc8ff5c5fd703713e565db49d82d00acacc0275c9ca38d38d81a026ccc30d27db82bf3d351a8 SHA512 1a54c5d84b02d2dc96c33d6463af775212e09a20ac85367184636d364f17a09e48f937417dd9c43148663d242b3fc5f2f13835ec5331bd0600ef31797c414d44
-EBUILD hostap-utils-0.4.7-r1.ebuild 606 BLAKE2B 02cc2fe590dbb87faf75a8e04badbf9c65357c66f15b17465a57934f714bbfbea69efc669998b4eaf0146d0261a83b5a59c36c03c334b8e3eb61543d34d17d77 SHA512 529434d9594023ecbaeae3c57d377ec49ff01889d88d64126f268483790fb22dc8cbad59c4a17c59b7db550e4ce0b5971837713ef106005d24eb355d88424dd5
+EBUILD hostap-utils-0.4.7-r1.ebuild 608 BLAKE2B 599923bb1a7eb7e452483cd9ce502f798c10a9580081d0103e3f51d0e1e18e2d8a1d8abf66dd7cf2c295f85e635a32dd1749440a9165b21fedb6e2c8a8c811c5 SHA512 3e671ea30f0c37092a6091ac82c21b617c7b4f73dbe10a00c685a773428a7b5b3eaf0c85b111513fd8e38b55df5195938306fcc5169464a188dcb97d1efadab3
 MISC metadata.xml 236 BLAKE2B edac1ea2c31bb8a5e334f9ce1ab76a4413aee84aa851f109afec729418c9e8164356c3faf55e1beb0317769da9642e645b94852d92b7cefa67c3a92a28f5cf2e SHA512 d002364fc624df1993a205281bab483edac8d8c5fe9831be50050b1f29fcb6f002a8d55e0aed6eab931f0c934084abe28d5ff922045045c524562006d10ee3af
diff --git a/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild b/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
index 81d045aa4f29..d19fb6ee3ac5 100644
--- a/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
+++ b/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Utilities for Intersil Prism2/2.5/3 based IEEE 802.11b wireless LAN products"
-HOMEPAGE="http://hostap.epitest.fi/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+HOMEPAGE="https://hostap.epitest.fi/"
+SRC_URI="https://hostap.epitest.fi/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 48f3bfd213d3..92d9eb8918d3 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -6,6 +6,6 @@ DIST iwd-1.6.tar.xz 844900 BLAKE2B 97d7162da88f550383ce9b3348b18e4e2e241242d7bf1
 DIST iwd-1.7.tar.xz 846040 BLAKE2B a765513da5482ab5856d1d47c3b302dc65efe3b10f444f263ee11a24df716bb46237aa689538e11dd5b9744cfcf0cd00ff5ab5cd11e37a56c9ad85cf7361b177 SHA512 3012a7725a909737b48c803289513138d057dec3b99f98a7de91eef0eb58e145537809e7ed84afddc4f061d27d5e448f1fc9d6ac2a748d496bf97656baab48ad
 EBUILD iwd-1.5.ebuild 4213 BLAKE2B afe140abb9952750957c147736baa5b23d085e6899a03a814719fcddce419ddda4d76138e79641346c0d71ed2b70c4b4fb3b07cfe768a3beadff435171d28d88 SHA512 b580d7c67914ad4b0a1e99977358d7ccaacc854984c4c066f2bfb23bb54a8b011ff9ea500a5748d78b0ccd5ef658d55051c6a899cb6b0f172badf712e031bc96
 EBUILD iwd-1.6.ebuild 4230 BLAKE2B 209a21ab5524456d539af9164a986a25f367c0b2e380fc98cd88017ebac0f34369832259919afea695b34a9b39e04b637ea3584e78cb60f3b71c9e7dc5a9c073 SHA512 a1a99b605f0393828cea5077b6d4f2babb637e2028b2f41c7e809bb2ed86ec2c4a8e3c9c29e2dff39d9e72af3a258d9e24c723df41a0932b0d50ce0a8be207bc
-EBUILD iwd-1.7.ebuild 4230 BLAKE2B c6ac86e5556991025413dd7e913afa0f608b1d6d4913246a405d4a4aaf929ee7ae62dad03dd9ad3be7d8d6c9588685ec17e70800259effb4453d6802a64bf700 SHA512 77318a4744cf9cadf2792255f6614f369ab02be023f105ab1af769ab69b7091cc0784b2708a7f98c5d70c914f6d0d86340b4511851b483472bf057eac4740d84
+EBUILD iwd-1.7.ebuild 4226 BLAKE2B 7ae02e004aa75abf06901006b5676dfe6c1117dc3a77493d6942fb279d8e40e8422bf78e47f0e6bbc8b4ca3259eaabe4b6215d62efeb6b024aa5b820bb8f3c44 SHA512 307f17869f6aa7e500db35cd419cf731a3b425d587b307400840bdac0ae22157e9fe8b0fe200fbb6268609e7cc83106130d660fe563f3680c6ddd9bd7e0073cb
 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.7.ebuild b/net-wireless/iwd/iwd-1.7.ebuild
index 9dea7bfab825..0855a63e0201 100644
--- a/net-wireless/iwd/iwd-1.7.ebuild
+++ b/net-wireless/iwd/iwd-1.7.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/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index a8f6ef0bfa0c..d864f6fca792 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,6 +1,5 @@
-DIST ubertooth-2018-08-R1.tar.xz 701928 BLAKE2B 031d4178693a4c1734f72d5c7292ba58f0c74b9a57cc1841ecdec286d547994847dc7badabc3efce6eff9a34abe505d942b561bc3291b3cda0f29a42fa7dd340 SHA512 630707583b4fa0683d3f2a40e06697546897e603bd27842886897949ffeaff252d3b34040dee6b8b3319f9bed65eb706f57b885d7a6719fc9cb993e7c1d9c203
+AUX ubertooth-2018.12.1-gcc-10.patch 783 BLAKE2B e0d79ff3217de27b4c04c8e0427c5217753b739d6ce04ddcbb20bb2ce20f64d695fad4b969415bfd3b01232f4b08dcf6d5ec2b1096618e202c6a330903fac3e5 SHA512 4982db0ade9305520764801a9c4f7b3b2df070cfbc1549e766267136740f66fd392cbe8eeac28a5acd0f4196e9dbe3043a6707a07c770955a7b67a803bcbb70f
 DIST ubertooth-2018-12-R1.tar.xz 704208 BLAKE2B 7a17830a0ed417a737d78aa22c5a6a270a67b350a3a5e9a0aebabd4b38547d8d35551e061ea3d5260996f8fe1a366c75c8773d5e3a6abf37a0930f93200da3fc SHA512 409fdb403d6a3fa84b92757e0fd8672b1403ba3d24888fbde4d6d6923d8e0796914c20d38e2fc58909f81fcb8a0b6290bcf91282bb02354c310e6e91ad85e23b
-EBUILD ubertooth-2018.08.1.ebuild 2095 BLAKE2B 581851bcaa23c0b37bcfc1adb7f7125efbf701c8cfe83cb812703fc556e212e368329f3f48f2c6d900471ad128ceee0696642ee7d840f0e9cd4485cfc4b6b94a SHA512 cc3c2a20af082cc9dbdcb59b0054c1050b96447ea493bbc650c49d82154104652b41ff038788b6a69cff99c559d749818576174208e97fa478ffd49728645faa
-EBUILD ubertooth-2018.12.1.ebuild 2095 BLAKE2B 581851bcaa23c0b37bcfc1adb7f7125efbf701c8cfe83cb812703fc556e212e368329f3f48f2c6d900471ad128ceee0696642ee7d840f0e9cd4485cfc4b6b94a SHA512 cc3c2a20af082cc9dbdcb59b0054c1050b96447ea493bbc650c49d82154104652b41ff038788b6a69cff99c559d749818576174208e97fa478ffd49728645faa
-EBUILD ubertooth-9999.ebuild 2095 BLAKE2B 581851bcaa23c0b37bcfc1adb7f7125efbf701c8cfe83cb812703fc556e212e368329f3f48f2c6d900471ad128ceee0696642ee7d840f0e9cd4485cfc4b6b94a SHA512 cc3c2a20af082cc9dbdcb59b0054c1050b96447ea493bbc650c49d82154104652b41ff038788b6a69cff99c559d749818576174208e97fa478ffd49728645faa
+EBUILD ubertooth-2018.12.1.ebuild 2124 BLAKE2B 9355ad729ba26e38a14ef6a115477cc76df7c17fa4f64d992679b943da4b51d000dd4845d4246348abcfbe4f6f3457cd761f1c0a4b384b4dee8c5ca350cc65d8 SHA512 4fe0f94f43e03340bd7a0b6d0cd33ded3c2d9013d74f893158a74344d3c8e21a79dc0cd1003e827c89da3992e50aec319bf9487a4e3dd3a934470f58ea8151d8
+EBUILD ubertooth-9999.ebuild 2077 BLAKE2B 0955fc76aa31f91e02986c5c4b1379ea0beed4f8eaa9306feae2fc7e251bff7cbe79c46b121b1923cfeae247c3886244b7995e6c640852f917db638d1e60f4e2 SHA512 1f9e0ea4a0fed9a8e4c27a4f48496ca840103766cdada2799dec452304a88e41be3f68a4b59b4e9f0eb8ef9185c7f15b06a51cce8a1a5ed611190614d7a0a4eb
 MISC metadata.xml 562 BLAKE2B dea6d366f75fbf852510f4b7204d5b51f5d3e52ef0b55020fe3a67edc486ad757c4b388ed6de36611ba14084e985df57f7986c5cc4e17193a59c546608c6f92d SHA512 b266c4914480613ba2f64519152d73cb7c472755fbd378bd0e547d4e0cf2fe6069636e04bd64fd9c686ff42adcb126118936846d2cbc241f1cc081e28b390400
diff --git a/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch b/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch
new file mode 100644
index 000000000000..b4f25e6b0b8c
--- /dev/null
+++ b/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch
@@ -0,0 +1,23 @@
+From abc1d87631c71fb5bf3be4b81327c66292d852ca Mon Sep 17 00:00:00 2001
+From: Jonas Stein <news@jonasstein.de>
+Date: Sat, 6 Jun 2020 21:11:38 +0200
+Subject: [PATCH] extern packet_counter_max to compile with gcc-10
+
+Fixes: https://github.com/greatscottgadgets/ubertooth/issues/408
+---
+ host/libubertooth/src/ubertooth_callback.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libubertooth/src/ubertooth_callback.c b/libubertooth/src/ubertooth_callback.c
+index a36e3512..adb9934f 100644
+--- a/libubertooth/src/ubertooth_callback.c
++++ b/libubertooth/src/ubertooth_callback.c
+@@ -27,7 +27,7 @@
+ 
+ #include "ubertooth_callback.h"
+ 
+-unsigned int packet_counter_max;
++extern unsigned int packet_counter_max;
+ 
+ static int8_t cc2400_rssi_to_dbm( const int8_t rssi )
+ {
diff --git a/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild b/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
deleted file mode 100644
index 845ee09d3793..000000000000
--- a/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils udev
-
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+bluez static-libs +ubertooth1-firmware +udev"
-
-DEPEND="bluez? ( net-wireless/bluez:= )
-	>=net-libs/libbtbb-${PV}:=[static-libs?]
-	static-libs? ( dev-libs/libusb[static-libs] )
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	udev? ( virtual/udev )"
-
-MY_PV=${PV/\./-}
-MY_PV=${MY_PV/./-R}
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}/host"
-else
-	S="${WORKDIR}/${PN}-${MY_PV}/host"
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"
-
-#readd firmware building, but do it right
-#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_BLUEZ=$(usex bluez)
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DINSTALL_UDEV_RULES=$(usex udev)
-		-DENABLE_PYTHON=false
-	)
-	if use udev; then
-		mycmakeargs+=(
-			-DUDEV_RULES_GROUP=usb
-			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/${PN}
-	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
-	if [[ ${PV} == "9999" ]] ; then
-		ewarn "Firmware isn't available for git releases, we assume you are already"
-		ewarn "on the latest and/or can build your own."
-	else
-		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
-		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
-	fi
-	popd
-
-	elog "Everyone can read from the ubertooth, but to talk to it"
-	elog "your user needs to be in the usb group."
-}
diff --git a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
index 845ee09d3793..32189828f352 100644
--- a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
+++ b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils udev
+inherit cmake udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
@@ -34,6 +34,8 @@ DESCRIPTION="open source wireless development platform suitable for Bluetooth ex
 #readd firmware building, but do it right
 #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
 
+PATCHES=( "${FILESDIR}"/"${P}"-gcc-10.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_BLUEZ=$(usex bluez)
@@ -47,11 +49,11 @@ src_configure() {
 			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /usr/share/${PN}
 	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index 845ee09d3793..4a9603a7e8d4 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils udev
+inherit cmake udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
@@ -47,11 +47,11 @@ src_configure() {
 			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
 		)
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /usr/share/${PN}
 	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 30413b10de47..dcc7ba884f91 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,28 +1,6 @@
-AUX uhd-3.10.3.0-tinfo.patch 1680 BLAKE2B 6b31b95c4b63d043e66e5fb41f75b3e73d0e9327d304a211d950bc982209f12425ee716ff2218ceace317ba978ddfe7d0b94961c9feeb0a08dd5454515df7505 SHA512 2c0e6163ddb005b5d02a380033030d111d1eff23f8327aff802e80e449594e48bdd8f2656ffd21c6281233a36ac89d52aa6833e2ea0349276baaef497c463cba
 AUX uhd-3.13.1.0-tinfo.patch 2099 BLAKE2B d48ed54fbff7350aaf33a2551ae891384365a66406becf5b315ac14075675da5e3098c7ca8e64f056035e617d84c0ac6695d065c56665c8cc03c8db07bbef31b SHA512 170c77f04d759fd4a2148c04b85adb48c10d5b1ed6363aaf6c3a78ad79c8055ee65434eec7b26db4cb540a5405d2a6d902a2ef4cf60152032128f05ef1e0adf5
-AUX uhd_man_pages_optional_compress.diff 3357 BLAKE2B b1b46def45f4ddad84af04245b5a257bba9e9334ca40aa7712579b51f0f8094fd2a94bb0377368e16fc627d2164678f5aa11d729601b9732c51ac340947b6add SHA512 c5915d57366d50ccbad0cb4a57855a403e4951765595e5f8c9ab5f05fa4ef3b0f7778a242bc097f925f9e90d955ac04aea4d8a5af64d1bdefc19edf85c59d3ab
-DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
-DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
-DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
-DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B 69d84db2b908598545af8175304c19d00bde29d606b6af55e12ed2184d14a08bee7cb229b54dc5f339f587194b493e04f6f584685c2e836f81a9063ffc5e5799 SHA512 83196212326ab43f7996bf297677980f1e2cb2e51fc6479f086e010078d2ff6ee42ffd5af6bdcaaf0d6c45a3e773b117f8bdbf2e8e0add2b8dc6f3e19ad777cd
-DIST EttusResearch-UHD-3.13.1.0.tar.gz 11587157 BLAKE2B 44cd1759c9106c36e149431e655c673ba665b2a632e7bbf598b60950b31d4325921a1fe265d2fc47eb23dd3f90733b1407a6ed522f57ba975a0a4a5d9576c238 SHA512 3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
-DIST EttusResearch-UHD-3.14.0.0.tar.gz 12935658 BLAKE2B 8b5273ee3cd4c39ebb3848152116dc26caac951b3cea4c5e5efe37a90ac3a1e0580e7ed65af9145e4981abf7abd9ef748f9b3c823d87194ce7a4a5f9b799abec SHA512 c4754dbbd3540a41407a3bb31866a83c8ab319375db300113c0d13a3debbc4f0f820ccb83c30079c22388409edd032609cdb77bf6c098b37152b1985f773d1cb
-DIST EttusResearch-UHD-3.14.1.1.tar.gz 12960651 BLAKE2B 8a2a0ac4d1cf71177dad1334dcc7426dc78a0c6b8c1bd895d7eb1ca4e2eb5b9a4208998118ba084f1932edacc7503b49a5ebd78dd1b1d9acbac6fe83f503b9eb SHA512 461f9314dd0af5feed91b18196cccb7828cee91a712dec0bb8b59878d54500906beea9f6dd938a90eae041dca6a1f6b564b6924d8e53e4b2fb507f2ed7be0ff4
 DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
-DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
-DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
-DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B 0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842 SHA512 94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
-DIST uhd-images_3.13.1.0.tar.xz 176004828 BLAKE2B 3a476337443f58a55773dd55f3605a37591d73ddd875a2cdb0459adfe93774ebc6c6f380aee7b00b70fd26ca5ac72730fdacd213f31239599227e19b24b9cc2a SHA512 3db7429c99823a7ef48253bb996e284c66f8f44913ed9d48baa3d7553a7d13724cbc1fe2df0032504491b677bdb3d609e3c6c01a580bd717cc311d54aa10d9fa
-DIST uhd-images_3.14.0.0.tar.xz 112971440 BLAKE2B b0aeb77251500c42ccaa753483b20d82113d55f1e2f2e1181a27cd95f6aec1768e8a02c9dbc65db612d04d43e7756c6b6e3d6f662a4e66043b3ec52b44bbeb77 SHA512 a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
-DIST uhd-images_3.14.1.1.tar.xz 113265248 BLAKE2B b1ac40435b8bce5cdc29bbdfd182f65d8d2f7d80b21a835202551e52cdc5d7f3b028faa73850121a79a1ff4df73620b8c36a5cab38cb2fed9c582a48429e0ee3 SHA512 d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd
 DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
-DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
-EBUILD uhd-3.10.3.0.ebuild 2043 BLAKE2B 299a8f73dbabe40dafae728cca63636e29ba90b0ee48bec4637bbab4c61668fb2121f6a65808a44696a2c4f8bf5f2bc773d4485a2b6556bc6e7c3e819b5bf1cd SHA512 777d6d6fd40bd74816916dc94e712de0cecc9e5a4275bfff67d69cef63866e9ae75cdaf0ed75bf17591b8667e3f73fda35f513ab13070c40d855b807bc53d93e
-EBUILD uhd-3.11.0.0.ebuild 3926 BLAKE2B 11ff172917ab996d5b02d200ace57b65a6c0761a3c7a68eee8c951c179ac1036ea93b6b928f24a8681a5de885e603c17834667038c1b123f6e9e743281ad4f77 SHA512 3c59fb15a18589526cb6ec3a66ce18dd2ea84c4c5e8546f67e4a53bb2d2f1467840f8578e351b3d04e9b12df184c4316860620e86712b6ba568fd2d3adccbd85
-EBUILD uhd-3.12.0.0.ebuild 3559 BLAKE2B 7f11665bda3d21539142bc9e76ea5b07063dada252c28aa748988c2bec1763ed118772cf9f80b3824915b4e3f6988d33aaca5e6021356b3996c20d0cd6ca9360 SHA512 cdc2a0caadf7f4907a1f550d784e94ba5ca802bcb63203e3db6ea1e35adcf61ab47567a0a9865b02354d2b0342d61f62200dd9ebf625b837a085bf014fac0244
-EBUILD uhd-3.13.0.1.ebuild 3559 BLAKE2B 7f11665bda3d21539142bc9e76ea5b07063dada252c28aa748988c2bec1763ed118772cf9f80b3824915b4e3f6988d33aaca5e6021356b3996c20d0cd6ca9360 SHA512 cdc2a0caadf7f4907a1f550d784e94ba5ca802bcb63203e3db6ea1e35adcf61ab47567a0a9865b02354d2b0342d61f62200dd9ebf625b837a085bf014fac0244
-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-r1.ebuild 3869 BLAKE2B a9fa5020e023c1a216f9a7c719a0f81642bec090b932c55affbd87489b1c5fbe9366c8609d61665ff89b63c6ddcf456f14996019817e37d85feb27d378989c05 SHA512 767734c0377c2163238dbabfe16672ed6552d06e32068b215cede6ca38ce2f2332bbcc8b311be3f2ef7f1a9021ed9b15871a281a03a926ad2c106789a7932ab5
+EBUILD uhd-3.15.0.0-r1.ebuild 3857 BLAKE2B 951e6367365f2fe5e799ee1b8d5509f8adcd2f6a694055a0728bfbe090d010ebadb826f1f5e0d700c3da50d3075c2ef24d1ac44b3c96673a97eff639acb238e9 SHA512 1adaf9d6a7afc1953ecd40eeb47f754fdf10e47ea1aab5561e77dcd2ded6223f4c9414dbf8f1483c8ff32d6ae9cc8e7487c796b796bf3ffafde263fd816270b4
+EBUILD uhd-3.15.0.0-r100.ebuild 3863 BLAKE2B e8eefa884f15a0caf06f3f2a48b0db779eade762d9fc1acab56e0ee9e798c147f460edb0b4ede70e801e2ac74d1aacc3d39bb52e45b6644590860fadaafeaef8 SHA512 765e9f4f4d45ef666bb82f69ce29204a092f8b95ba167164596dfb9fa87789b419cd03cf67a129a793e54453a8f9d02f7f91a4feddc2c95cd1fa39673cc4267e
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch b/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch
deleted file mode 100644
index ff9956fee41c..000000000000
--- a/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- host/utils/latency/CMakeLists.txt.orig	2017-05-11 19:44:54.824946672 +0300
-+++ host/utils/latency/CMakeLists.txt	2017-05-11 19:45:08.498880360 +0300
-@@ -35,7 +35,8 @@
-         GET_FILENAME_COMPONENT(name ${source} NAME_WE)
-         ADD_EXECUTABLE(${name} ${source} ${latency_lib_path})
-     	LIBUHD_APPEND_SOURCES(${name})
--        TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES})
-+        TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES}
-+            ${CURSES_LIBRARIES} tinfo)
-     	UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name})
-     ENDFOREACH(source)
- 
---- host/examples/CMakeLists.txt.orig	2017-05-11 19:41:02.322302577 +0300
-+++ host/examples/CMakeLists.txt	2017-05-11 19:44:32.604066325 +0300
-@@ -59,7 +59,7 @@
- IF(CURSES_FOUND)
-     INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR})
-     ADD_EXECUTABLE(rx_ascii_art_dft rx_ascii_art_dft.cpp)
--    TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES})
-+    TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES})
-     UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
- ENDIF(CURSES_FOUND)
- 
---- host/CMakeLists.txt.orig	2017-05-11 19:36:38.944798634 +0300
-+++ host/CMakeLists.txt	2017-05-11 19:36:40.819788408 +0300
-@@ -436,6 +436,8 @@
-     LIST(APPEND UHD_LINK_LIST_STATIC "usb-1.0")
- ENDIF(ENABLE_USB)
- 
-+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo")
-+
- CONFIGURE_FILE(
-     ${CMAKE_SOURCE_DIR}/cmake/Modules/UHDConfigVersion.cmake.in
-     ${CMAKE_BINARY_DIR}/cmake/Modules/UHDConfigVersion.cmake
diff --git a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
deleted file mode 100644
index 5847d50c66f0..000000000000
--- a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt
-index 240a534db..7a7108f00 100644
---- a/host/docs/CMakeLists.txt
-+++ b/host/docs/CMakeLists.txt
-@@ -144,34 +144,49 @@ set(man_page_sources
- ########################################################################
- # Setup man pages
- ########################################################################
--find_package(GZip)
-+option(ENABLE_MAN_PAGE_COMPRESSION "Compress man pages if installed." ON)
- 
- # No elegant way in CMake to reverse a boolean
- if(NOT WIN32)
-     set(NOT_WIN32 TRUE)
- endif(NOT WIN32)
- 
--LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "GZIP_FOUND;NOT_WIN32" OFF OFF)
-+set(MAN_PAGES_DEPS "NOT_WIN32")
-+
-+message(STATUS "")
-+if(ENABLE_MAN_PAGE_COMPRESSION)
-+    message(STATUS "Compress man pages enabled; looking for compression program")
-+    find_package(GZip)
-+    list(APPEND MAN_PAGES_DEPS "GZIP_FOUND")
-+else(ENABLE_MAN_PAGE_COMPRESSION)
-+    message(STATUS "Compress man pages disabled")
-+endif(ENABLE_MAN_PAGE_COMPRESSION)
-+
-+LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "${MAN_PAGES_DEPS}" OFF OFF)
- 
- if(ENABLE_MAN_PAGES)
--    #Generate man pages
--    foreach(manfile ${man_page_sources})
--        #make the gzip file depend on the text file
--        string(REPLACE ".1" "" PROGRAM_NAME "${manfile}")
--        set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz")
--        set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}")
--        add_custom_command(
--            OUTPUT ${gzfile}
--            DEPENDS ${manfile}
--            COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile}
--            COMMENT "Generating ${PROGRAM_NAME} man page"
--        )
--
--        #make the man page target depend on the gz file
--        list(APPEND man_page_gz_files ${gzfile})
--        UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
--    endforeach(manfile ${man_page_sources})
--
--    #make the man pages a build-time dependency
--    add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files})
-+    #Generate man pages; either compressed or not
-+    if(ENABLE_MAN_PAGE_COMPRESSION)
-+        # compress man pages
-+        foreach(manfile ${man_page_sources})
-+            #make the gzip file depend on the text file
-+            string(REPLACE ".1" "" PROGRAM_NAME "${manfile}")
-+            set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz")
-+            set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}")
-+            add_custom_command(
-+                OUTPUT ${gzfile}
-+                DEPENDS ${manfile}
-+                COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile}
-+                COMMENT "Generating ${PROGRAM_NAME} man page"
-+            )
-+            #make the man page target depend on the gz file
-+            list(APPEND man_page_gz_files ${gzfile})
-+        endforeach(manfile ${man_page_sources})
-+        #make the man pages a build-time dependency
-+        UHD_INSTALL(FILES ${man_page_gz_files} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
-+        add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files})
-+    else(ENABLE_MAN_PAGE_COMPRESSION)
-+        # uncompressed man pages; just install them
-+        UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
-+    endif(ENABLE_MAN_PAGE_COMPRESSION)
- endif(ENABLE_MAN_PAGES)
diff --git a/net-wireless/uhd/uhd-3.10.3.0.ebuild b/net-wireless/uhd/uhd-3.10.3.0.ebuild
deleted file mode 100644
index 9a1c22cdf241..000000000000
--- a/net-wireless/uhd/uhd-3.10.3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).$(get_version_component_range 4).tar.gz \
-	http://files.ettus.com/binaries/images/${image_version}.zip"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	virtual/libusb:1
-	dev-lang/orc
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	dev-python/mako
-	dev-python/cheetah
-	app-arch/unzip
-"
-
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
-
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
-}
diff --git a/net-wireless/uhd/uhd-3.11.0.0.ebuild b/net-wireless/uhd/uhd-3.11.0.0.ebuild
deleted file mode 100644
index f24e3c0eb34d..000000000000
--- a/net-wireless/uhd/uhd-3.11.0.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/release_003_011_000_000/uhd_${PV}_images.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host"
-
-src_unpack() {
-	unpack EttusResearch-UHD-${PV}.tar.gz
-	mkdir images || die
-	cd images || die
-	unpack uhd_${PV}_images.tar.xz
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.12.0.0.ebuild b/net-wireless/uhd/uhd-3.12.0.0.ebuild
deleted file mode 100644
index 35c0d6bfeb77..000000000000
--- a/net-wireless/uhd/uhd-3.12.0.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.13.0.1.ebuild b/net-wireless/uhd/uhd-3.13.0.1.ebuild
deleted file mode 100644
index 35c0d6bfeb77..000000000000
--- a/net-wireless/uhd/uhd-3.13.0.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.13.1.0.ebuild b/net-wireless/uhd/uhd-3.13.1.0.ebuild
deleted file mode 100644
index c0012fc33e0d..000000000000
--- a/net-wireless/uhd/uhd-3.13.1.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.14.0.0.ebuild b/net-wireless/uhd/uhd-3.14.0.0.ebuild
deleted file mode 100644
index c0012fc33e0d..000000000000
--- a/net-wireless/uhd/uhd-3.14.0.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-python/mako
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#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
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
index 0bc67971a97c..21c29ff40be4 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-3)"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 			b100? ( usb )
@@ -78,7 +78,6 @@ src_configure() {
 		-DENABLE_C_API=ON
 		-DENABLE_LIBERIO=OFF
 		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
 		-DENABLE_MAN_PAGE_COMPRESSION=OFF
 		-DENABLE_EXAMPLES="$(usex examples)"
 		-DENABLE_TESTS="$(usex test)"
diff --git a/net-wireless/uhd/uhd-3.14.1.1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 3d733a2b4f07..ea6367419269 100644
--- a/net-wireless/uhd/uhd-3.14.1.1.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 #not sure why, but eapi 7 fails
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-3)"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 			b100? ( usb )
@@ -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
 "
@@ -52,16 +61,15 @@ src_unpack() {
 }
 
 src_prepare() {
-	cd ..
-	eapply "${FILESDIR}"/uhd_man_pages_optional_compress.diff
-	cd host
-
 	cmake-utils_src_prepare
 
 	gnome2_environment_reset #534582
 
 	#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() {
@@ -70,7 +78,6 @@ src_configure() {
 		-DENABLE_C_API=ON
 		-DENABLE_LIBERIO=OFF
 		-DENABLE_MAN_PAGES=ON
-		-DENABLE_GPSD=OFF
 		-DENABLE_MAN_PAGE_COMPRESSION=OFF
 		-DENABLE_EXAMPLES="$(usex examples)"
 		-DENABLE_TESTS="$(usex test)"
@@ -87,11 +94,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"
@@ -133,7 +143,4 @@ src_install() {
 	fi
 	insinto /usr/share/${PN}
 	doins -r "${WORKDIR}/images"
-
-	#fix doc location
-	mv "${ED}"/usr/share/doc/uhd "${ED}/usr/share/doc/${PF}" || die
 }
diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 07f73eb7ba3c..809333b0dbf4 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,4 +1,4 @@
-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
+DIST urh-2.8.8.tar.gz 13403266 BLAKE2B f2550851f209ca3b3bc389eaab5419338c07d165800e9d2e4e89c50da8fa83f84099b33f0adfbb79ca4d9d2f1104eebe51fff623f1d683b074b802b539ec8166 SHA512 499df6e15fbf73b0b7ecda3ea65c5246b3fd7e3da510b3602ea2f41390ad98c672cc9228394f779178daf545ade3783545f462436f295c06f5e37c0a5dc69179
+EBUILD urh-2.8.8.ebuild 1277 BLAKE2B 693bd4354dd585d9e6694943e944c7b21f5c2c705f30197709608a3448d1f8e31ded16eac6521fff1dadaddee2b321416937e814500cfe089db601dd8ac39dfb SHA512 7585e80130530209ce8369c793aac3df59d788502c368093afe3622ba2bff26d2fb4d68ff19ee21a74a12307c5dee1551b208e692d4e76b0c1edc1eef653a69b
+EBUILD urh-9999.ebuild 1277 BLAKE2B 693bd4354dd585d9e6694943e944c7b21f5c2c705f30197709608a3448d1f8e31ded16eac6521fff1dadaddee2b321416937e814500cfe089db601dd8ac39dfb SHA512 7585e80130530209ce8369c793aac3df59d788502c368093afe3622ba2bff26d2fb4d68ff19ee21a74a12307c5dee1551b208e692d4e76b0c1edc1eef653a69b
 MISC metadata.xml 925 BLAKE2B 2ae753ff0a9b2c58db180655350b7805546a6d4bf548902d5717be45ce07481ed1e478b7e46cfc4d0b9c82807b7b99135017aa1beb882d3ac1c9b9cd80ada30c SHA512 1d1005d81c4ba5eb2d482419d4469de906d3c754750fd7ed46540b92861e4b5356935986572168f1ee3008319aa31054a206d71b5153e7a1758a8c6796949f89
diff --git a/net-wireless/urh/urh-2.8.4.ebuild b/net-wireless/urh/urh-2.8.8.ebuild
index c4b387c055b5..f325027fcad3 100644
--- a/net-wireless/urh/urh-2.8.4.ebuild
+++ b/net-wireless/urh/urh-2.8.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild
index c4b387c055b5..f325027fcad3 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,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-wireless
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)