gentoo resync : 29.08.2018

28 files changed, 349 insertions, 57 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 6f1bbde89a85..1a1520e3c490 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index f53d11e88deb..bfc292bdee44 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.1.alpha2.tar.xz 977344 BLAKE2B c5d3d0a96c1220596647ade310263342cdaaeef511a2fb36973d182025330a29b41fb805ce54e10a2f48c1c66312006858789233f8f0a93923952bb03ac32b19 SHA512 bde4922a93087d07fd99b165255ded8d9465866e62662f644beaafe363d5618a107abbd9d951cfbd034b02b6ece11fb8117efdd5d453632e4a2fea13d3825643
-EBUILD blueman-2.1_alpha2.ebuild 2847 BLAKE2B 05ae8bd6610533c2bb9916e2815e456e4385a7e0c3854230b9327a59bc0040eb9b33b81d50f83a8cfeed14df6b84995dad926c20fbe7f7a96f65dcd7c3182c08 SHA512 751f5814e1c5520ffc373302a9f67ad0a3db6823fa3624b0ecb71fbbeba12eb3e017e5f3ac49aa4b693e17eae075685aaa6b1a537a5e2a3b85fab83e8a2396c6
-EBUILD blueman-9999.ebuild 2820 BLAKE2B d3c9637cae934af79f47a92df903012b100458653476636cd1d30124cfb450caea2a9cfc19e93ac1997e7eca95bd971bba37585351e637b462a08c1eb17a615c SHA512 afe8854dc78958040a871b971e4a62cc10ba5b66a1a8ed0d0878bf150f7a1052fefa571bc942917858d33e2aef91647ed962d02ee6a5ffe43e622ae59a8eddc1
+EBUILD blueman-2.1_alpha2.ebuild 2817 BLAKE2B 446b85073e847ed47bfc1623c10b5b151d3de3af1338560adc8bc537beb778dd32745d7ed86e02a6911ce518c73c7eeeb43e700547a2f753d8e07620199a9533 SHA512 ed4c1c4f42651c54f7cbe63fcf4366d2f7a28a13cf758f5e216fbe067ba82d9e249443ab57ba56f03752e2a00a872130957e6420fb2f069b07ff040bd2bf58ed
+EBUILD blueman-9999.ebuild 2790 BLAKE2B 0d281a3e91464ddd639dc7c98e50c70c115e8593832dbe885367544667509da36725e117fbec3d2f36a9cb3932df3057aefb65e963d82233a4715a3754737f5e SHA512 630b59467361ea71fc04f1da98a19ad4d2899e290070979810c0ca48c2d06b489da6317d7aea2ab256d4365d99a5a1da6199c18a37af2e15399ffcb64b45f540
 MISC metadata.xml 688 BLAKE2B 60db2d7f9a0b7a9cb49845de2720dd1ef20fe18b3c85a0b95387aa8b3e801aa9edc2ab0e66b69c2d27ca148d1358ae347ceb81cc5a94def15fe7b7966424f35b SHA512 372797b89a2f56312d68bd0719af15c273fdb15a90172d2752ea22f5404d3e054075fd5d1edb08b280d842dcee6b52e2cdf5b18b296b230b6e4a76d4c6fe0bad
diff --git a/net-wireless/blueman/blueman-2.1_alpha2.ebuild b/net-wireless/blueman/blueman-2.1_alpha2.ebuild
index 233031d181d2..b87f40169f17 100644
--- a/net-wireless/blueman/blueman-2.1_alpha2.ebuild
+++ b/net-wireless/blueman/blueman-2.1_alpha2.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"
@@ -39,7 +39,6 @@ RDEPEND="${COMMON_DEPEND}
 	|| (
 		x11-themes/adwaita-icon-theme
 		x11-themes/faenza-icon-theme
-		x11-themes/gnome-icon-theme
 		x11-themes/mate-icon-theme
 	)
 	appindicator? ( dev-libs/libappindicator:3[introspection] )
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 6adf5f63192d..84d20f082a0a 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.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"
@@ -39,7 +39,6 @@ RDEPEND="${COMMON_DEPEND}
 	|| (
 		x11-themes/adwaita-icon-theme
 		x11-themes/faenza-icon-theme
-		x11-themes/gnome-icon-theme
 		x11-themes/mate-icon-theme
 	)
 	appindicator? ( dev-libs/libappindicator:3[introspection] )
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 0cf69baae8bb..f065c35c08e9 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -5,10 +5,10 @@ DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5
 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.4.tar.gz 4546663 BLAKE2B 82ac5fcf0318825dbdb78be3e5a11a8372b0d2f8e12b955a7e13f6f7e885fda8ac31acbc8cb0b81159b124bcda955e4b7b2cb141c8c0d780122abf7dd33b5aa3 SHA512 85c265851b43d4b62590869c91a9b7b262601dce233515096f1a1e68a14ea2710f08cc07859326efdfde29a2f156477d3bbd42e3bdd9b8ac13f6769637bf794b
