gentoo resync : 24.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
commit: 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree: da76713365257a445f3ae3b95470917f59d46728 /net-wireless
parent: 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)
58 files changed, 854 insertions, 1446 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 0cbce58e738f..f86a4b004515 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 95d8d4c28744..cdb191fbf5ff 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,10 +1,6 @@
-DIST bladerf-2015.02.tar.gz 1297072 BLAKE2B 7e5b220cbd64c950bd39bf9a549ec15595e237b86587e02f0e32b0d029de6d9254d762f6d898e504dfad1f8095f6950c1d3ed5902adb5446073f6a89a1a7acd5 SHA512 04fa431232562cf589489961a5206022be59687531aeb118aac8b8b58f74862cac7fad5c55676c0cf3b33e19abbf9e2a1339237eade2fd96c5ecdb37b51e9603
-DIST bladerf-2015.07.tar.gz 1418766 BLAKE2B 22e90920111e8fa53f12edfadd5248fb2b5c6ba246c414dabcadfb4db779fdc3ae8e65a1bcefbce130fc3496c64b912237ad18b628f46246a793fdb737c1dd95 SHA512 01589bc9bd6ee2d4120597133c7a69ed91a80c74bc75b70fb4470a9a14328161fcf4ba7112ec91ea12bedb3de7325135ac125b26f09c22dc6e49d9c23247bec8
-DIST bladerf-2016.01_rc1.tar.gz 1605673 BLAKE2B 2f327c3be4150808b2dbe22cc69a0415b0cf86d0d34219216814ae3c1e0735aa6f16e435acfb51a238315d755d532fdce4837bbafab7b864eb07e631de3beecf SHA512 92b3a64688fc7022edde6cddb366a6997d66dd32d26daff5817cae5baeca0f1d641721a5eec1d65eac3d39fa74c207ad996b0c67c901d0759decbac713d3fd0f
 DIST bladerf-2016.06.tar.gz 1654784 BLAKE2B 540f9fbb21c1439e80bda37a9e265dfaf987a9c6cedb29ac8556bbdff4ead899d99d00cc9b5a02f03055945955a5d43f4d94b822085dffecc7e2f63ee0724764 SHA512 0834e9f5fa2e41bf15629d9699f11ef29d5365a0ed2c17b83c6a77ed43d72fa62e6d35060d8d478dcbc1e7080cac825d82644b8fcdc03eae0dccef3cb1a7325d
-EBUILD bladerf-2015.02.ebuild 1332 BLAKE2B 941ecbb2cb6f787163145ccf7ac2efcc1e6a5e0304de1a7c0a48fcc4e419129d5d2f3ac2726a5bf10cf58925a6220f8cf9c2aa551bd7081d84896a6aa344d318 SHA512 62c92e42f749c95c0edbb386966ccf370f50dd255be52f78a6dec8de6dc009bdeb1b716ceca154c76fc3e2920761b686f2eff5b99f33992e3a7a3c9c8c8e285a
-EBUILD bladerf-2015.07.ebuild 1332 BLAKE2B a690966ba0826c793825b81616d926ed07c4ab4047afcd26fec8d3e4febfba913d9e7eb6d2ba85cf961ec2d540f519a1a1deddc10a98189dc1b61fef44724220 SHA512 697a29da3985d88003fee9e451c615b825cd3e7d813997e50c29ad5ab58be6efdd220f4f8a8ea277ae24b7bed42860906d62e5f019feb1fb4b4b138275bd5586
-EBUILD bladerf-2016.01_rc1.ebuild 1332 BLAKE2B 91f492a9f44715decbc791198437b8584ea7db875f9616965bae20a0da33c8d758b6d4822c4bdce26309e67811320ce2164c0b2a40e606d5e72af395ad9faa6f SHA512 1040c0f7d5e4ce0337f81a5e4df0f097be9dfa58fe10f8e10fa222bdc6c837c3d78387eef4df158d1840bc2d8313c450e2c4d1c225a619b28a8ca418f37b49cf
+DIST bladerf-2017.12_rc1.tar.gz 1723370 BLAKE2B f6d19765674602354b42bb62acdfd874b04df55bd45ec74077aa310e5f6bd81d298148c3b1f2e1396d8659644f374cadf2e91df4b644a29d70c8369aaa6f4694 SHA512 19a3f24f9b6000af9e9d80cc31cbbf46b11deabb4e12eafb68c01f240cdf43884c5f8640ecbfa32fab8cc6a9c8e3b6cbc8596dfe564869c1a85163f00c62d96f
 EBUILD bladerf-2016.06.ebuild 1332 BLAKE2B cf3093526b1ff0ada5c3c7602149be955a8ddbbcff2ec93a447c5326dbb1904fbce1eca642ea134cae17154a079955db8459be8ce33d79aed9ef13eaa7bf72f4 SHA512 67816f126c9a25ab23f73287ce2ef5198ee03441e2d0b4b80201eb40b57781b3932fd39baf1630db4db5a61c4cd9a00d31dd71731c2b6c3e57b1ff4d52b13899
+EBUILD bladerf-2017.12_rc1.ebuild 1332 BLAKE2B 50d435fc5f417834f5f8330a4176b164f02954bf74b7b0d0612f0b00064803c7163f0086f1975b143431908750d24cb044209a27c91161221658747fc92aa43d SHA512 f37c25a9d4367867cf845b03f104e194beda9a48dbf6cafd6025408347a8f209337c2117184fac7f4948555014bc1379492258673d19a2d3e14a9ae2be15ad13
 EBUILD bladerf-9999.ebuild 1332 BLAKE2B cf3093526b1ff0ada5c3c7602149be955a8ddbbcff2ec93a447c5326dbb1904fbce1eca642ea134cae17154a079955db8459be8ce33d79aed9ef13eaa7bf72f4 SHA512 67816f126c9a25ab23f73287ce2ef5198ee03441e2d0b4b80201eb40b57781b3932fd39baf1630db4db5a61c4cd9a00d31dd71731c2b6c3e57b1ff4d52b13899
 MISC metadata.xml 534 BLAKE2B d39c41a686202aff5a46e2b67cdcb5f3dc339bd7854a313f8d58165995b030194638447c2c987d1c5372a241c030b7d715a9854d9daaec1a0a59b85c6f421c1c SHA512 b7d10693f1c08b1a60bf6f4542e7fad445a63249d3fa796b08b3c7db7d758c89000c09a6aeb0dffbe6a90467acc5ee18331d839162a540a2c7040d5dd7218db7