-EBUILD gnuradio-3.6.5.1-r2.ebuild 5339 BLAKE2B 6e54dbf3381eed4556a52c1536ca36def8f724da6375140b06ddda7549c857d65ad029aa774326ab587edc82a0a804e009a72a6d12214bdfcacd2101608278ca SHA512 e632918a4543ea97158dd205548310bf268b295a69bbc288d1129c076c982b2bb87784ea7b519c0fa6a4fc7852cef2adbc444b68099a98929862105ea2351c7c
-EBUILD gnuradio-3.7.11-r3.ebuild 7029 BLAKE2B 3d38a4b4288ef2d5d12a7433ee2ec2bffbc2a5cfe6cd70eee57c3eaf701122712d618490a2b460d2110a283e81085c1c2a7ddb40fd7ef73f6045b5d7211fe36f SHA512 647158607c8137ffd4a09344da964d22b9b800d5fb10c63451548292f6e3a8d173dee9d140cd2e7405af06819bd9b136e9dfdca33971c16f7a97297391a6b98b
+EBUILD gnuradio-3.6.5.1-r2.ebuild 5127 BLAKE2B ad5cb9725f4a3adfc90deac129121d3b17d9db03dea210e9d9bc04b5279eec5276cb216110e88cab5b6cfeb12c1d213198dc9d50b032a21bc88b16a9945a52d0 SHA512 b36955101eee2a2e92388980c470941d2c6aeb7eb58f23158b21da16174e49640fd9332e5e05626307fccc1233fc6149a9baf8211ba1866ec2dbedc85c24831b
+EBUILD gnuradio-3.7.11-r3.ebuild 6816 BLAKE2B 6232c919c9605dd1e210d5671d754596929015af1ab2d177b5fb562420732648293a39c4810febbafde56306f601c8bf937764f7afeaedc9f18ac7e02765825e SHA512 a1602c8645fa6b1d8789d52197dac54b2899ed9544a8010fb7fa3d5d5ff7c4885fa4f650eda6e2372e90e0546b8c4dd83ebd4e9d7db3afb190b39f918373c133
 EBUILD gnuradio-3.7.13.4.ebuild 7093 BLAKE2B 75240f63afb6e8256621656d218fd72bf4a1d4a8fc57aaff363acdc0e126178f47e5f6478f432aeff7f33ce340c4586460c1f6ca1290bc4f599a6bdb559d9b25 SHA512 9c7e5906de9ff3828f7d9f6a9f396b33b9221a70889874e8e307e0562aee40ed016af605b12eea7edcbf3eee723cc09ec871316b8e980e70ef568cf70fdc25cf
-EBUILD gnuradio-3.7.9999.ebuild 7105 BLAKE2B 665ec0e3792d8543ae75134f8b475f17cbb534658220265248453c9c00351bbbb6029831b530a95fbf10ebe9ef9e3f3bd08c89d50890dfaf0cd5dea62177aecc SHA512 3d950e8f53160c2e33df4c43eeef9f0050cb53448f4dd92d4b0027a4c36d2dc48feee8f602a281e81fc86e5d37e5b0387e70a8cff7b692449422f1992ab51b0c
+EBUILD gnuradio-3.7.9999.ebuild 6892 BLAKE2B d483025e62de7f2a76e8fd1ac255059d355752e9af67f4067fa6d9e348178ca4ab717c0bf1c679a74a9b62c640abb1087b6277c125270e8a983ab8b5e41a211c SHA512 f414f389868f70a6fc74cdad5b4c1fbc1527a5f6038b93e6b0113dbebeb3de17bb8fec949d9cacfc87a1c94fac26f08e836d60d60462c48ee0f1198969f0adc6
 EBUILD gnuradio-3.8.9999.ebuild 6654 BLAKE2B 2ecf927d0469ecd721e929ba77db619949cac4e11f2a4ee62e292cbcc6ac5c0969d8eae1d01b52f67756e6cc5165cadde94b7907658c950e181dff0107d893d6 SHA512 3a839947f80f483dc6e78b9b453c1f455c4be58a7a67cbf2b116bba7f2364c53485c6695bb236704ff5286fc28310fa8324b6a428b7d55105b393087069e340e