diff --git a/net-wireless/bladerf/bladerf-2015.07.ebuild b/net-wireless/bladerf/bladerf-2015.07.ebuild
deleted file mode 100644
index db03b2f9f5a5..000000000000
--- a/net-wireless/bladerf/bladerf-2015.07.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils udev
-
-DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="http://nuand.com/"
-
-#lib is LGPL and cli tools are GPL
-LICENSE="GPL-2+ LGPL-2.1+"
-
-SLOT="0/${PV}"
-
-#maintainer notes:
-#doc use flag, looks like it can't be disabled right now and will
-#	always build if pandoc and help2man are installed
-#	also ignores when deps are missing and just disables docs
-IUSE="doc +tecla"
-
-MY_PN="bladeRF"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/\_/-}
-	S="${WORKDIR}/${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-CDEPEND=">=dev-libs/libusb-1.0.16
-	tecla? ( dev-libs/libtecla )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
-PDEPEND=">=net-wireless/bladerf-firmware-1.8.0
-	>=net-wireless/bladerf-fpga-0.3.4"
-
-src_configure() {
-	mycmakeargs=(
-		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
-		$(cmake-utils_use_enable doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use_enable tecla LIBTECLA)
-		-DTREAT_WARNINGS_AS_ERRORS=OFF
-		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/bladerf/bladerf-2016.01_rc1.ebuild b/net-wireless/bladerf/bladerf-2016.01_rc1.ebuild
deleted file mode 100644
index b84336c94dd8..000000000000
--- a/net-wireless/bladerf/bladerf-2016.01_rc1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils udev
-
-DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="http://nuand.com/"
-
-#lib is LGPL and cli tools are GPL
-LICENSE="GPL-2+ LGPL-2.1+"
-
-SLOT="0/${PV}"
-
-#maintainer notes:
-#doc use flag, looks like it can't be disabled right now and will
-#	always build if pandoc and help2man are installed
-#	also ignores when deps are missing and just disables docs
-IUSE="doc +tecla"
-
-MY_PN="bladeRF"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/\_/-}
-	S="${WORKDIR}/${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-CDEPEND=">=dev-libs/libusb-1.0.16
-	tecla? ( dev-libs/libtecla )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
-PDEPEND=">=net-wireless/bladerf-firmware-1.9.0
-	>=net-wireless/bladerf-fpga-0.5.0"
-
-src_configure() {
-	mycmakeargs=(
-		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
-		$(cmake-utils_use_enable doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use_enable tecla LIBTECLA)
-		-DTREAT_WARNINGS_AS_ERRORS=OFF
-		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/bladerf/bladerf-2015.02.ebuild b/net-wireless/bladerf/bladerf-2017.12_rc1.ebuild
index 7749a2256c4b..f289a36148fd 100644
--- a/net-wireless/bladerf/bladerf-2015.02.ebuild
+++ b/net-wireless/bladerf/bladerf-2017.12_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,8 @@ CDEPEND=">=dev-libs/libusb-1.0.16
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}"
-PDEPEND=">=net-wireless/bladerf-firmware-1.8.0
-	>=net-wireless/bladerf-fpga-0.1.2"
+PDEPEND=">=net-wireless/bladerf-firmware-2.0.0
+	>=net-wireless/bladerf-fpga-0.6.0"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index e70f4834681f..875b013f3568 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -10,5 +10,5 @@ AUX rfcomm-init.d-r2 546 BLAKE2B c487e51fcd4837c1cfce8b630062d1a882c084691266fd0
 DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02dac122a57bd44c41a1aeeb21b4c1476cab2ce89a7d3570fc1b592f1a2ed9e1f96c289faee942d203d1e3aa85 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6
 DIST bluez-5.48.tar.xz 1733952 BLAKE2B 0a68a1b790d752b02b8ab3d0eeaa9387c15851003a1d691cb476cef564c032498935997b84af4dd8bdb448dbe434eedecb982a9a867dd4dfa2ca0c8a23f371c3 SHA512 38cb20b8acee8adaab286a0b042efa770df367e7a69556117961fcc46d9e0a0e2a48059c7df9511bb00fe7fc37e916e34c928df9372b45051fcc57c8965b0bb7
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
-EBUILD bluez-5.48-r1.ebuild 7900 BLAKE2B 581be04d9c18aee07fdbb3352d69d0eb4d9b9512ce5c76fe8653759b474b9803c439fe92d860266d5247eacf1e0061ac03dac9dd2e9f4bc05ba8a692df5e68ba SHA512 7fd161b372ea22338169957ab3ed314030ff1511d819451d980ee3ff45412d7b417ca9fb9d647aaef52a14693d094164e38bf7c4baa5f2017d9566021b834c2e
+EBUILD bluez-5.48-r1.ebuild 7898 BLAKE2B 7d05df3d6161bb98d19c1a92a6709dc9174d0ef6378d74ebb33f79161e767600be63c5b3843a03b85f5d9d1321cc7464822aac9513e1d4dfab97b11e94cabc1a SHA512 3e8f5e729d9d23e3db6fb64e8d14509fe736fc88f43f9f8e8cbfe305fcf9230303688c829cc1c65918cb2f9fbceb4110a99bcee378d4dc9f410f1ae2386f5e2a
 MISC metadata.xml 1123 BLAKE2B 87f3bc5c6709f1d82237c9ef91b30491f8854b79a9d661e7788496361cff763ec510368d08e832df58ad474802619a5b1434acd4c2c20f41a42fd12f2c946b96 SHA512 be4e0c9c8e589d9c2c1f1f8bc2119da6239d726201ce35979996a6364b02fae8782a9b44742a601e14342eb1501734d68b032bceb26d1f2628782dc9ab5d7f93
diff --git a/net-wireless/bluez/bluez-5.48-r1.ebuild b/net-wireless/bluez/bluez-5.48-r1.ebuild
index db6ddf08c047..dc9296bd955b 100644
--- a/net-wireless/bluez/bluez-5.48-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.48-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index dbaf6b665947..24a3ffb65dc1 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,19 +1,11 @@
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf156a83f6b463b74398a6bb17f70a0917bdded1e585fe1ead61dd38f5aeb9020fac256a6f5caf9e1f638e214035fb8ec3b8ef7c SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768
 AUX gnuradio-3.7.6.1-qwt-with-qt5-support.patch 961 BLAKE2B 00e64e3a2cb588c87cfb577bb611dc6f166e6886d680be9e7a8e12e6e814436abda8b70f141eb0737f2d4c2bff479a5dc8b92e8e4f90ab72e1c98108f8a47ff1 SHA512 021dfd17426081dd8ec8bb2cd7e7f6a185f2c36f85c83bfa9099c157bffb2d63831241175547f5ad1838ae46e089fa5054fcadbddefb59fa1f34f8c0fa2d4075
+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.10.2.tar.gz 4354889 BLAKE2B fdc113cf5731b0ffdb05580f711e9e8efd971097304c86fb123d0c2d8b429cde5e9805d32c075f7b75cf713367388fa601bb96df9f63654c52e72b7155dde7e9 SHA512 caf389314708c219ef77a6b7111ecffdb074bc5be047fa127706cad7b785ec1262f60b0416d8c4ce1baf769f822f2f571d6e14eef8066636a53568fcfa68dbe2
 DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
-DIST gnuradio-3.7.6.1.tar.gz 3588833 BLAKE2B 148ca4327744f2052b9a28d656f1f051edc9d77b03fd141b531c03070f07ee105abaafa9507a91b549b74772c50afbe864c4085681ebdde6b1d6164f81223998 SHA512 88ec30b2bd93ca032c29f4606856a8e70b0123474fd84115657804429f381dea78f97a7523c9684acad6a27b357ddf876632e957de5c6e0170045dc38d121939
-DIST gnuradio-3.7.7.1.tar.gz 3845988 BLAKE2B 07c29539defaf6df343ad9cf460181e4234d3a259a3dfa565d65a2ed0e5f1d72399a28be66d8f38a58d5f2832289aa445a72705353abf3535cd6ef8e42e2d945 SHA512 7be9568d19cbe03f3c229dbda5fc8d448a4a57d84bd9f8b91a400c65b526414539536c0a391b15d5f0e63bf22ef5675dc3ed8a6ed94ce3b1e4328948fa202ba1
-DIST gnuradio-3.7.8.1.tar.gz 3962961 BLAKE2B 831754e04f108c4b2c8ce883be83819d81c2301a26b3b3e95b1c7a6cc1ec706df7680ca8a191e4bfe2527126e2220cb7ba4c6b3053a05a593c84c6f26d81f6b0 SHA512 21468335d698963ce5090b03b980ecc3714c301f3cd5d071d8a1b083c3c985479c42ee6d842b1b600ac85640ce875fb2bbfd6f51d30144cb612ac55e648c0c9a
-DIST gnuradio-3.7.9.3.tar.gz 4158777 BLAKE2B a9f8ee1ff376acf6b07e46bd303ce4a0e5c2985d8a8bd2bd83a52b5ad692daa271b442a0c94686c056018d9b8273e37c3b9ec2d636aa2ef04b9f928eb119f9ac SHA512 f73466defc5d14d18790ddf149af0c6e1d53d2d46d60c20bdbfd1a742840ad11f0e783dc4e6a7e67bd826fa19e40d9d14045abcad34d602ae37e64be7e271b5b
-EBUILD gnuradio-3.6.5.1-r2.ebuild 5475 BLAKE2B 2a8f95be17ec41fcf172a06c4d9f45eb58d9665be17acc0c59ceaa36a643eadd911f2e6215733cc869fefe7b0e96fcf4d22936706fc081086ac4918831df91b2 SHA512 ccc27ad3e26921c6fd611c22c0709d4c97cf11d40ab3bf949fc9c49033a6cb7b49b870457e0e9262fb174e5ab34f658eb1c9dd0b728c84f95a16af28b34898c3
-EBUILD gnuradio-3.7.10.2.ebuild 6965 BLAKE2B 13db95b75fd23f2d26314d2476b13ce0244eea19420a86eb3bacc440260104f4841f5f2291bb98d1aa0d6c7aaef5e49ec44b2b78c4c687ff04b2b85476d9ef40 SHA512 bc36af95ff5b56dca0f0366bdbe641a5924affcdf91f665cffa3fbb6949314226ede7b32f001c175356769f4fa8229d732c48905dd5deab5f712e191875ad60b
-EBUILD gnuradio-3.7.11-r1.ebuild 6762 BLAKE2B f783f06ef9093a28775a27cfe0ac0df6c8fe7870be53fc6dece540e4eaa91c5e9254d9735ae90c67491d28fbdb25c9a86d3946e7c93a8a934c25974aa2acfc5b SHA512 a94e08919d90a7459e6fce66b16c2d352043d43d7738d589381c4cf587b32196f6bceaf8191a335438d4b5255ce6a932226961935a90fb402f2e7a3b367ffcb7
-EBUILD gnuradio-3.7.11.ebuild 6962 BLAKE2B 73e0c0f077c256f481b260db62c853df25e4e46959806bb41c8016e6e534408e224ebb4d6f65d7ad281977e04cf7eb852f11df6b50840b9ce2ce952c6773f1ee SHA512 876ddc0bab58942688764a11153e76798bfd826373194382745299baec3c2b90dd98a956acba7af5b4bc6c53cafd180936c3835f745e2bc61074b3f3fe0c0a10
-EBUILD gnuradio-3.7.6.1-r2.ebuild 6817 BLAKE2B e0525116ea8e093540732b74ff171d072da0199b711363c3473d8877f7b2c3906e3316a52f7b88b65288fe652aa12467c3b411c759c14e89a447afb65211316f SHA512 c0f60820b9c1d81150149881148dcb63efdb01cb29a138d33c3ab73e0cba9a85361926b1cae81e6fc4af2e6fbc53eb4af00f71e6475b2f875e877c56e8f37d55
-EBUILD gnuradio-3.7.7.1.ebuild 6770 BLAKE2B 121f8b54a3d0db52b77453864f117915822182bca90274d10b8c08d48f163e74c13ae0928238f4f51c4f74ef5a104820d05ba2561b3071eca7170f8071c739e9 SHA512 84dcb4ec031f3d1f67cac10f398620a9518d5c5deba42e54dc80b2370b2f8b9e40c4278532dc039a7beecc1c9bf3d65c09c31fa0444e60b21cc893e9b1e78d39
-EBUILD gnuradio-3.7.8.1.ebuild 6770 BLAKE2B 121f8b54a3d0db52b77453864f117915822182bca90274d10b8c08d48f163e74c13ae0928238f4f51c4f74ef5a104820d05ba2561b3071eca7170f8071c739e9 SHA512 84dcb4ec031f3d1f67cac10f398620a9518d5c5deba42e54dc80b2370b2f8b9e40c4278532dc039a7beecc1c9bf3d65c09c31fa0444e60b21cc893e9b1e78d39
-EBUILD gnuradio-3.7.9.3.ebuild 6919 BLAKE2B 1f09768839c0eb0472d66485a2679dce10bafd03351466db7a2e2f6386b28f2b5a5a3fec90c3de16c4df28b299d2a9fa67f0f93abf0bc71d49ce9d941c36134f SHA512 54ddf28199b020bc37cc95e4a1f721cc4155003f479dfa1192bc41d4aa3a319daeaa40466ed3c33d7c5fc000d253ef1f1ca00d0f36b5499e0f77998344d2068a
-EBUILD gnuradio-9999.ebuild 7007 BLAKE2B bedde4714f62d1af0b08b3bbfafc0f9f758f88d0524a152cf95f79f5a4a88c6da57629c698d234086272c1c178ea6bfe22dabb13c7aa69516bb0f3458f074c78 SHA512 e0e6b7426282ce64cd20eacd82f306f8b4888ff63d16f11c4ae8c815a20b81de25c5f40723a4d8c6264e2c3c4c31344abfe4c5707d4c63b4bf48cbb452371407
+EBUILD gnuradio-3.6.5.1-r2.ebuild 5313 BLAKE2B 5fa23624df4cf4d28504bd9aa1ec2cfe7340299077483481467675dad50629d8b6c3b29b77587bc43b7b1d542a3b9c04ca41470456760fb40efb2d91d089e205 SHA512 8492ef981cc6d401d0c57354e188c3d926eb04c078d7a6997173e926fb22d43b2d4881ea359d77a9491f1e7f67802248982266c680a50624a550b8865be6bb95
+EBUILD gnuradio-3.7.11-r2.ebuild 7057 BLAKE2B 2c593828e3a48fc55bf6e45bcf5fc2386c28307008e040f203fac0d4c59d237610cd4a87aeb3da7df60fc17fc5b6d717bcde230c5b9fb536f470657d1bebc47c SHA512 b4738ba81b862c77c243f2cc26c25bb31fd8d9e2b4a47a1f2485c68fc8db636e9691f10f87a4b2d596a51f12e53af5f06ddfd361e0fd0e23056e6eb5c24afc0c
+EBUILD gnuradio-3.7.9999.ebuild 7134 BLAKE2B 0e472b2e5831c1584238e498a51009354364dee5a84d079881c018e219205449a3cbc2165887ea925602a36535fd021d2232664a45a66f6883f4e7e8456931d3 SHA512 8ded1e7077faf7cde683b172b36b1fe77650cda9bbb607383e23f4d2fb31c45fa58221259a335f469bd38092ab37aa5ee81e5ab24bd4160be7396bd0c5c6698a
+EBUILD gnuradio-3.8.9999.ebuild 7134 BLAKE2B 0e472b2e5831c1584238e498a51009354364dee5a84d079881c018e219205449a3cbc2165887ea925602a36535fd021d2232664a45a66f6883f4e7e8456931d3 SHA512 8ded1e7077faf7cde683b172b36b1fe77650cda9bbb607383e23f4d2fb31c45fa58221259a335f469bd38092ab37aa5ee81e5ab24bd4160be7396bd0c5c6698a
+EBUILD gnuradio-9999.ebuild 7134 BLAKE2B 0e472b2e5831c1584238e498a51009354364dee5a84d079881c018e219205449a3cbc2165887ea925602a36535fd021d2232664a45a66f6883f4e7e8456931d3 SHA512 8ded1e7077faf7cde683b172b36b1fe77650cda9bbb607383e23f4d2fb31c45fa58221259a335f469bd38092ab37aa5ee81e5ab24bd4160be7396bd0c5c6698a
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch b/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch
new file mode 100644
index 000000000000..60eb7c7bbbe9
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch
@@ -0,0 +1,50 @@
+Description: Update for wxPython 3.0
+ wx.InitAllImageHandlers() issues a deprecation warning with wxPython 3.0
+ and is a no-op with wxPython 2.8.
+ Deprecated constants like wxSAVE are gone from the C++ API, so wx.SAVE, etc
+ are also likely to go from wxPython soon.
+ The alias "wx.Color" is gone in wxPython 3.0 - only "wx.Colour" is now
+ supported, so update docstring to use the correct class name.
+Author: Olly Betts <olly@survex.com>
+Forwarded: no
+Last-Update: 2014-08-21
+
+--- a/gr-wxgui/python/wxgui/plot.py
++++ b/gr-wxgui/python/wxgui/plot.py
+@@ -522,7 +522,7 @@
+                     self,
+                     "Choose a file with extension bmp, gif, xbm, xpm, png, or jpg", ".", "",
+                     "BMP files (*.bmp)|*.bmp|XBM files (*.xbm)|*.xbm|XPM file (*.xpm)|*.xpm|PNG files (*.png)|*.png|JPG files (*.jpg)|*.jpg",
+-                    wx.SAVE|wx.OVERWRITE_PROMPT
++                    wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT
+                     )
+             try:
+                 while 1:
+@@ -1820,7 +1820,6 @@
+ 
+     class MyApp(wx.App):
+         def OnInit(self):
+-            wx.InitAllImageHandlers()
+             frame = TestFrame(None, -1, "PlotCanvas")
+             #frame.Show(True)
+             self.SetTopWindow(frame)
+--- a/gr-wxgui/python/wxgui/plotter/gltext.py
++++ b/gr-wxgui/python/wxgui/plotter/gltext.py
+@@ -50,7 +50,7 @@
+         """
+         text (String)         - Text
+         font (wx.Font)        - Font to draw with (None = System default)
+-        foreground (wx.Color) - Color of the text
++        foreground (wx.Colour)- Color of the text
+                 or (wx.Bitmap)- Bitmap to overlay the text with
+         centered (bool)       - Center the text
+ 
+@@ -317,7 +317,7 @@
+             text (string)           - displayed text
+             font (wx.Font)          - if None, system default font will be used with font_size
+             font_size (int)         - font size in points
+-            foreground (wx.Color)   - Color of the text
++            foreground (wx.Colour)  - Color of the text
+                     or (wx.Bitmap)  - Bitmap to overlay the text with
+             centered (bool)         - should the text drawn centered towards position?
+ 
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
index eeb3a09cc03c..43d13099383e 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet wxwidgets"
+IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		analog? ( filter )
@@ -29,8 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		qt4? ( filter )
 		uhd? ( filter analog )
 		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
+		wavelet? ( analog )"
 
 # bug #348206
 # comedi? ( >=sci-electronics/comedilib-0.7 )
@@ -66,10 +65,6 @@ RDEPEND="${PYTHON_DEPS}
 	wavelet? (
 		sci-libs/gsl
 	)
-	wxwidgets? (
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig
@@ -113,9 +108,9 @@ src_configure() {
 		$(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 wxwidgets GR_WXGUI) \
 		$(cmake-utils_use_enable qt4 GR_QTGUI) \
 		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
+		-DENABLE_GR_WXGUI=OFF \
 		-DENABLE_GR_CORE=ON \
 		-DSYSCONFDIR="${EPREFIX}"/etc \
 		-DPYTHON_EXECUTABLE="${PYTHON}"
diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild
deleted file mode 100644
index 55c7486a8433..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet zeromq"
-
-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 )
-		qt4? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		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:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6[qt4(+)]
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_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
-
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
-}
-
-src_configure() {
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	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_WXGUI=OFF
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(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 log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(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 test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-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
-		fdo-mime_desktop_database_update
-		fdo-mime_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
-		fdo-mime_desktop_database_update
-		fdo-mime_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.11.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild
index 361fda83547f..b41d31baa051 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.11.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
@@ -22,6 +22,8 @@ else
 fi
 
 IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+#tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS
+RESTRICT=test
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		audio? ( || ( alsa oss jack portaudio ) )
@@ -82,7 +84,7 @@ RDEPEND="${PYTHON_DEPS}
 	wxwidgets? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
@@ -105,15 +107,24 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	gnome2_environment_reset #534582
 
+	epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
+	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
 	#audio provider is still automagic
 	#zeromq missing deps isn't fatal
+	#remaining QA issues, these appear broken:
+	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
+	#ENABLE_GR_AUDIO_ALSA
+	#ENABLE_GR_AUDIO_JACK
+	#ENABLE_GR_AUDIO_OSS
+	#ENABLE_GR_AUDIO_PORTAUDIO
+	#ENABLE_GR_CORE
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
@@ -122,37 +133,37 @@ src_configure() {
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(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 log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(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 test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-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="$(usex qt4)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
diff --git a/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild
deleted file mode 100644
index 812f66bd3e5f..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://s3-dist.gnuradio.org/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-
-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 )
-		qt4? ( filter )
-		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
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	wxwidgets? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	"
-
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_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
-
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch "${FILESDIR}/${P}-qwt-with-qt5-support.patch"
-	epatch_user
-}
-
-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
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	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
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(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 log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(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 test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	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
-	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
-		fdo-mime_desktop_database_update
-		fdo-mime_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
-		fdo-mime_desktop_database_update
-		fdo-mime_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.7.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.7.1.ebuild
deleted file mode 100644
index d1af88e83447..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.7.1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-
-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 )
-		qt4? ( filter )
-		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
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	wxwidgets? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.5
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_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
-
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
-}
-
-src_configure() {
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	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
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(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 log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(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 test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"
-	)
-	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
-	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
-		fdo-mime_desktop_database_update
-		fdo-mime_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
-		fdo-mime_desktop_database_update
-		fdo-mime_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.8.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild
deleted file mode 100644
index d1af88e83447..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-
-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 )
-		qt4? ( filter )
-		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
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	wxwidgets? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.5
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_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
-
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
-}
-
-src_configure() {
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	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
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(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 log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(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 test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"
-	)
-	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
-	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
-		fdo-mime_desktop_database_update
-		fdo-mime_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
-		fdo-mime_desktop_database_update
-		fdo-mime_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.10.2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index f12ff19d36fe..6e4c8e7f78f1 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.10.2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
@@ -12,14 +12,19 @@ HOMEPAGE="http://gnuradio.org/"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
 	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+	EGIT_BRANCH="next"
+fi
 
 IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
@@ -73,7 +78,7 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/qwt:6[qt4(+)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
 	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
 	vocoder? ( media-sound/gsm )
 	wavelet? (
@@ -82,7 +87,7 @@ RDEPEND="${PYTHON_DEPS}
 	wxwidgets? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
@@ -105,15 +110,28 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	gnome2_environment_reset #534582
 
+	if [[ ${PV} == "3.8.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
-	epatch_user
+	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
 	#audio provider is still automagic
 	#zeromq missing deps isn't fatal
+	#remaining QA issues, these appear broken:
+	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
+	#ENABLE_GR_AUDIO_ALSA
+	#ENABLE_GR_AUDIO_JACK
+	#ENABLE_GR_AUDIO_OSS
+	#ENABLE_GR_AUDIO_PORTAUDIO
+	#ENABLE_GR_CORE
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
@@ -122,37 +140,37 @@ src_configure() {
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(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 log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(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 test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-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="$(usex qt4)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9.3.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
index 4e7041aaaa57..6e4c8e7f78f1 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9.3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
@@ -12,14 +12,19 @@ HOMEPAGE="http://gnuradio.org/"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
 	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+	EGIT_BRANCH="next"
+fi
 
 IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
@@ -70,10 +75,10 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
 		>=dev-qt/qtcore-4.4:4
 		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6
+		x11-libs/qwt:6[qt4(+)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
 	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
 	vocoder? ( media-sound/gsm )
 	wavelet? (
@@ -82,12 +87,13 @@ RDEPEND="${PYTHON_DEPS}
 	wxwidgets? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
 
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
 	>=dev-lang/swig-3.0.5
 	dev-python/cheetah[${PYTHON_USEDEP}]
 	virtual/pkgconfig
@@ -104,15 +110,28 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	gnome2_environment_reset #534582
 
+	if [[ ${PV} == "3.8.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
-	epatch_user
+	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
 	#audio provider is still automagic
 	#zeromq missing deps isn't fatal
+	#remaining QA issues, these appear broken:
+	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
+	#ENABLE_GR_AUDIO_ALSA
+	#ENABLE_GR_AUDIO_JACK
+	#ENABLE_GR_AUDIO_OSS
+	#ENABLE_GR_AUDIO_PORTAUDIO
+	#ENABLE_GR_CORE
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
@@ -121,37 +140,37 @@ src_configure() {
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(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 log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(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 test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-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="$(usex qt4)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
@@ -182,7 +201,7 @@ src_install() {
 
 	# Install icons, menu items and mime-types for GRC
 	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
+		local fd_path="${S}/grc/scripts/freedesktop"
 		insinto /usr/share/mime/packages
 		doins "${fd_path}/${PN}-grc.xml"
 
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 19dfa673fab8..6e4c8e7f78f1 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
@@ -12,16 +12,21 @@ HOMEPAGE="http://gnuradio.org/"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI=( https://github.com/gnuradio/gnuradio.git http://gnuradio.org/git/gnuradio.git )
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
 	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+	EGIT_BRANCH="next"
+fi
 
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		audio? ( || ( alsa oss jack portaudio ) )
@@ -73,7 +78,7 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/qwt:6[qt4(+)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
 	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
 	vocoder? ( media-sound/gsm )
 	wavelet? (
@@ -82,7 +87,7 @@ RDEPEND="${PYTHON_DEPS}
 	wxwidgets? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
@@ -105,15 +110,28 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	gnome2_environment_reset #534582
 
+	if [[ ${PV} == "3.8.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
-	epatch_user
+	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
 	#audio provider is still automagic
 	#zeromq missing deps isn't fatal
+	#remaining QA issues, these appear broken:
+	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
+	#ENABLE_GR_AUDIO_ALSA
+	#ENABLE_GR_AUDIO_JACK
+	#ENABLE_GR_AUDIO_OSS
+	#ENABLE_GR_AUDIO_PORTAUDIO
+	#ENABLE_GR_CORE
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
@@ -122,37 +140,37 @@ src_configure() {
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(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 log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(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 test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-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="$(usex qt4)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index cd91fbb9a624..c522c99b2003 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,6 +1,4 @@
-DIST gqrx-2.7.tar.gz 1326826 BLAKE2B fc2b6d27952c688d43de756580d8ad00e5111c5bc74cb0f3d36ed69e4281110c921e51f313e899e747649f4e3e843a8c68df056a080de32e77ad5572bdf383fc SHA512 931f4751b2437ab2286a436ed842cd51203d69c7d6edf0c0125fcb1d9943a028175d8ae70dd62eb4d2f935e97419dc990537d90e2bf50c5d1924282fe0f5531d
-DIST gqrx-2.9.tar.gz 1327672 BLAKE2B f402ce7034b63b40240486129774f7c5cbf8270f1265d397b654a3d30a972f9cdb4eea28936a8befa1991c127677e683b0271ec488df99fb9160efc07c842958 SHA512 e7e51124087524ae2bd793109cbe488bedf703a93a9727aeb3b20e6a04e759252bd1b70fe94b63c86024ba76acf14406143bd7a7d1ddd70e7948d3feaf3f69c2
-EBUILD gqrx-2.7.ebuild 1373 BLAKE2B 1841c52415d49192a2d8625b1b010fee24f5dc6ef52987dc9d55a2eededa69c60a5f70cd8b865f6705fdd8ec7ea1e6f07ca0b822ea2356c6b198314c64bbc593 SHA512 9bb73caade0c195d363491117d909479452e7fad8a48dc9f5c3b5a262482be23a6c4fe6c10de17dfc65245b94ce5d865366f0aae3904fc54596271a65fad5e24
-EBUILD gqrx-2.9.ebuild 1373 BLAKE2B 1841c52415d49192a2d8625b1b010fee24f5dc6ef52987dc9d55a2eededa69c60a5f70cd8b865f6705fdd8ec7ea1e6f07ca0b822ea2356c6b198314c64bbc593 SHA512 9bb73caade0c195d363491117d909479452e7fad8a48dc9f5c3b5a262482be23a6c4fe6c10de17dfc65245b94ce5d865366f0aae3904fc54596271a65fad5e24
+DIST gqrx-2.10.tar.gz 1327015 BLAKE2B ee3e83825e5e7d165d991b6715435f924c6c2c8a9c045ebc3f0c9c2dec3f186b68ff0057e22a55fcc9222eeac173956778587df20fbdeb777aec41c3fbcae2d8 SHA512 662894326b5fd9527fb918cfb890e2cdbf248660201452d6c2adf105341650cd2a3dbd03561d055e182626a078fcd788aa401efaaa73f45d16f34f5f1ade97a9
+EBUILD gqrx-2.10.ebuild 1373 BLAKE2B 36907539d73a640c06bb3745d65433149c672b98780374614b16c56af094548ba21d6684169c9da834ba394e5301b8c94dc2391da83a1f794ad1cc31c744c4a0 SHA512 958fc26e393a5537498981b7561f47fadc349b2c79d14cd50fcfe88a1d89bd9ffb1bf52827917a36af7183ec31d491636337de3eee88fba81b49e96304456250
 EBUILD gqrx-9999.ebuild 1373 BLAKE2B 1841c52415d49192a2d8625b1b010fee24f5dc6ef52987dc9d55a2eededa69c60a5f70cd8b865f6705fdd8ec7ea1e6f07ca0b822ea2356c6b198314c64bbc593 SHA512 9bb73caade0c195d363491117d909479452e7fad8a48dc9f5c3b5a262482be23a6c4fe6c10de17dfc65245b94ce5d865366f0aae3904fc54596271a65fad5e24
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
diff --git a/net-wireless/gqrx/gqrx-2.9.ebuild b/net-wireless/gqrx/gqrx-2.10.ebuild
index d280c8f3e3c5..f696cb12c53e 100644
--- a/net-wireless/gqrx/gqrx-2.9.ebuild
+++ b/net-wireless/gqrx/gqrx-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-wireless/gqrx/gqrx-2.7.ebuild b/net-wireless/gqrx/gqrx-2.7.ebuild
deleted file mode 100644
index d280c8f3e3c5..000000000000
--- a/net-wireless/gqrx/gqrx-2.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gr-audio portaudio pulseaudio"
-REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
-
-DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
-	>=net-wireless/gr-osmosdr-0.1.0:=
-	dev-libs/boost:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	pulseaudio? ( media-sound/pulseaudio:= )
-	portaudio? ( media-libs/portaudio:= )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	if use pulseaudio; then
-		LINUX_AUDIO_BACKEND=Pulseaudio
-	elif use portaudio; then
-		LINUX_AUDIO_BACKEND=Portaudio
-	elif use gr-audio; then
-		LINUX_AUDIO_BACKEND=Gr-audio
-	fi
-
-	local mycmakeargs=(
-		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
-	)
-	cmake-utils_src_configure
-}
-
-src_prepare() {
-	if use !pulseaudio; then
-		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
-	fi
-	eapply_user
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/gqrx
-}
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index 8af988e6c9b9..bc0dc2c8e7f5 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,4 +1,4 @@
 DIST gr-iqbal-0.37.2.tar.xz 71340 BLAKE2B 1605c520a7ff0088a24ea79e181b36261cdf849438aa3ef4a499228a372297017d3bbc4c96279f9b1bceb7b690aa7b6081b6e970a337e03c766dab5149fff199 SHA512 00037a535219ebe3b5244d4a09355cc74bf17aa6a935bff135e9d7c7c7f6bc1c8b7a29edc02132dbacda2c41efa3613c09e6fdc222472e58d88c4c076736842e
-EBUILD gr-iqbal-0.37.2.ebuild 707 BLAKE2B 2016ef31c4fe0c9c4078e6f7db021478b085f2a84ccc9e91c5e8985c3af8321ff9c4baf35ef6099bf2df3375af6d4b02a414ef978164573ab837042bcab3f690 SHA512 6855fecd526e53145df9e8d72999e11e9d1567f10fc847b6f5f1cb06f9e76f76c24dbb31143c6552a1af729c317381311ea469313ee45e029f9d8152ef78c0c0
-EBUILD gr-iqbal-9999.ebuild 707 BLAKE2B 2016ef31c4fe0c9c4078e6f7db021478b085f2a84ccc9e91c5e8985c3af8321ff9c4baf35ef6099bf2df3375af6d4b02a414ef978164573ab837042bcab3f690 SHA512 6855fecd526e53145df9e8d72999e11e9d1567f10fc847b6f5f1cb06f9e76f76c24dbb31143c6552a1af729c317381311ea469313ee45e029f9d8152ef78c0c0
+EBUILD gr-iqbal-0.37.2.ebuild 708 BLAKE2B 7e319c4e617232077b829d6ca03be9f54867b693f75445a3740ad3f62d3d2eda4cdeb4a879e16546cad900b44252c1b5e6794d00300eeff01e2810770a544434 SHA512 2e8078c8fb2079959ade82bbfd68a4b3dd3c70912c2071b28b8d74ea9864e9660d33de0ee07c887321df631c87f42702e78db6863ad34540b05fa989bbbd9f85
+EBUILD gr-iqbal-9999.ebuild 708 BLAKE2B 7e319c4e617232077b829d6ca03be9f54867b693f75445a3740ad3f62d3d2eda4cdeb4a879e16546cad900b44252c1b5e6794d00300eeff01e2810770a544434 SHA512 2e8078c8fb2079959ade82bbfd68a4b3dd3c70912c2071b28b8d74ea9864e9660d33de0ee07c887321df631c87f42702e78db6863ad34540b05fa989bbbd9f85
 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.2.ebuild
index 17eabe0b02ee..96ada0f6ce62 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -12,7 +12,7 @@ HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	EGIT_REPO_URI="https://git.osmocom.org/gr-iqbal"
 	KEYWORDS=""
 else
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index 17eabe0b02ee..96ada0f6ce62 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -12,7 +12,7 @@ HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	EGIT_REPO_URI="https://git.osmocom.org/gr-iqbal"
 	KEYWORDS=""
 else
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 70d0add23b04..ec32b68c1fea 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,6 +1,6 @@
-DIST gr-osmosdr-0.1.4.tar.xz 141500 BLAKE2B 1e65d59440cd4beadcb54e6c20cb38b2ad222811348475ac9a7109971b64bbdc11991f6b4e7f0de1fba79f6eddba9befedf9a0a3903211cbae7581f99a13bd40 SHA512 930a7f6065fba709fb770fd373f0fe7eba13abf09e49f6e839718d547ce69176d93d89d1b037ee3f0cdffda7060ac6c9ff4023dc835ec50ef456d51d383046ab
 DIST gr-osmosdr-0.1.4_p20150730.tar.xz 1148596 BLAKE2B ff5f27dc32438c94ac920e77e7722b3a4331c350b0535a8a787b72ad8653f57dc2a434c3dec9499bbe791e12dc863323c8f9f6c750b2c154ab35ed722e8e221f SHA512 7e6847eba0d4e217ea71bb4b8105290b329bf8840a7193df013b3a0cd9c9ef57f3686252da48cb0df239288b5794c75178a8bb45ff2a2dd8b605f63fec2426d9
-EBUILD gr-osmosdr-0.1.4.ebuild 1827 BLAKE2B 9fa619bae3df80ae501df6e0a48d99a6b6da1ffd70555c868746e92ebeb166c3e77ef9f7802776d0ea8fb39780c1cdfc5391f0c0c7521ff651acb3932a2076d7 SHA512 dbacaf72a7375549b2c31dbe9acafcc765441e70274327e39c8cff65bee099f8b35111d8180dd8e3fb09606598017da77f17d4a9488dc3108354fa5b02d65045
-EBUILD gr-osmosdr-0.1.4_p20150730.ebuild 1853 BLAKE2B f8da5b015de13899e4b5cd995552e8dfa76b70fa148e5049486beb0520a45ee8c7ea6d28f2bdf5e9f867a793189484f3be9b731449e4fad6c8c332da884a0b07 SHA512 0aada22b59bb532744d7cc41a6419878577eca73844428c5bb03d316c1660451d05620a1f28af0aa77378768cd80286642dfa680a8d3c571aa25d7d0d4592039
-EBUILD gr-osmosdr-9999.ebuild 1853 BLAKE2B 40ffa02648e1bfd3ee1d0b80f1b08c41e87d17ddcae7c8f251dddec24a151ada0099111eae9edcf5a259a10c5bd37e9925cac03ae46f6c39e5c1befaf2dfaa9e SHA512 7cfebb908cba42a43e2a818a7338236b388402402d8e07663ebedce54a4e7367a242de6b6d52c8487ad05686c50b3a093369d917a882e6e2e09c48afe55524b7
-MISC metadata.xml 752 BLAKE2B d7acb3c327b3692ab887bbb87e4a8e77fa32e4b5dac7d99de42d1cc0149744e461cea914a9a8b3b157a1089442b556587eae281d525d319854ed13c005f0a943 SHA512 3b49428bfa6b62bda1195b6c31c549a1ccf59fce03ce0bed5206a0d5a40386264628930758dbaa64e8a40b657c478076cb9a2f10c7d5ace10547ca5cf00742ae
+DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933
+EBUILD gr-osmosdr-0.1.4_p20150730.ebuild 1853 BLAKE2B f38fbb657305d45969cccc5ba1b6c87431d8b77d795ef6f37f31c0cc8bf5861172de32b41f25ebeb922ad1920c316bfb7d625df4f7105779bb10a740cdb3bc65 SHA512 5de5b03466ed8988fec9e8760d1b409cdb0f5ed5e719ea8cfebb110c8c4e031bb1999caab884a8fb93988e80520918f4d9cc5e4a2fbd31b1fef9aeb6e829ab75
+EBUILD gr-osmosdr-0.1.4_p20170612.ebuild 1946 BLAKE2B cd32fd38bf1d777bfbd27de9b49d39fd4fa4452929e426f348ae25929a32ef9e03c6dfefb0f57e9b991edcc72ddbcebadb7446604ff01b711f058bf3ecd35625 SHA512 6a0f8abe2944b5158c7e070f69040a4a2c705448db300bad86407cdb22623984e542034badf5e305908e25f2984b42dc5914e36d9c0d3c0ff4c2554b70c826b8
+EBUILD gr-osmosdr-9999.ebuild 1951 BLAKE2B 188473e7daca19b30ac21eb480164950833fc90c2f46464622d59041210d238b040b9d45c216d8b1107cc8c2d1c690694173c2665e14ed9509b3681d4a90914c SHA512 25c5db2b82e7072085fcc65d06a8472228a2f313c37dbadbe2a3078cd306a2cacf4333a05038e6b31171ee37e33db2c31deed6809daaa7e15aa35a60e09dd139
+MISC metadata.xml 807 BLAKE2B 1bfa0c852f52882323bd9a08d0ca16eb234e4514b7bc1d6825baf8e29e650ccbf28d1e33ff45c826563cd256e12eb32207a217dfdc70a5623baae2da39040a4d SHA512 9981bc760da9077c8ccf54a5184caa03f3e9614ff253f9163bd6be0245506e26489c97010186e7861f9a8513245d789c73d2f28ba3045878bf2a5b0b440b69f1
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
index 417f9cbdcf4c..ba56a992249f 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
index 3290d91a6d36..156b4781b570 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -15,16 +15,17 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
 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="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
@@ -34,30 +35,28 @@ RDEPEND="${PYTHON_DEPS}
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	soapy? ( net-wireless/soapysdr )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-src_prepare() {
-	epatch_user
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
-		$(cmake-utils_use_enable bladerf)
-		$(cmake-utils_use_enable fcd)
-		$(cmake-utils_use_enable hackrf)
-		$(cmake-utils_use_enable iqbalance)
-		$(cmake-utils_use_enable mirisdr MIRI)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable rtlsdr RTL)
-		$(cmake-utils_use_enable rtlsdr RTL_TCP)
-		$(cmake-utils_use_enable uhd)
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_FCD="$(usex fcd)"
+		-DENABLE_HACKRF="$(usex hackrf)"
+		-DENABLE_IQBALANCE="$(usex iqbalance)"
+		-DENABLE_MIRI="$(usex mirisdr)"
+		-DENABLE_PYTHON="$(usex python)"
+		-DENABLE_RTL="$(usex rtlsdr)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr)"
+		-DENABLE_SOAPY="$(usex soapy)"
+		-DENABLE_UHD="$(usex uhd)"
 	)
 
 	cmake-utils_src_configure
@@ -65,5 +64,7 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/bin
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin
+	fi
 }
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 8c05c70733f1..ffbeed261500 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -15,16 +15,17 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
 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="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
@@ -34,30 +35,28 @@ RDEPEND="${PYTHON_DEPS}
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	soapy? ( net-wireless/soapysdr )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-src_prepare() {
-	epatch_user
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
-		$(cmake-utils_use_enable bladerf)
-		$(cmake-utils_use_enable fcd)
-		$(cmake-utils_use_enable hackrf)
-		$(cmake-utils_use_enable iqbalance)
-		$(cmake-utils_use_enable mirisdr MIRI)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable rtlsdr RTL)
-		$(cmake-utils_use_enable rtlsdr RTL_TCP)
-		$(cmake-utils_use_enable uhd)
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_FCD="$(usex fcd)"
+		-DENABLE_HACKRF="$(usex hackrf)"
+		-DENABLE_IQBALANCE="$(usex iqbalance)"
+		-DENABLE_MIRI="$(usex mirisdr)"
+		-DENABLE_PYTHON="$(usex python)"
+		-DENABLE_RTL="$(usex rtlsdr)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr)"
+		-DENABLE_SOAPY="$(usex soapy)"
+		-DENABLE_UHD="$(usex uhd)"
 	)
 
 	cmake-utils_src_configure
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index e8e448711acc..9dc2a893a658 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -12,6 +12,7 @@
 	<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>
+	<flag name="soapy">Build with SoapySDR support</flag>
 	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>
 </use>
 </pkgmetadata>
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 9cfa2ad65e6c..37714f32df38 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,10 +1,7 @@
 AUX rtl-sdr-0.5.3-static-inline.patch 1994 BLAKE2B b986fdeb438f9f566b74c4f0914019667c45a654eeb6c875e5d20bbdf8be37e5881db9648fc556354f1b20c9fdfec62c5afddebfbd76c0685ebbe6f6908efb80 SHA512 f7de6345a9ede8b05ebdd28a3c1fd07a58caadafe24a1009ca05d82d9cd8fbc86fc04fe545d05c951cea7b6b819e54911f8b4ad06ce7fbe8d998e51d9480ac3e
-DIST rtl-sdr-0.5.0.tar.xz 401088 BLAKE2B f0a528cd84d1307f2671276bdb093f017b7b5b5243ec47957340c33ba7e93c100eed43a8b162e791b4e63875809c9f2c539ed6b64fc282ad05032270b3849605 SHA512 5e561002b32b60d251cd0b859f19e104ad5b249e45043c759a7a4d28ba9efbeadb3cb1be42d4e9da425bbe2c4d642f03d2c0f5e4078e62f68b88057adf6482f4
-DIST rtl-sdr-0.5.3.tar.xz 98220 BLAKE2B 6f686bc241d52c336897fbeab951168a434671ac4bfb2ed4e1328e4d069618afdfc1b5977b379a66f57eb11f43f71212c53d2e2f4b67a5653612218be2c53b77 SHA512 e87c03d2f7754f59b346cc03ccd374bcb57a9bdc6c8a8fa4cafecb8cb429b161d5a63b9244298caaf654adfe4d6ed4456222f4acae3b98b7a79b5ab50da22900
 DIST rtl-sdr-0.5.3_p20150730.tar.xz 485476 BLAKE2B 950d6b6d959bf6998c1ddb0c8ee55621e05ccce16abc7b03ee6632dc194249a8cea75f68697a54c0e156750708f14365bbb327f4198e36a9e042898ea015f945 SHA512 b19e9ce6ebc1c63a26ad3d8b13ccdcac76d4dee317aba547a8cd760e59256251df59ecc3ff6f8cb42d9be8235d67bd280f3373e58acb64f553fae5e3c2d113a6
-EBUILD rtl-sdr-0.5.0.ebuild 1149 BLAKE2B 4e7c3efb055982595fc4b10e5e5d8b32af3df9d08f13a6effd3b5678b36456305b07292ed2bb0a9b7c213861bd40588e828c7d1da8641a4e120eb89cd614629b SHA512 0dbb78f101ee0fabaa2f6d74248c7757ca68eebc45525386d308ff151c5d036b672f7a63a4e3bd72e3005ba93376999d1b74ba6ecb50da4eba5a2fd33cec3651
-EBUILD rtl-sdr-0.5.3-r1.ebuild 1014 BLAKE2B 6908fff6394a3e234932bcc9834b615a415f00567be8b88d6201d87283087828f3c2dac1e7460461f3e0cf285825191afdd4f206b1ceef2f7c9a1700a037b327 SHA512 8c0fbc778f14386ecd0e8429278e72646b7bfb0ced43ea1039307ebcd5535fa6e5b0cdf37ef2a070ad694eb191148cdeacfee4d90ce17b845ce2395c66599cb3
-EBUILD rtl-sdr-0.5.3.ebuild 1239 BLAKE2B c8dde192c9899cb5a0f1992cf91ad2e51ab473e97d5271d4d9c3ba2110be94f2ef43748a52b98df144cb9319b4c5e3c22849a071810a25809d74bba42c38c20a SHA512 933dc6b32484b8a23ca24f0a480e46502b5c799368033d4c79364b0df0c9069a4fa51bc683d8b268cf17aee4c17517b544f1f1ab1b19f01c5b2ddc66ede0d72c
+DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
 EBUILD rtl-sdr-0.5.3_p20150730.ebuild 1074 BLAKE2B f6e0df306e19cc6dd9932660153ed44958c4e22d0c3a080963105179bb8e18c8e2f3531891f4d39614e718c1402028f012ed847fc7a9f4a0511b981b15af6d8a SHA512 9eabb3496eed4409b2382a5a76f1c3e68219111c8ae56f2a25739c05eb53cf520203ce7ac612535ef6b7a0eda75cb40a2f57ab5c01ccd3c4b216ed3debf96932
-EBUILD rtl-sdr-9999.ebuild 1014 BLAKE2B 6908fff6394a3e234932bcc9834b615a415f00567be8b88d6201d87283087828f3c2dac1e7460461f3e0cf285825191afdd4f206b1ceef2f7c9a1700a037b327 SHA512 8c0fbc778f14386ecd0e8429278e72646b7bfb0ced43ea1039307ebcd5535fa6e5b0cdf37ef2a070ad694eb191148cdeacfee4d90ce17b845ce2395c66599cb3
+EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
+EBUILD rtl-sdr-9999.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.0.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.0.ebuild
deleted file mode 100644
index 5d71defc664d..000000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools
-
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-DOCS=( ${PN}.rules )
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-		mv ${PN} ${P} || die
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-pkg_postinst() {
-	local rulesfiles=( "${EPREFIX}"/etc/udev/rules.d/*${PN}.rules )
-	if [[ ! -f ${rulesfiles} ]]; then
-		elog "By default, only users in the usb group can capture."
-		elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
-		elog "Or the device can be WORLD readable and writable by installing ${PN}.rules"
-		elog "from the documentation directory to ${EPREFIX}/etc/udev/rules.d/"
-	fi
-}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.3.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.3.ebuild
deleted file mode 100644
index 9b10b626e6be..000000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-DOCS=( ${PN}.rules )
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	sed -i "s:pkgdocdir:docdir:g" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
-}
-
-pkg_postinst() {
-	local rulesfiles=( "${EPREFIX}"/etc/udev/rules.d/*${PN}.rules )
-	if [[ ! -f ${rulesfiles} ]]; then
-		elog "By default, only users in the usb group can capture."
-		elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
-		elog "Or the device can be WORLD readable and writable by installing ${PN}.rules"
-		elog "from the documentation directory to ${EPREFIX}/etc/udev/rules.d/"
-	fi
-}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.3-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild
index 1ea1b5619b2a..cb32ad203bb9 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.3-r1.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils multilib
 
@@ -11,9 +11,12 @@ HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
 	KEYWORDS=""
 else
+	#git clone https://git.osmocom.org/rtl-sdr
+	#cd rtl-sdr
+	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 1ea1b5619b2a..cb32ad203bb9 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils multilib
 
@@ -11,9 +11,12 @@ HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
 	KEYWORDS=""
 else
+	#git clone https://git.osmocom.org/rtl-sdr
+	#cd rtl-sdr
+	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
diff --git a/net-wireless/soapy_power/Manifest b/net-wireless/soapy_power/Manifest
new file mode 100644
index 000000000000..fb93ee73cbc9
--- /dev/null
+++ b/net-wireless/soapy_power/Manifest
@@ -0,0 +1,4 @@
+DIST soapy_power-1.6.1.tar.gz 14672 BLAKE2B 7cc16fed02a02f91cb62d3937a1cf73144f8a427acbba1bacf4c8949f8d270d7bf5a443ddd227b0a53183d79f62fa2fc5e13f67ac188dfc3a2a385d22634076a SHA512 19aa0e80a7b67cb29d842343c09b8ca2e3068583c8117a8151c5b47f1a34369f0ec833f038595323712986c9348b14a43dc1fdc6516adb40de6b42a281d782e1
+EBUILD soapy_power-1.6.1-r1.ebuild 813 BLAKE2B fbc28ce62dc65787dd96069accd1bff7c4f3b4b316d7fa1a4fdffa9bc51a1af75eb0638b1639594def33c27f3a2fd2d219b28f1fbea1ddbc486deb87416434a2 SHA512 037ca0a7cca5a642b92700a08a268f794673d8352f7e4d540d24604b487c35604156a095d3cc0a6a9a0e5704f5be029a88cf1a7b4d742cf299919bd5f100f904
+EBUILD soapy_power-9999.ebuild 813 BLAKE2B fbc28ce62dc65787dd96069accd1bff7c4f3b4b316d7fa1a4fdffa9bc51a1af75eb0638b1639594def33c27f3a2fd2d219b28f1fbea1ddbc486deb87416434a2 SHA512 037ca0a7cca5a642b92700a08a268f794673d8352f7e4d540d24604b487c35604156a095d3cc0a6a9a0e5704f5be029a88cf1a7b4d742cf299919bd5f100f904
+MISC metadata.xml 609 BLAKE2B 5e2c28479b7a0aa5217b53274eaf016a8184843cf7a86120a1d3c0f0a069f5d5b507defd0eb9a118bb451d118be2f7483b9241f59af8ea34e3b48c9236a402e8 SHA512 a9d538ff6255f8b7b170930541004fd29390452a658f97602bb033cae736b2059272768c81d6701f6f1312b13388ac542208bf6f109e03e66e27ec5911911ad7
diff --git a/net-wireless/soapy_power/metadata.xml b/net-wireless/soapy_power/metadata.xml
new file mode 100644
index 000000000000..e93f0c7982e8
--- /dev/null
+++ b/net-wireless/soapy_power/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<use>
+		<flag name="faster">Use <pkg>sci-libs/scipy</pkg> to speed up drawing</flag>
+		<flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">csete/gqrx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..cbaacd16f220
--- /dev/null
+++ b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Obtain power spectrum from SoapySDR devices"
+HOMEPAGE="https://github.com/xmikos/soapy_power"
+
+LICENSE="MIT"
+SLOT="0"
+
+if [ "${PV}" = "9999" ]; then
+	KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xmikos/soapy_power.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xmikos/soapy_power/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+IUSE="faster +fastest"
+
+DEPEND=""
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/simplespectral[${PYTHON_USEDEP}]
+	>=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}]
+		faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
+		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
diff --git a/net-wireless/soapy_power/soapy_power-9999.ebuild b/net-wireless/soapy_power/soapy_power-9999.ebuild
new file mode 100644
index 000000000000..cbaacd16f220
--- /dev/null
+++ b/net-wireless/soapy_power/soapy_power-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Obtain power spectrum from SoapySDR devices"
+HOMEPAGE="https://github.com/xmikos/soapy_power"
+
+LICENSE="MIT"
+SLOT="0"
+
+if [ "${PV}" = "9999" ]; then
+	KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xmikos/soapy_power.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xmikos/soapy_power/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+IUSE="faster +fastest"
+
+DEPEND=""
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/simplespectral[${PYTHON_USEDEP}]
+	>=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}]
+		faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
+		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
diff --git a/net-wireless/soapybladerf/Manifest b/net-wireless/soapybladerf/Manifest
new file mode 100644
index 000000000000..0a38fa3910ea
--- /dev/null
+++ b/net-wireless/soapybladerf/Manifest
@@ -0,0 +1,4 @@
+DIST soapybladerf-0.3.4.tar.gz 26618 BLAKE2B 1c09aa4733e16de67bb176bd531d544b11358901a58325e6fdff3391bf8e218cdb13729f14c0ed87d5d32de5783368024a3c73e8ea8a9d5885d06bd8ae51e44f SHA512 694ec68da292efc98b5d0864a8afa71ecf72fa91ac03650e5f2b75e938fb27cc73fb1dabe57c336e4d4a217d8931fb6750b1932881bdf4aa0bbd53cf8617564b
+EBUILD soapybladerf-0.3.4.ebuild 667 BLAKE2B e5791fde26d13c654e649342bca7e702e5ebef668b450a029919c995a8989f5ef139a9ff934031c2d25592ca265ea8135b4ec46da17770c47441f3e426109b84 SHA512 642bf5bcf6e9e100a096fd6c4d12e611bea0f21c3ef124c41174df6cf24fd4f0bb8c55cbd14dca50ff4747988ded6c04777d45a0792eac3507783585207ab45b
+EBUILD soapybladerf-9999.ebuild 667 BLAKE2B e5791fde26d13c654e649342bca7e702e5ebef668b450a029919c995a8989f5ef139a9ff934031c2d25592ca265ea8135b4ec46da17770c47441f3e426109b84 SHA512 642bf5bcf6e9e100a096fd6c4d12e611bea0f21c3ef124c41174df6cf24fd4f0bb8c55cbd14dca50ff4747988ded6c04777d45a0792eac3507783585207ab45b
+MISC metadata.xml 434 BLAKE2B da3841724dfb1d301e29abd0c97ff4db9cb851fe55b1fb1ac576d39edb2dbb800bfc5b0857132325103b0138c6809d38d4af49b7548214f83dda38b2ce0ce39d SHA512 a672da1167904fe55179376d6c769066ab66639369fae311ad3a6b9afcab931554f148920c4deedcfbb57cd4fd8cee940462082a7fa68408913731939f651439
diff --git a/net-wireless/soapybladerf/metadata.xml b/net-wireless/soapybladerf/metadata.xml
new file mode 100644
index 000000000000..d72b96aca2bd
--- /dev/null
+++ b/net-wireless/soapybladerf/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pothosware/SoapyBladeRF</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/soapybladerf/soapybladerf-0.3.4.ebuild b/net-wireless/soapybladerf/soapybladerf-0.3.4.ebuild
new file mode 100644
index 000000000000..29262fb3f0f0
--- /dev/null
+++ b/net-wireless/soapybladerf/soapybladerf-0.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugin for the Blade RF "
+HOMEPAGE="https://github.com/pothosware/SoapyBladeRF"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyBladeRF.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyBladeRF-soapy-bladerf-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+		>=net-wireless/bladerf-2017.12_rc1:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapybladerf/soapybladerf-9999.ebuild b/net-wireless/soapybladerf/soapybladerf-9999.ebuild
new file mode 100644
index 000000000000..29262fb3f0f0
--- /dev/null
+++ b/net-wireless/soapybladerf/soapybladerf-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugin for the Blade RF "
+HOMEPAGE="https://github.com/pothosware/SoapyBladeRF"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyBladeRF.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyBladeRF-soapy-bladerf-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+		>=net-wireless/bladerf-2017.12_rc1:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyhackrf/Manifest b/net-wireless/soapyhackrf/Manifest
new file mode 100644
index 000000000000..11e1d1158374
--- /dev/null
+++ b/net-wireless/soapyhackrf/Manifest
@@ -0,0 +1,4 @@
+DIST soapyhackrf-0.3.2.tar.gz 15643 BLAKE2B e57a0e2bc50984434f0e97207f8b274cc08d84e5884f4bee523614adb07d10cee810f1dd43d771f8b3a97bdb0dd84a0ac6b34d840aa9c93df19f7777f658d8d4 SHA512 667f27491d5fe18a04670ff0ade32b4a6f696ba8718e211957c7f8bab64957023ee4905df22214524ae3796a350a725d4f192fde21bb3d60cb9e69a4e629df90
+EBUILD soapyhackrf-0.3.2.ebuild 633 BLAKE2B c0149f8cb1f577f83b31821265a3356219f4b3b9b1609f01b0fdabd87d3f973af4fd32f79c3a5c27bbebe6e6018e17ffd3e6d747261f84d20d54f18d0aabaa04 SHA512 6d676eaa271fbf6376a7a4a818ab73a130668224124ad85bcfb3bcac6108d5cb94bb4acaa02715f230b7b9bab564561e88421ccf54b34db528c06d51c2e95901
+EBUILD soapyhackrf-9999.ebuild 633 BLAKE2B c0149f8cb1f577f83b31821265a3356219f4b3b9b1609f01b0fdabd87d3f973af4fd32f79c3a5c27bbebe6e6018e17ffd3e6d747261f84d20d54f18d0aabaa04 SHA512 6d676eaa271fbf6376a7a4a818ab73a130668224124ad85bcfb3bcac6108d5cb94bb4acaa02715f230b7b9bab564561e88421ccf54b34db528c06d51c2e95901
+MISC metadata.xml 433 BLAKE2B b7864a9b9321c5cf86ad577d28555f00e4fd49ac6fada7c22a4e204fb38508e3f3e4cd3020940b8cae33b0aa14338e3c96b044bd56804d181d018f5c31be82bd SHA512 6ca16459623f460a4d9b6b101aa96e1092ee29ccdb9098780b236596608505886d047d0207ea65a2415fe7096f595c2a9c3161bbcc1131ac0977b8d0f66011cf
diff --git a/net-wireless/soapyhackrf/metadata.xml b/net-wireless/soapyhackrf/metadata.xml
new file mode 100644
index 000000000000..2633b05296ff
--- /dev/null
+++ b/net-wireless/soapyhackrf/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pothosware/SoapyHackRF</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/soapyhackrf/soapyhackrf-0.3.2.ebuild b/net-wireless/soapyhackrf/soapyhackrf-0.3.2.ebuild
new file mode 100644
index 000000000000..b5dece6d6651
--- /dev/null
+++ b/net-wireless/soapyhackrf/soapyhackrf-0.3.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="SoapySDR HackRF module"
+HOMEPAGE="https://github.com/pothosware/SoapyHackRF"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyHackRF.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyHackRF/archive/soapy-hackrf-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyHackRF-soapy-hackrf-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+		net-libs/libhackrf:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyhackrf/soapyhackrf-9999.ebuild b/net-wireless/soapyhackrf/soapyhackrf-9999.ebuild
new file mode 100644
index 000000000000..b5dece6d6651
--- /dev/null
+++ b/net-wireless/soapyhackrf/soapyhackrf-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="SoapySDR HackRF module"
+HOMEPAGE="https://github.com/pothosware/SoapyHackRF"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyHackRF.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyHackRF/archive/soapy-hackrf-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyHackRF-soapy-hackrf-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+		net-libs/libhackrf:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyrtlsdr/Manifest b/net-wireless/soapyrtlsdr/Manifest
new file mode 100644
index 000000000000..540d7c6e445d
--- /dev/null
+++ b/net-wireless/soapyrtlsdr/Manifest
@@ -0,0 +1,4 @@
+DIST soapyrtlsdr-0.2.4.tar.gz 14003 BLAKE2B b638bc9795d722446cec4e2866e3cf8ee78665b874e44bb7249b6b8c465b024488284ccf3ac50aa504146253501d96c899abfa367732f14d90cf5d3641866de0 SHA512 3e5efd18793cc0404b833784c7d0b2f1786b38ed34529c12e949ce624d2488f04f0236e86bec7da08cd0baec5f36ccb6610d945d57622868e9e340c6f288b7a6
+EBUILD soapyrtlsdr-0.2.4.ebuild 642 BLAKE2B 7b21c292da81448ee01e86752502dd75bf0e403c6c7d2a849767c9aa525f4245654fa2b42c67fd7c5877a5217e312a11c96749905480cddd937492a737ee6f8e SHA512 f0dc7f8a53b950081d9e16a1394a933754fcdd566bebe4212d6e41d4402fd3c07d1d9e8b4d170ef5f38ca2673077a677b256a669062b6a53d2ac658ad4796399
+EBUILD soapyrtlsdr-9999.ebuild 642 BLAKE2B 7b21c292da81448ee01e86752502dd75bf0e403c6c7d2a849767c9aa525f4245654fa2b42c67fd7c5877a5217e312a11c96749905480cddd937492a737ee6f8e SHA512 f0dc7f8a53b950081d9e16a1394a933754fcdd566bebe4212d6e41d4402fd3c07d1d9e8b4d170ef5f38ca2673077a677b256a669062b6a53d2ac658ad4796399
+MISC metadata.xml 433 BLAKE2B 17192d2957af1deaddf7baec5c5ff77eb4ea40bbd80b7a91e5a36f91a4b53f6f6b142dc76ade70c016f8934905642c49851857bcb7823e5e3adee5e24cfccece SHA512 6b6295bd49522a9c1eb4747c4039a77201ec2dabb03250dae21b93605a1df695970d33ebe12108bd2effa7fc07ba6ab695de949e02099f89b7e334531145fe41
diff --git a/net-wireless/soapyrtlsdr/metadata.xml b/net-wireless/soapyrtlsdr/metadata.xml
new file mode 100644
index 000000000000..dd492399ccc8
--- /dev/null
+++ b/net-wireless/soapyrtlsdr/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pothosware/SoapyRTLSDR</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.4.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.4.ebuild
new file mode 100644
index 000000000000..0527f6ff8d21
--- /dev/null
+++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="SoapySDR RTL-SDR Support Module"
+HOMEPAGE="https://github.com/pothosware/SoapyRTLSDR"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtlsdr-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyRTLSDR-soapy-rtlsdr-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+		net-wireless/rtl-sdr"
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild
new file mode 100644
index 000000000000..0527f6ff8d21
--- /dev/null
+++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="SoapySDR RTL-SDR Support Module"
+HOMEPAGE="https://github.com/pothosware/SoapyRTLSDR"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtlsdr-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyRTLSDR-soapy-rtlsdr-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+		net-wireless/rtl-sdr"
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
new file mode 100644
index 000000000000..b44131525644
--- /dev/null
+++ b/net-wireless/soapysdr/Manifest
@@ -0,0 +1,4 @@
+DIST soapysdr-0.6.1.tar.gz 112820 BLAKE2B 42376a7a43c0d5a87a5b17b7d901cc7c74885083051c433c1f22427fe07a4fb0f111ddb460867bd7f748cb3ac6858b15e3dc69ba3ecca4574802c6bd0856a8cc SHA512 80ae8d0b096139e0df70524a1ff05fa1954755177d7920dbd8acb37e45cf86729e2745dcfd4e9c7ae2d7aa564335c2f197ca25ea387daa8f376d6c3e93234106
+EBUILD soapysdr-0.6.1.ebuild 1235 BLAKE2B 78b749481db6750124259a0e3a66034c94ede5fda924873edf807d78eff2f903b09d5c1fa1a3147810a4d930a1cd47a2eb6dbaa0e472e76d13559d00732dfcc6 SHA512 2e222f6e840fbb7e31fb4e56191a34c3b2bf1d469fbe4f60a8a09ec00fcdfc874aa0da63e48de686e1b17e6e70ee57490fda991b748db2e2321f47c879043673
+EBUILD soapysdr-9999.ebuild 1235 BLAKE2B 78b749481db6750124259a0e3a66034c94ede5fda924873edf807d78eff2f903b09d5c1fa1a3147810a4d930a1cd47a2eb6dbaa0e472e76d13559d00732dfcc6 SHA512 2e222f6e840fbb7e31fb4e56191a34c3b2bf1d469fbe4f60a8a09ec00fcdfc874aa0da63e48de686e1b17e6e70ee57490fda991b748db2e2321f47c879043673
+MISC metadata.xml 693 BLAKE2B ddf63211f73a324f7ce5d84ea9633854994cfd580a780dfa568a88493006cc87672d05901bb04e382d2dbd1d52ffcf384eefcaade09cf26f220b665ea81dff33 SHA512 6745812d3f88da416a94a9255b9797b3979e1e4c81a6653279cfa5820914fe340ebc455446aa19b5209d7d7abfc0358dcd89b7300ab8193d8a49d06fd2d15cf3
diff --git a/net-wireless/soapysdr/metadata.xml b/net-wireless/soapysdr/metadata.xml
new file mode 100644
index 000000000000..cf56d5875a6e
--- /dev/null
+++ b/net-wireless/soapysdr/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<use>
+		<flag name="bladerf">Add support for bladerf hardware</flag>
+		<flag name="hackrf">Add support for hackrf hardware</flag>
+		<flag name="rtlsdr">Add support for rtlsdr hardware</flag>
+		<flag name="uhd">Add support for Ettus USRP hardware</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cpothosware/SoapySDR</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/soapysdr/soapysdr-0.6.1.ebuild b/net-wireless/soapysdr/soapysdr-0.6.1.ebuild
new file mode 100644
index 000000000000..0669ed4ac687
--- /dev/null
+++ b/net-wireless/soapysdr/soapysdr-0.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils python-r1
+
+DESCRIPTION="vendor and platform neutral SDR support library"
+HOMEPAGE="https://github.com/pothosware/SoapySDR"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapySDR.git"
+	EGIT_CLONE_TYPE="shallow"
+	KEYWORDS=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapySDR/archive/soapy-sdr-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapySDR-soapy-sdr-"${PV}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE="bladerf hackrf python rtlsdr uhd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig:0 )
+"
+PDEPEND="bladerf? ( net-wireless/soapybladerf )
+		hackrf? ( net-wireless/soapyhackrf )
+		rtlsdr? ( net-wireless/soapyrtlsdr )
+		uhd? ( net-wireless/soapyuhd )"
+
+src_configure() {
+	configuration() {
+		mycmakeargs+=( -DENABLE_PYTHON=ON )
+		if python_is_python3; then
+			mycmakeargs+=( -DBUILD_PYTHON3=ON )
+		fi
+	}
+
+	if use python; then
+		python_foreach_impl configuration
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild b/net-wireless/soapysdr/soapysdr-9999.ebuild
new file mode 100644
index 000000000000..0669ed4ac687
--- /dev/null
+++ b/net-wireless/soapysdr/soapysdr-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils python-r1
+
+DESCRIPTION="vendor and platform neutral SDR support library"
+HOMEPAGE="https://github.com/pothosware/SoapySDR"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapySDR.git"
+	EGIT_CLONE_TYPE="shallow"
+	KEYWORDS=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapySDR/archive/soapy-sdr-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapySDR-soapy-sdr-"${PV}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE="bladerf hackrf python rtlsdr uhd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig:0 )
+"
+PDEPEND="bladerf? ( net-wireless/soapybladerf )
+		hackrf? ( net-wireless/soapyhackrf )
+		rtlsdr? ( net-wireless/soapyrtlsdr )
+		uhd? ( net-wireless/soapyuhd )"
+
+src_configure() {
+	configuration() {
+		mycmakeargs+=( -DENABLE_PYTHON=ON )
+		if python_is_python3; then
+			mycmakeargs+=( -DBUILD_PYTHON3=ON )
+		fi
+	}
+
+	if use python; then
+		python_foreach_impl configuration
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/soapyuhd/Manifest b/net-wireless/soapyuhd/Manifest
new file mode 100644
index 000000000000..403cb6313849
--- /dev/null
+++ b/net-wireless/soapyuhd/Manifest
@@ -0,0 +1,4 @@
+DIST soapyuhd-0.3.4.tar.gz 32111 BLAKE2B 77e976f0d5ba671fb7ff2f9822b62ab6de9b6992dc57e7824fbf7972fa52e864a33673c3620094871117a33008cf86e834d7401b2ddd060a96662d2caa48d6e4 SHA512 2eda4d0ed65d86e915ad24c5221c41716ad838ea444d92ade5eb19959bc6992132dc208ceafe994cd14e4c4a429a21341c7c5d67d354999b85e96f388cb3aa4e
+EBUILD soapyuhd-0.3.4.ebuild 658 BLAKE2B e05b377afed6538a8fd5488247d9668ae66f303a237322360263f1460eab2a42c329e488bdf2dfc5c35abab264a0b95d57b3cae0135e7753fb83e085de3777a2 SHA512 697240e82561c0a3918b2275515704888d43736340c8011f9b7eb35e8e27634f0960ff0dbecd4660f51ca6259431b316784ec194ef6f9ae6f450dd35f618cd8c
+EBUILD soapyuhd-9999.ebuild 658 BLAKE2B e05b377afed6538a8fd5488247d9668ae66f303a237322360263f1460eab2a42c329e488bdf2dfc5c35abab264a0b95d57b3cae0135e7753fb83e085de3777a2 SHA512 697240e82561c0a3918b2275515704888d43736340c8011f9b7eb35e8e27634f0960ff0dbecd4660f51ca6259431b316784ec194ef6f9ae6f450dd35f618cd8c
+MISC metadata.xml 430 BLAKE2B 583986bcf088a9cfcda635a68fef35c98ad5d5504be93f03b1034936930b38a81f3a952f1a33409a71406b3178cccb98afac8c3dafef670cbda3383830d1c22d SHA512 31ca3b4aff913064ad156b644b1598cc3412d818cf0b67607b222770852e98fc1e4d5e164d053088bd53bdffe9f394a279a1525dabfa3f22db972bc5099101f6
diff --git a/net-wireless/soapyuhd/metadata.xml b/net-wireless/soapyuhd/metadata.xml
new file mode 100644
index 000000000000..711cc176e00b
--- /dev/null
+++ b/net-wireless/soapyuhd/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pothosware/SoapyUHD</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/soapyuhd/soapyuhd-0.3.4.ebuild b/net-wireless/soapyuhd/soapyuhd-0.3.4.ebuild
new file mode 100644
index 000000000000..626e9029a89c
--- /dev/null
+++ b/net-wireless/soapyuhd/soapyuhd-0.3.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugins for UHD supported SDR devices "
+HOMEPAGE="https://github.com/pothosware/SoapyUHD"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyUHD.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyUHD-soapy-uhd-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+		net-wireless/uhd:=
+		dev-libs/boost:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyuhd/soapyuhd-9999.ebuild b/net-wireless/soapyuhd/soapyuhd-9999.ebuild
new file mode 100644
index 000000000000..626e9029a89c
--- /dev/null
+++ b/net-wireless/soapyuhd/soapyuhd-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugins for UHD supported SDR devices "
+HOMEPAGE="https://github.com/pothosware/SoapyUHD"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyUHD.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyUHD-soapy-uhd-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+		net-wireless/uhd:=
+		dev-libs/boost:="
+DEPEND="${RDEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
commit	99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree	da76713365257a445f3ae3b95470917f59d46728 /net-wireless
parent	4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)