-EBUILD gnuradio-9999.ebuild 7105 BLAKE2B 665ec0e3792d8543ae75134f8b475f17cbb534658220265248453c9c00351bbbb6029831b530a95fbf10ebe9ef9e3f3bd08c89d50890dfaf0cd5dea62177aecc SHA512 3d950e8f53160c2e33df4c43eeef9f0050cb53448f4dd92d4b0027a4c36d2dc48feee8f602a281e81fc86e5d37e5b0387e70a8cff7b692449422f1992ab51b0c
+EBUILD gnuradio-9999.ebuild 6927 BLAKE2B 2084fe3db89e86cd65e41714881153a6d03091d0f107e315800768781716adea15518d7ae3eec4a51561dd9e1f8b8992151340a7e1c30cd706b4546d5ae550eb SHA512 d6d8c6f752055e56f7e433636588df5592c4816f38bc1f4f9d626980fa97957a229bfcc8c8b21ead1df6aa434699e6ea4a752cc0fda34f08810df95ddcc98779
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
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 652fb5cea0ec..03fd5605be28 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
@@ -20,13 +20,12 @@ 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"
+IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio sdl uhd +utils wavelet"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		analog? ( filter )
 		digital? ( filter analog )
 		pager? ( filter analog )
-		qt4? ( filter )
 		uhd? ( filter analog )
 		fcd? ( || ( alsa oss ) )
 		wavelet? ( analog )"
@@ -55,11 +54,6 @@ RDEPEND="${PYTHON_DEPS}
 	portaudio? (
 		>=media-libs/portaudio-19_pre
 	)
-	qt4? (
-		dev-python/PyQt4[X,opengl,${PYTHON_USEDEP}]
-		dev-python/pyqwt:5
-		dev-qt/qtgui:4
-	)
 	sdl? ( media-libs/libsdl )
 	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
 	wavelet? (
@@ -109,14 +103,13 @@ 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 qt4 GR_QTGUI) \
 		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
+		-DENABLE_GR_QTGUI=OFF \
 		-DENABLE_GR_WXGUI=OFF \
 		-DENABLE_GR_CORE=ON \
 		-DSYSCONFDIR="${EPREFIX}"/etc \
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 )
 	cmake-utils_src_configure
 }
 
diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
index 28a0664b9c5f..f7a017d103c0 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
@@ -21,7 +21,7 @@ else
 	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"
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 #tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS
 RESTRICT=test
 
@@ -35,7 +35,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		digital? ( filter analog )
 		dtv? ( fec )
 		pager? ( filter analog )
-		qt4? ( filter )
 		uhd? ( filter analog )
 		fcd? ( || ( alsa oss ) )
 		wavelet? ( analog )
@@ -67,13 +66,6 @@ RDEPEND="${PYTHON_DEPS}
 	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}] )
@@ -158,7 +150,7 @@ src_configure() {
 		-DENABLE_GR_VOCODER="$(usex vocoder)"
 		-DENABLE_GR_WAVELET="$(usex wavelet)"
 		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
-		-DENABLE_GR_QTGUI="$(usex qt4)"
+		-DENABLE_GR_QTGUI=OFF
 		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
 		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
 		-DENABLE_GR_CORE=ON
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 0cbdae486411..ad674115e294 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -26,7 +26,7 @@ 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 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		audio? ( || ( alsa oss jack portaudio ) )
@@ -38,7 +38,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		digital? ( filter analog )
 		dtv? ( fec )
 		pager? ( filter analog )
-		qt4? ( filter )
 		uhd? ( filter analog )
 		fcd? ( || ( alsa oss ) )
 		wavelet? ( analog )
@@ -70,13 +69,6 @@ RDEPEND="${PYTHON_DEPS}
 	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}] )
@@ -165,7 +157,7 @@ src_configure() {
 		-DENABLE_GR_VOCODER="$(usex vocoder)"
 		-DENABLE_GR_WAVELET="$(usex wavelet)"
 		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
-		-DENABLE_GR_QTGUI="$(usex qt4)"
+		-DENABLE_GR_QTGUI=OFF
 		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
 		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
 		-DENABLE_GR_CORE=ON
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 0cbdae486411..e2920f5cc5fd 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -26,7 +26,7 @@ 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 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		audio? ( || ( alsa oss jack portaudio ) )
@@ -38,7 +38,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		digital? ( filter analog )
 		dtv? ( fec )
 		pager? ( filter analog )
-		qt4? ( filter )
 		uhd? ( filter analog )
 		fcd? ( || ( alsa oss ) )
 		wavelet? ( analog )
@@ -51,6 +50,7 @@ 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/mako[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0=
 	alsa? (
@@ -70,13 +70,6 @@ RDEPEND="${PYTHON_DEPS}
 	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}] )
@@ -165,7 +158,7 @@ src_configure() {
 		-DENABLE_GR_VOCODER="$(usex vocoder)"
 		-DENABLE_GR_WAVELET="$(usex wavelet)"
 		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
-		-DENABLE_GR_QTGUI="$(usex qt4)"
+		-DENABLE_GR_QTGUI=OFF
 		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
 		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
 		-DENABLE_GR_CORE=ON
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index b354bb235fad..c3304cfda06f 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,6 +1,6 @@
 DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933
 DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
 EBUILD gr-osmosdr-0.1.4_p20170612-r1.ebuild 1951 BLAKE2B 1c1fbdf48c2f2562bc915ec64ad446dac8b3b71e32e0ad515731204057d9b6e2f5c79530b5a0bdd44703e93b01f294cae6ab25f343749f091fd40ec9429ef204 SHA512 fc42ab57b5ab2fe4971d3043f183a35958380e97bcc5641fc791b767ecda98397fa5315b89e568666a6de475330ac4dd90709c8d81b55e30422fd107e7af2286
-EBUILD gr-osmosdr-0.1.4_p20180626.ebuild 1952 BLAKE2B 373da56a29a037cbe3bd428985ab230f48da301489ddd752f8d55c4aa37fd110ecf6479e43b11cf3522fcfa6e4cac0a16632b287bd4925f6074ce5bef7753d8e SHA512 5f1f3ae2c1b0b0a5d5b189f97394d9007250a7b0d9e8596d7edb6c5a2cbd25340ff929c245dbccf6344737bc36ed1be2f94119302205ddd29c1994302d4c974e
-EBUILD gr-osmosdr-9999.ebuild 1951 BLAKE2B 188473e7daca19b30ac21eb480164950833fc90c2f46464622d59041210d238b040b9d45c216d8b1107cc8c2d1c690694173c2665e14ed9509b3681d4a90914c SHA512 25c5db2b82e7072085fcc65d06a8472228a2f313c37dbadbe2a3078cd306a2cacf4333a05038e6b31171ee37e33db2c31deed6809daaa7e15aa35a60e09dd139
-MISC metadata.xml 807 BLAKE2B 1bfa0c852f52882323bd9a08d0ca16eb234e4514b7bc1d6825baf8e29e650ccbf28d1e33ff45c826563cd256e12eb32207a217dfdc70a5623baae2da39040a4d SHA512 9981bc760da9077c8ccf54a5184caa03f3e9614ff253f9163bd6be0245506e26489c97010186e7861f9a8513245d789c73d2f28ba3045878bf2a5b0b440b69f1
+EBUILD gr-osmosdr-0.1.4_p20180626.ebuild 2082 BLAKE2B 5b66806e3845e6bc51db6ed1adf246fab8dd5a912806dd04189999b92125faaec3a9f2a919bf8abff1367b6c70ae7a6717c028051d9ad9c51238ee904a4a6e4e SHA512 08a16041cce8badec03b191c4ad42e4a5230537601ac1d9c0eed59dd182bbf3c7a934cbe1882c21d82d5b8c5808d62231d2f0f284d91d9f50c030160b0affa4d
+EBUILD gr-osmosdr-9999.ebuild 2082 BLAKE2B 5b66806e3845e6bc51db6ed1adf246fab8dd5a912806dd04189999b92125faaec3a9f2a919bf8abff1367b6c70ae7a6717c028051d9ad9c51238ee904a4a6e4e SHA512 08a16041cce8badec03b191c4ad42e4a5230537601ac1d9c0eed59dd182bbf3c7a934cbe1882c21d82d5b8c5808d62231d2f0f284d91d9f50c030160b0affa4d
+MISC metadata.xml 911 BLAKE2B a4c8dae36039cf6bc04cf4f6532a958e4cb56fe2a67abcd4783c387887aefb61bbb47b119100418879a6cbbbeecfd1526c2010807f53d3927930146d71edeeec SHA512 f6191b6a4ffbf3106db707c624f033a5aab9cec5a0a14cc4c6aba2fe35aabdc927e0c903898dfe2e8d802a42795ac513a9562170316a49ef52fd58ae46bec947
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
index 2286e8a9c6a1..e3d156e35ccd 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
@@ -13,6 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	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
@@ -24,7 +25,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
@@ -34,6 +35,7 @@ RDEPEND="${PYTHON_DEPS}
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
@@ -56,6 +58,8 @@ src_configure() {
 		-DENABLE_RTL_TCP="$(usex rtlsdr)"
 		-DENABLE_SOAPY="$(usex soapy)"
 		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_SDRPLAY="$(usex sdrplay)"
+		-DENABLE_NONFREE="$(usex sdrplay)"
 	)
 
 	cmake-utils_src_configure
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index ffbeed261500..e3d156e35ccd 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -25,16 +25,17 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-	bladerf? ( net-wireless/bladerf:= )
+	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
@@ -57,6 +58,8 @@ src_configure() {
 		-DENABLE_RTL_TCP="$(usex rtlsdr)"
 		-DENABLE_SOAPY="$(usex soapy)"
 		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_SDRPLAY="$(usex sdrplay)"
+		-DENABLE_NONFREE="$(usex sdrplay)"
 	)
 
 	cmake-utils_src_configure
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index 9dc2a893a658..2ffcfa21c90d 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="sdrplay">Enable support for SDRplay devices through <pkg>net-wireless/sdrplay</pkg></flag>
 	<flag name="soapy">Build with SoapySDR support</flag>
 	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>
 </use>
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 63e8a082a40b..21431410983a 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,7 +1,9 @@
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 DIST iwd-0.4.tar.xz 649484 BLAKE2B 7af09a39a6c19b6ebb466d1fba857a6b7acd00d47feefe7e5053ddcdb0a64e74b7bd96a777e46ebd188af7ff5b3c1ed24ff383d11612dcffcef1aa5f210e78f7 SHA512 55c469b4e675f0c47c91bc46f0a93b704d9f2893393262aca8fd983aee16a7a13a112e9df15a31561fe72a806439a9a93fcbe1721648f3eed9ef277f9339b770
 DIST iwd-0.6.tar.xz 654960 BLAKE2B b0617b7e1a0f75de61ecd94baf34bd416b24bbbe6730e52963a705f4f5cdc002fd9dafd6eb60405414e8f05ff249c7ffb0c08c2c2d69f4aa2611d1f61ab5a2fa SHA512 2ab6fe64e7adeb5306aeb28cff850ca65c1a26b71a24042392135e7476c528c528d36d59df6e0d0d42e93b261bdb4eff7ec891c0089914588a7c64b2ed42889e
+DIST iwd-0.7.tar.xz 662984 BLAKE2B e6e7fa323749c8012c4df5f8f02f97523a37bcbb99d2a2f8c7678d4a1a73a3e24fc4321d53fb95f7fa325748f97b96e1a5f0fe0e956314eeb8534a8bc989a13f SHA512 e6029e33f43fda24f3ddb87b1bb878ad8926066380a0e71415e645bc4f8aa1a6aaa43d2482987b1d473c267fef6d5a2a676af80282ba4c77ab64605c348cabb1
 EBUILD iwd-0.4.ebuild 2533 BLAKE2B 464db65d7668436bda8af9b909a3a77ebe8add30430a50675873d2ca4367fabffe90d01a307dc150656d0827d509a3a59bd52652dace14c149794d916a9e6fd9 SHA512 b0b997df430397fbd8639c412d761bfcbd57722f216821eb9619ebdbeac9275be9aed0a21d6d9616079908c39e0a308d8e8d602dedaeabebfe578e3e7863e3ba
 EBUILD iwd-0.6.ebuild 2533 BLAKE2B 464db65d7668436bda8af9b909a3a77ebe8add30430a50675873d2ca4367fabffe90d01a307dc150656d0827d509a3a59bd52652dace14c149794d916a9e6fd9 SHA512 b0b997df430397fbd8639c412d761bfcbd57722f216821eb9619ebdbeac9275be9aed0a21d6d9616079908c39e0a308d8e8d602dedaeabebfe578e3e7863e3ba
+EBUILD iwd-0.7.ebuild 2533 BLAKE2B 464db65d7668436bda8af9b909a3a77ebe8add30430a50675873d2ca4367fabffe90d01a307dc150656d0827d509a3a59bd52652dace14c149794d916a9e6fd9 SHA512 b0b997df430397fbd8639c412d761bfcbd57722f216821eb9619ebdbeac9275be9aed0a21d6d9616079908c39e0a308d8e8d602dedaeabebfe578e3e7863e3ba
 EBUILD iwd-9999.ebuild 2533 BLAKE2B 464db65d7668436bda8af9b909a3a77ebe8add30430a50675873d2ca4367fabffe90d01a307dc150656d0827d509a3a59bd52652dace14c149794d916a9e6fd9 SHA512 b0b997df430397fbd8639c412d761bfcbd57722f216821eb9619ebdbeac9275be9aed0a21d6d9616079908c39e0a308d8e8d602dedaeabebfe578e3e7863e3ba
 MISC metadata.xml 369 BLAKE2B ea1b7bead9ec1e6973bb454f6112bdf0edd7a325d0100debbc107e142d017696e4833c541ce8370bbce249429662668940d664d935eb8b2f7a84a1869b7da2f6 SHA512 665188c4c174fee98b91cbc21923d2e7c31d6ace4229d51808157eb2ca0cc9f51ac9c12f461047ef5c3b3dafd7cdccb6410835e9471b5da0c5bbffd6e651aa3e
diff --git a/net-wireless/iwd/iwd-0.7.ebuild b/net-wireless/iwd/iwd-0.7.ebuild
new file mode 100644
index 000000000000..fa3d32f34fab
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.7.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +monitor cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+RDEPEND="sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CRYPTO_AES
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~X509_CERTIFICATE_PARSER
+	"
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	check_extra_config
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+		$(use_enable client) \
+		$(use_enable monitor) \
+		--enable-systemd-service \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd" iwd
+
+	if [[ ${PV} == "9999" ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/sdrplay/Manifest b/net-wireless/sdrplay/Manifest
new file mode 100644
index 000000000000..761ad3a547dd
--- /dev/null
+++ b/net-wireless/sdrplay/Manifest
@@ -0,0 +1,3 @@
+DIST SDRplay_RSP_API-Linux-2.13.1.run 326016 BLAKE2B 7eff1aa35190db1ead5b1d96994d24ae2301e3a765d6701756c6304a1719aa32125fedacf6a6859d89b89db5dd6956ec0e8c7e814dbd6242db5614a53e89efb3 SHA512 576be63e18084cf3e74bfb20592a44836f22fd9efe74ba9e27e5865a9ab755b26b3f2894cd8331ff876ab664d4e533d2bdbc629d552e75fcfbb3e9814dd140ce
+EBUILD sdrplay-2.13.1.ebuild 1196 BLAKE2B e13102454dde509398819dd1fd1513b6f68bdfbdb0813e937f059ba7dbbbd7737405a8457d662361ca4ff615ddd4cf86a8a466660fb3bfdf287ca64e2e5f188e SHA512 cf4e0b819c8d83efca8baf6481bafbb3183798cd41f56ea19cbcb3611adffa840dffcc44a6539c3f563edcdbb00862e17dd2dcb57c1fedcfb586c28913926602
+MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b
diff --git a/net-wireless/sdrplay/metadata.xml b/net-wireless/sdrplay/metadata.xml
new file mode 100644
index 000000000000..5840601f180f
--- /dev/null
+++ b/net-wireless/sdrplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-wireless/sdrplay/sdrplay-2.13.1.ebuild b/net-wireless/sdrplay/sdrplay-2.13.1.ebuild
new file mode 100644
index 000000000000..5528d10526f9
--- /dev/null
+++ b/net-wireless/sdrplay/sdrplay-2.13.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit versionator unpacker udev multilib-minimal
+
+MY_PV_1=$(get_major_version)
+MY_PV_12=$(get_version_component_range 1-2)
+
+DESCRIPTION="SDRplay API/HW driver for all RSPs"
+HOMEPAGE="https://www.sdrplay.com"
+SRC_URI="http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${PV}.run"
+
+LICENSE="SDRplay"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/lib64/libmirsdrapi-rsp.so.${MY_PV_12}
+usr/lib32/libmirsdrapi-rsp.so.${MY_PV_12}"
+
+multilib_src_install_all() {
+	insinto /usr/include/
+	doins mirsdrapi-rsp.h
+
+	udev_dorules 66-mirics.rules
+	udev_reload
+}
+
+multilib_src_install() {
+	if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_32" ]; then
+		dolib "${S}/i686/libmirsdrapi-rsp.so.${MY_PV_12}"
+	fi
+
+	if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_64" ]; then
+		dolib "${S}/x86_64/libmirsdrapi-rsp.so.${MY_PV_12}"
+	fi
+
+	dosym libmirsdrapi-rsp.so.${MY_PV_12} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so.${MY_PV_1}"
+	dosym libmirsdrapi-rsp.so.${MY_PV_1} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so"
+}
diff --git a/net-wireless/soapyremote/Manifest b/net-wireless/soapyremote/Manifest
new file mode 100644
index 000000000000..712777796c99
--- /dev/null
+++ b/net-wireless/soapyremote/Manifest
@@ -0,0 +1,4 @@
+DIST soapyremote-0.4.3.tar.gz 60023 BLAKE2B bff0b681d850794c7a3cc23bc9cb6276e3c579a074101ed82e76a933e5d9cd84b96fc7be5560ee166bcf624f0ba968ff259309fb9bb17fa8ccf4ebe903db5a33 SHA512 58e91c2da52440acab0930d5a913715d173c309aed83489e1adb408fbae99c22e4e549412dc5a655f266cfbfaf0a67e45eb330aaf9df0fc9b699a7aaa7c12ff6
+EBUILD soapyremote-0.4.3.ebuild 669 BLAKE2B 078f4c65fbda3a1907571daa17b71315b9ba47352fe845fc8259341e4e8a51b2fc9b5d0a4403a9fde066f2575b3d17b9acd48ffc26752f99b25f52cac18ee0f3 SHA512 d495a081d16cdfebf3e67bc0e2f54432ceb83bfadde0cf15cb3a02389af49351a1144a83b815748b4759fbab339750d01310b77fab53c106ae32a5145c44e0ec
+EBUILD soapyremote-9999.ebuild 714 BLAKE2B 10f45adb3bd980d3e95ad80dc4ee1ba45b5625a133376a9e2ecd7854ab76c576a9beac71861cc7c36cdefcca0913f31c35974b2f02fd265a9caa0a937fc9b4b6 SHA512 58320ccfbe3a96fd5abf30ed01a3de79adad946d791072cc2f3f40b772226de780cf6491f5b681475e4bae6826aeff68fbc1739b5108bfb7cbd31afe7fb8ae80
+MISC metadata.xml 336 BLAKE2B cf77d5c87670b460f2965ad571a9566510d3df71a56aed5d8b1ebbdbee2ee0332a073ff30c2410f628053ee33fe55b7d391e1a6de7802344b3c5fc5e792ed318 SHA512 b8b0bd12ddb26ac45f533bf7d46e8f2bd4306cee47283e0f71d7bfd9701a47bdb85c5082cc070a5b6bf42f518cff91861360ab68505594e3b3d35042f42d0a72
diff --git a/net-wireless/soapyremote/metadata.xml b/net-wireless/soapyremote/metadata.xml
new file mode 100644
index 000000000000..ec3d8fb8c80d
--- /dev/null
+++ b/net-wireless/soapyremote/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pothosware/SoapyRemote</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/soapyremote/soapyremote-0.4.3.ebuild b/net-wireless/soapyremote/soapyremote-0.4.3.ebuild
new file mode 100644
index 000000000000..0b994353296d
--- /dev/null
+++ b/net-wireless/soapyremote/soapyremote-0.4.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR remote module"
+HOMEPAGE="https://github.com/pothosware/SoapyRemote"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyRemote.git"
+	EGIT_CLONE_TYPE="shallow"
+	KEYWORDS=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyRemote/archive/soapy-remote-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyRemote-soapy-remote-"${PV}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE=""
+
+RDEPEND="net-wireless/soapysdr"
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyremote/soapyremote-9999.ebuild b/net-wireless/soapyremote/soapyremote-9999.ebuild
new file mode 100644
index 000000000000..e1818a79ebcb
--- /dev/null
+++ b/net-wireless/soapyremote/soapyremote-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=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR remote module"
+HOMEPAGE="https://github.com/pothosware/SoapyRemote"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyRemote.git"
+	EGIT_CLONE_TYPE="shallow"
+	KEYWORDS=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyRemote/archive/soapy-remote-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyRemote-soapy-remote-"${PV}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE=""
+
+RDEPEND="net-wireless/soapysdr"
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
index b44131525644..9626ae34d44e 100644
--- a/net-wireless/soapysdr/Manifest
+++ b/net-wireless/soapysdr/Manifest
@@ -1,4 +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
+MISC metadata.xml 692 BLAKE2B b3b592503a527d50156964ed0d3d7a8f06b1d0c80d50aff26dd6c302c9d121b18d28b4c1ec3c22f9a31430c3ec329bd97c54af10caf0e0cb00a0bb58992398c7 SHA512 cac90e6c5504f32c91ab056fea5f2c228755eaa219b0e514374eeb0b49524fff6da9c4bc31b3c110e1b3aebc97e857a176b6337d836eda4667762a8854f666e2
diff --git a/net-wireless/soapysdr/metadata.xml b/net-wireless/soapysdr/metadata.xml
index cf56d5875a6e..2d7ac62a7dfb 100644
--- a/net-wireless/soapysdr/metadata.xml
+++ b/net-wireless/soapysdr/metadata.xml
@@ -16,6 +16,6 @@
 		<flag name="uhd">Add support for Ettus USRP hardware</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">cpothosware/SoapySDR</remote-id>
+		<remote-id type="github">pothosware/SoapySDR</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/soapysdrplay/Manifest b/net-wireless/soapysdrplay/Manifest
new file mode 100644
index 000000000000..f5995a20e823
--- /dev/null
+++ b/net-wireless/soapysdrplay/Manifest
@@ -0,0 +1,4 @@
+DIST soapysdrplay-0.1.0.tar.gz 11736 BLAKE2B 746e01092d094cedb6b15b9c11ec0b828e18cd3c814e46cbe5cb9473cfd494d8342ab9618d8c5d945429b2b62178b02b81c2b000e20c53a7cb027d4b2a25c789 SHA512 28382b4ac79e27a0b84ed6edb4abeca99b90222ad2890041e1585cac21177518ca3fcea0a3e14f8502091d47e7b2a223913dd77c53b6c0360f0f3875328613da
+EBUILD soapysdrplay-0.1.0.ebuild 702 BLAKE2B 34b4faee3609e75c1f12315a2a879bd9e6b71f889ba9278492abd76d36dd27d296658108c5bd941f67d6869edef72c0fa5363489975389038b397d1b9a63c05f SHA512 622061029d0773c9bb0a7df6dd5bd280a27cdb30387aca1404311bb80d19097b7fdd0b5a82a2fe6268314fc41038d98ee29c11b29dee592e7cc039ed1b63ca7c
+EBUILD soapysdrplay-9999.ebuild 702 BLAKE2B 34b4faee3609e75c1f12315a2a879bd9e6b71f889ba9278492abd76d36dd27d296658108c5bd941f67d6869edef72c0fa5363489975389038b397d1b9a63c05f SHA512 622061029d0773c9bb0a7df6dd5bd280a27cdb30387aca1404311bb80d19097b7fdd0b5a82a2fe6268314fc41038d98ee29c11b29dee592e7cc039ed1b63ca7c
+MISC metadata.xml 337 BLAKE2B 6dc787bbdb327227a07da5497daaf4ae0e00855ce4f6114fd911b7ca063d3464a3c68d5cb74c1ff223ecba129af0e1a1fb9cd7b546f19315e03e9c4e4710d0da SHA512 f4eda418b6bd4dba31d1429cc0837ee53946132c9d4e95063a671c5a98e20f25dd0505f1bc63ee90849676d2bef1a6fb9cb87824b3c696bc1d952d50f74777e6
diff --git a/net-wireless/soapysdrplay/metadata.xml b/net-wireless/soapysdrplay/metadata.xml
new file mode 100644
index 000000000000..1ea917b38743
--- /dev/null
+++ b/net-wireless/soapysdrplay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pothosware/SoapySDRPlay</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild b/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
new file mode 100644
index 000000000000..cd6b8ca15cb8
--- /dev/null
+++ b/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# 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 SDRPlay"
+HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
+	EGIT_CLONE_TYPE="shallow"
+	KEYWORDS=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE=""
+
+RDEPEND="net-wireless/soapysdr
+	net-wireless/sdrplay"
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
new file mode 100644
index 000000000000..cd6b8ca15cb8
--- /dev/null
+++ b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
@@ -0,0 +1,30 @@
+# 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 SDRPlay"
+HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
+	EGIT_CLONE_TYPE="shallow"
+	KEYWORDS=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE=""
+
+RDEPEND="net-wireless/soapysdr
+	net-wireless/sdrplay"
+DEPEND="${RDEPEND}"