gentoo resync : 18.11.2018

32 files changed, 192 insertions, 77 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index ff195c080954..5bc0a84a8997 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 0f4cf782ab5e..4c29e9b0a0b5 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,8 +1,8 @@
 AUX csete-iio.patch 18603 BLAKE2B 437bc8318e88090012cfc98a1b5910ade54b191abb6cb96ea82ba1974c68682477d7429489546fca21ce19d3b9042d6321146d34c0cf8bf94f591bf8da576a39 SHA512 b8c41a1df12a1a74a4d491e694e89d9de753791a433da4d8451c2b20a3e448312316cf66b8bd7d2c1445d91e483331c4328e0acc738fc0dc61ab98b30d48a14a
 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-r1.ebuild 2211 BLAKE2B 6a566af903372294a7e93d1b03d4fde277f11a617edf114994e3ee3f6f1aa2c69391e0abdc0034aec0979890a0b6f8cc189498d84602618410f0326fa7bbf25c SHA512 a20f8c1beee6294dcc55fd1598af873bdb153030ab29d0e3f0ecf5632d1cc070df40dde0d66eabb05716929e5f94f39917e8be97a72fe819e2f6410e47e3bd2c
-EBUILD gr-osmosdr-0.1.4_p20180626.ebuild 2082 BLAKE2B 5b66806e3845e6bc51db6ed1adf246fab8dd5a912806dd04189999b92125faaec3a9f2a919bf8abff1367b6c70ae7a6717c028051d9ad9c51238ee904a4a6e4e SHA512 08a16041cce8badec03b191c4ad42e4a5230537601ac1d9c0eed59dd182bbf3c7a934cbe1882c21d82d5b8c5808d62231d2f0f284d91d9f50c030160b0affa4d
-EBUILD gr-osmosdr-9999.ebuild 2082 BLAKE2B 5b66806e3845e6bc51db6ed1adf246fab8dd5a912806dd04189999b92125faaec3a9f2a919bf8abff1367b6c70ae7a6717c028051d9ad9c51238ee904a4a6e4e SHA512 08a16041cce8badec03b191c4ad42e4a5230537601ac1d9c0eed59dd182bbf3c7a934cbe1882c21d82d5b8c5808d62231d2f0f284d91d9f50c030160b0affa4d
+EBUILD gr-osmosdr-0.1.4_p20170612-r2.ebuild 1950 BLAKE2B aca9b716335f5b39ae8f5c87359fb3fe099a80c2e5425bc9f08cb4611def2c2f11d09edf487d4d805cbc9f9d650aef3af74b12fd7f09a04bc9ba2e852fa385ea SHA512 55d58bce20aeebcfd5a71a14f1da0f923b41e1f6dfc7468877f737284d34d5fb48081ada94efcbcdc4defa26d626cb04d3b5dc7451ad171669e2c1e58fca1cc3
+EBUILD gr-osmosdr-0.1.4_p20180626-r2.ebuild 2081 BLAKE2B 07d45fa701bde6b687139a68af7500b3d582fecea5e2a083d82e4e995c9bfdb6fcefcf7cf043c7ee9520cc5ac6ebbd000c6d106446fc63933813befdcd0837af SHA512 5b9e6dbfa918117698ddf622f71a62868214e5dee06146b371724026b2c6c2c3134a547dea03d75bb1b050b7d6004a08aeca2bf0460dc6bda0dd8f1dfe76cb66
+EBUILD gr-osmosdr-0.1.4_p20180626-r3.ebuild 2210 BLAKE2B 74fcd619a155be749005f1eee751864f7dcda579b1f2f09bd1aed693464b92ae042e3fe094d73b18c50f606d47eb25d42ec70550c03ff05729ca954d67f58028 SHA512 a838bb31d61fbcd0ca94b7a0bbfd880a0c389e88336f50e95f77d778361860381c3ef7fadabaa7e958257d1c2f7cb7401e039f36cb56399e764139b64500ef32
+EBUILD gr-osmosdr-9999.ebuild 2081 BLAKE2B 07d45fa701bde6b687139a68af7500b3d582fecea5e2a083d82e4e995c9bfdb6fcefcf7cf043c7ee9520cc5ac6ebbd000c6d106446fc63933813befdcd0837af SHA512 5b9e6dbfa918117698ddf622f71a62868214e5dee06146b371724026b2c6c2c3134a547dea03d75bb1b050b7d6004a08aeca2bf0460dc6bda0dd8f1dfe76cb66
 MISC metadata.xml 1010 BLAKE2B e4f3fbd3eb67c98876fb8df6db5d809011a8cf120134cb34ed63254b328e15914e696c80c848313c296c43cca71d0c61feb6788effacce30862d982ff6cf8975 SHA512 7144c3e40a28dc0e684f236ec7c70269a7734b3ca55df89f159e803904a43883563b8efb3b1bbc8f3f6eb96bf1c18040df4b1528f5bf1a674f8e8d875dbd69d3
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r2.ebuild
index 6e8fa0434f9e..c60df9c387d6 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,7 +34,7 @@ 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 )
+	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
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-r2.ebuild
index e3d156e35ccd..2e7d5bdcee77 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
 	sdrplay? ( net-wireless/sdrplay )
-	soapy? ( net-wireless/soapysdr )
+	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r3.ebuild
index 3c468c6f97e3..952e813ad617 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r1.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ RDEPEND="${PYTHON_DEPS}
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
 	sdrplay? ( net-wireless/sdrplay )
-	soapy? ( net-wireless/soapysdr )
+	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index e3d156e35ccd..2e7d5bdcee77 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
 	sdrplay? ( net-wireless/sdrplay )
-	soapy? ( net-wireless/soapysdr )
+	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index bb731d93e65a..a6f63e75575c 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,4 +1,5 @@
 AUX fix-setuptools.patch 2415 BLAKE2B 880353193f8ba3285b3e91c60a2938b2c67d0b91fd6cfb47504f5bfdba75a29e4c8f3d7b47d5ef2a7b2fdbc2f0587002f7ec58fa80b68919c949ad01498416ad SHA512 fa73125ad86b98513e6112efc5bf8a78a41aa804dc526d304eb89f1f3b53b2298bba2025860f12f74523dffc623a8f68027de48e19fd83afba0f39b6d720179d
+AUX fix-setuptools2.patch 2239 BLAKE2B 9d5ace68d76f4d1de1688055d98cd28257c776705f8337efc3a919118f1fa27597495255dc4e247f4f7a18d33769d5c2a47f66f728b2d67fc1bb2dbc92bc7cdb SHA512 6bbcee8f546753ad45532b73586d67f5ca4e155a583a823d7d9fb0d9a5401048ccb0049bda0bfa03a8cfdca36d25026902ff4401deb51e1e477760fa3e7d16a0
 AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27eaf48f292fc1a926c5f36031b9f93154e453fe1a1ca85e3988eac625334ee1fb75433de289413a0347ed2f92624d061e4fed SHA512 4bc4832e1f15c3917b67ff80d8b054b6a8aca9a8b03cf3f78cfb2a9b45fdb1f2f2785c2864cfb31bb05cf4da9adca3f96b6df47667107430a7020814ed07549b
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
@@ -6,5 +7,5 @@ DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e115
 DIST kismet-2018-08-BETA1.tar.xz 2043136 BLAKE2B f24af4250bb0238073380514413d9501e449cf40507d7a96ac868d76acb34af81b9bf4a49c9b6197b6b903ab33e2318bb5efa22876cc2070e3878ebf030d592c SHA512 09eab9d648f011c95b8632c666990d79f9998465b051a65357f53af19a135a5d58df3025ec60f9ef9a7b7d9b5622d2332bb2defbffd21ca0e25e2e4090ceae2f
 EBUILD kismet-2016.07.1-r1.ebuild 4191 BLAKE2B 121e49130ad54fc963b011b005fa33ea6d01e71cf699232c744f7a497076b489e8913da9a0341becb21657de947204cd260e95ef46fe111716de1b1b6781b521 SHA512 ceefe51d38f6375629708be15a23a9e382578a8b4474503e2ff61bb912ab3ae313b37f417880f180094439505ea36fdbd9aeab95cbd426cc3f744985615080fc
 EBUILD kismet-2018.08_beta1-r3.ebuild 3013 BLAKE2B 8c7cd86f4c3af3eaeca6278630ccd1107bdbc199185796eaf44a4a5074716525a9ddbabd8c1bbc18bdac9b6baa8c2e006b72a0ee26a9ed60c03015c112266e95 SHA512 3bc7ce21415d3c24bccb6f279d208f1c423fb8e6c49dbab2b00d7202056bc647f051672d2cc3da2c856b49a096a40b92584786c88bc1e8ae9a711f3d14f5c216
-EBUILD kismet-9999.ebuild 3013 BLAKE2B 8c7cd86f4c3af3eaeca6278630ccd1107bdbc199185796eaf44a4a5074716525a9ddbabd8c1bbc18bdac9b6baa8c2e006b72a0ee26a9ed60c03015c112266e95 SHA512 3bc7ce21415d3c24bccb6f279d208f1c423fb8e6c49dbab2b00d7202056bc647f051672d2cc3da2c856b49a096a40b92584786c88bc1e8ae9a711f3d14f5c216
+EBUILD kismet-9999.ebuild 3014 BLAKE2B abf6803d94e860d12d338ea58965522dbe333c39410e45aa9b3ef45139697092598f6966283fb1bd6c9ac22473091b7fbff80b34e87b468056c263a85f133af1 SHA512 236c8052fcb46fa6b8f2294cd6c67b3e8ef63f7f432e7a4dbf1e8561d2413593acf8ecd4b1e355a78a0883858bc0fe90f71d150c41b736d6637edceba76bfa94
 MISC metadata.xml 1159 BLAKE2B 2e72c1c62f31b52445c83b6b0d7695c7f1231de69fbe865e123a18dc0030a0f57586b058a7e738d561f48413e8a6ff0e8ac73428de2c41688e5baa1e4c255af1 SHA512 cf7c0f4c38f0a5e7b9c51c9fc98f5dd49e51159986443687a81d486c8805aea069168832f406a16b36dc6342be063fdbcade74685273fcdd2111ea9a616437d7
diff --git a/net-wireless/kismet/files/fix-setuptools2.patch b/net-wireless/kismet/files/fix-setuptools2.patch
new file mode 100644
index 000000000000..2f72b258af99
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools2.patch
@@ -0,0 +1,65 @@
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
+index 97fb50b7..492f6a90 100644
+--- a/capture_freaklabs_zigbee/Makefile.in
++++ b/capture_freaklabs_zigbee/Makefile.in
+@@ -6,7 +6,7 @@ all:
+ 	$(PYTHON3) ./setup.py build
+ 
+ install:
+-	$(PYTHON3) ./setup.py install
++	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
+ 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ 
+ clean:
+diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
+index 2e82ac5f..fa4314b2 100644
+--- a/capture_sdr_rtl433/Makefile.in
++++ b/capture_sdr_rtl433/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ 	$(PYTHON3) ./setup.py build
+ 
+ install:
+-	$(PYTHON3) ./setup.py install
++	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
+ 	# These are now part of the setup.py install
+ 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
+diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
+index 4dc83d11..4bf912b3 100644
+--- a/python_modules/KismetExternal/Makefile
++++ b/python_modules/KismetExternal/Makefile
+@@ -4,7 +4,7 @@ all:
+ 	$(PYTHON3) ./setup.py build
+ 	
+ install:
+-	$(PYTHON3) ./setup.py install
++	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
+ 
+ protobuf:
+ 	$(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
+diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
+index 910ca9d9..cafd3902 100644
+--- a/python_modules/KismetLog/Makefile
++++ b/python_modules/KismetLog/Makefile
+@@ -4,7 +4,7 @@ all:
+ 	$(PYTHON3) ./setup.py build
+ 	
+ install:
+-	$(PYTHON3) ./setup.py install
++	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
+ 
+ clean:
+ 	@-$(PYTHON3) ./setup.py clean
+diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
+index 910ca9d9..cafd3902 100644
+--- a/python_modules/KismetRest/Makefile
++++ b/python_modules/KismetRest/Makefile
+@@ -4,7 +4,7 @@ all:
+ 	$(PYTHON3) ./setup.py build
+ 	
+ install:
+-	$(PYTHON3) ./setup.py install
++	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
+ 
+ clean:
+ 	@-$(PYTHON3) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 1964da67d1e6..4ef4ac444ddd 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools eutils multilib user python-single-r1
 
@@ -66,7 +66,7 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
-	epatch "${FILESDIR}"/fix-setuptools.patch
+	epatch "${FILESDIR}"/fix-setuptools2.patch
 	eapply_user
 
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/net-wireless/linssid/Manifest b/net-wireless/linssid/Manifest
index 2a0af3c76b13..64c36e971a5a 100644
--- a/net-wireless/linssid/Manifest
+++ b/net-wireless/linssid/Manifest
@@ -1,3 +1,3 @@
 DIST linssid_3.6.orig.tar.gz 397541 BLAKE2B 35d56cc9439a3a117200c59a03dad3a53bbecbe522a5592ba4cd6a5d37332c4b8c6ec065b7357643bda6b7b54462d720e3ee0b3efcb5a80e14c809330d84fc2b SHA512 066c890776a23d0e5fe8518826c64edc4b7d6dcef28cd7ce58f842e52b9e2b13517358ca6df636613abd1e860b20c6b542b5df165de1aa262e1e7db8a60e00e5
-EBUILD linssid-3.6.ebuild 1361 BLAKE2B 66b063fc1c26b202295d61f748e42b61843102ee1126463b6d4bd6993ea0458dba8aef9ef3f374490d1ad50933fde9c24547d04e50d2bf421dcae35409b136e8 SHA512 803adb84a9c424000ad90730a350563571c88378fade321b8f6d01e8ab9344a1e5855423ef8aca1a2401936795d4b712a7afff9c0bd3eb5bff76e120b4784d84
+EBUILD linssid-3.6-r1.ebuild 1090 BLAKE2B 7e796a4ba1309bb18448ab51e2cad45791046fdce29d5054e0e45baa815ad36575f566be7168eb05bdd91963a675d22eaae507a42abda28c0e9504f9de10ad97 SHA512 bc41231617f4741c5c8a44d3de0c4748e01ab0a18b87ff67f094d968731a9cc26ec2eda0c92a0ba18f4fe13d5565e7c170d8689244ba23b269b126a98f6d0c6c
 MISC metadata.xml 870 BLAKE2B b769f54c91d56f89b67f1375f07eb9c7f72a80db1a05cf7998b83488204a4c07011aee881c3503ea0bdc60930a595c57301a01bb866ef46bc928e4d46a076815 SHA512 2f1248f1540ef58073808c08a87b3e813e2a50af2624f9230618626f3efc5a3f5719d4792e0c391d2fc1aa95770366cf510c9fd36689008ca1f8e0369763ed8e
diff --git a/net-wireless/linssid/linssid-3.6.ebuild b/net-wireless/linssid/linssid-3.6-r1.ebuild
index 79d6ce72d296..8dc533ea7ce7 100644
--- a/net-wireless/linssid/linssid-3.6.ebuild
+++ b/net-wireless/linssid/linssid-3.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils xdg-utils
 
@@ -12,39 +12,32 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="policykit"
 
-DEPEND="dev-libs/boost:=
+DEPEND="
+	dev-libs/boost:=
 	dev-qt/qtcore:5
 	dev-qt/qtopengl:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	x11-libs/qwt:6[opengl,qt5(+),svg]"
+	x11-libs/qwt:6[opengl,qt5(+),svg]
+"
 
-RDEPEND="net-wireless/iw
+RDEPEND="
+	${DEPEND}
+	net-wireless/iw
+	sys-auth/polkit
 	x11-libs/libxkbcommon[X]
-	policykit? ( sys-auth/polkit )
-	!policykit? ( app-admin/sudo
-		x11-libs/gksu )
-	${DEPEND}"
+"
 
 S="${WORKDIR}/${P}/${PN}-app"
 
 DOCS=( README_${PV} )
 
 src_prepare() {
-	# Use system qwt for compiling
-	sed -i -e 's/CONFIG += release/CONFIG += release qwt/' linssid-app.pro || die
-
-	# Fix lib path for x11-libs/qwt
-	sed -i -e '/libqwt-qt5.so.6/c\LIBS += -lqwt6-qt5' linssid-app.pro || die
-
-	# Enable 'gksu' when a user don't want policykit
-	if ! use policykit; then
-		sed -i -e 's/Exec=.*/Exec=gksu linssid/' linssid.desktop || die
-	fi
-
 	default
+
+	# Fix lib path for x11-libs/qwt and use system qwt for compiling
+	sed -e '/libqwt-qt5.so.6/c\LIBS += -lqwt6-qt5' -e 's/CONFIG += release/& qwt/' -i linssid-app.pro || die
 }
 
 src_configure() {
diff --git a/net-wireless/soapybladerf/Manifest b/net-wireless/soapybladerf/Manifest
index 01c2781bbf4b..fe40c9daa432 100644
--- a/net-wireless/soapybladerf/Manifest
+++ b/net-wireless/soapybladerf/Manifest
@@ -1,6 +1,6 @@
 DIST soapybladerf-0.3.5.tar.gz 27937 BLAKE2B eb94e0deb97a376b2e45f41100ce64ed4a0718c9b2623b4270e27c23faa0c035d6568b2a8129308851a75ebef8f9f7e9ad519af23896493ca4616d271e0a2438 SHA512 af22703c16d8b40d58e966ce9ce705652e2661bd46d2c0dc2a2c0315a66f4283172d17de4dc3d080cf011cdde9c002107653fe5a02de27df19b47098235f40a7
 DIST soapybladerf-0.3.5_p20180908.tar.gz 29426 BLAKE2B 0e6830e2c930178d995c104f22df6a6104a531ea53166c2c6b5e7c652ae6699a1a3c32b455af50f6c3990c868043d8d20edaac9acabc3a9340744ee6a66e6bb9 SHA512 fc0be84e8c1a51caf6e3a73b60cea998317924b041c578a507c4fc0bdab3f70115796a1fc932531466685dcefe47949283c4d4834092126b9b3e60ae237952cc
-EBUILD soapybladerf-0.3.5-r1.ebuild 661 BLAKE2B 9cfdbd85c2f11c369659775747ba2fa7d08f881091f8be561d98995a0e68200a8a95f6460fb7bd6ee1e79ec1636aae67892aefe6cb42e350283225322f4c9539 SHA512 aad2be9f1e72fbab7af4cbecea8b23c5f6a40a5d36b313c49b0ad6e1282b1580027c7aae7c7c4eaf893b079f69e45decc6df6169bcbc6e762bf11fb530c2395b
-EBUILD soapybladerf-0.3.5_p20180908.ebuild 692 BLAKE2B 22886614b6413714f4f15d8e04fb2a4640ba726d4bdcabd937539ac128574e036867ad8cb95be569e4d1c171540d0797cd3d2a49539c6fc3bc4a251406b7e63b SHA512 d868848f138fb0e21d7e7030af4fc121839ef28e82167d8619127bddd39187184881c3d5076f93b6ed7de69d3cb495ac955bd5267760e7597361741ef859a0bd
-EBUILD soapybladerf-9999.ebuild 663 BLAKE2B 989091009ea0454bb2a4660c13615975014ee61d79fa44c6add805863b40f2d92d6628692f14945b7c33a017628df5512af446b9627b802e1e9a79068cd687a6 SHA512 9d0e68fdd6a85347bdc8fe09d55330bab43d41740d5b74dfac463a5817585da600fb65f9332e0a261b0e3a5a70d3b2fe7645e0fdc69528d7ff824db3e1bda261
+EBUILD soapybladerf-0.3.5-r2.ebuild 660 BLAKE2B 127473c9f16feb3163488f7bc59bdd0604562351e5b61f2596dc5678b095f6e6684e223ae8643117719b716940fb125422480e0eda7b3969f181f8e2614e23ac SHA512 e7906572e540d4cc0b7d7d808263f2426b37dbb9f0ea6bfd999e31a23d611f7a38c63047d6fa4d4589926448e754d200ef1263544fdefafbde5156660426ebb8
+EBUILD soapybladerf-0.3.5_p20180908-r1.ebuild 691 BLAKE2B 2dc96fc4b4a35a14ee53ad2b5b4f5e0e6a060400d49890d83b8a0166f410c6ed8abf22182c94ce16e307ab4fca7a1423b96ea35b1720a42f787867b18458ecbe SHA512 82f3d16ec126f69fab49061227b963f5919b2de45ac898d564d0d31d8e9f9d12eb3e483e6cbd83b23c69c308806c4f5d5ac3806d826897136787e740fe5975e5
+EBUILD soapybladerf-9999.ebuild 662 BLAKE2B 11e046e4bff90382e38d25c53789d5263d064f9a2f31193c1873fed96ee295e6dd06c914d8211aa8f16dd420b047b49f3a24d34846d1001a349205ee6bdc74b8 SHA512 31e54c3824cdc922315d2c30e3d4944de555937d0b3860776ba3fd273220e3fab73d08eb64ec5af2afd974f0782dfd9b0da946aaea23a7f547b805492df3234c
 MISC metadata.xml 434 BLAKE2B da3841724dfb1d301e29abd0c97ff4db9cb851fe55b1fb1ac576d39edb2dbb800bfc5b0857132325103b0138c6809d38d4af49b7548214f83dda38b2ce0ce39d SHA512 a672da1167904fe55179376d6c769066ab66639369fae311ad3a6b9afcab931554f148920c4deedcfbb57cd4fd8cee940462082a7fa68408913731939f651439
diff --git a/net-wireless/soapybladerf/soapybladerf-0.3.5-r1.ebuild b/net-wireless/soapybladerf/soapybladerf-0.3.5-r2.ebuild
index 4c545752914c..3be6c60b5c5b 100644
--- a/net-wireless/soapybladerf/soapybladerf-0.3.5-r1.ebuild
+++ b/net-wireless/soapybladerf/soapybladerf-0.3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,6 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+RDEPEND="net-wireless/soapysdr:=
 		<net-wireless/bladerf-2018.0:="
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapybladerf/soapybladerf-0.3.5_p20180908.ebuild b/net-wireless/soapybladerf/soapybladerf-0.3.5_p20180908-r1.ebuild
index e24893ce1f73..dd0ab129a9d6 100644
--- a/net-wireless/soapybladerf/soapybladerf-0.3.5_p20180908.ebuild
+++ b/net-wireless/soapybladerf/soapybladerf-0.3.5_p20180908-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,6 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+RDEPEND="net-wireless/soapysdr:=
 		>=net-wireless/bladerf-2018.08:="
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapybladerf/soapybladerf-9999.ebuild b/net-wireless/soapybladerf/soapybladerf-9999.ebuild
index d101cd73ff36..d712d0943f84 100644
--- a/net-wireless/soapybladerf/soapybladerf-9999.ebuild
+++ b/net-wireless/soapybladerf/soapybladerf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,6 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+RDEPEND="net-wireless/soapysdr:=
 		>=net-wireless/bladerf-2018.08:="
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyhackrf/Manifest b/net-wireless/soapyhackrf/Manifest
index 80c76f42b684..2cf88ac5c090 100644
--- a/net-wireless/soapyhackrf/Manifest
+++ b/net-wireless/soapyhackrf/Manifest
@@ -1,4 +1,4 @@
 DIST soapyhackrf-0.3.3.tar.gz 15853 BLAKE2B 2e4c551add132e153033197ca6dc4762bac854d0959b524de7c65cdb0371ff862a52102868a1c9a5ad730c43d09730c2093666d186b79abe0d3d74e84b76a800 SHA512 d0e6ddbb8054b11bfb121a18e435c0f0c23290e5e29e89af83f660865e1c8adf4ed38082c96ab6a3cb68a50b7379f3fe5ef171616eccabe3f67d65b71d08dba9
-EBUILD soapyhackrf-0.3.3.ebuild 633 BLAKE2B c0149f8cb1f577f83b31821265a3356219f4b3b9b1609f01b0fdabd87d3f973af4fd32f79c3a5c27bbebe6e6018e17ffd3e6d747261f84d20d54f18d0aabaa04 SHA512 6d676eaa271fbf6376a7a4a818ab73a130668224124ad85bcfb3bcac6108d5cb94bb4acaa02715f230b7b9bab564561e88421ccf54b34db528c06d51c2e95901
-EBUILD soapyhackrf-9999.ebuild 633 BLAKE2B c0149f8cb1f577f83b31821265a3356219f4b3b9b1609f01b0fdabd87d3f973af4fd32f79c3a5c27bbebe6e6018e17ffd3e6d747261f84d20d54f18d0aabaa04 SHA512 6d676eaa271fbf6376a7a4a818ab73a130668224124ad85bcfb3bcac6108d5cb94bb4acaa02715f230b7b9bab564561e88421ccf54b34db528c06d51c2e95901
+EBUILD soapyhackrf-0.3.3-r1.ebuild 632 BLAKE2B 3758a2f6cfd22aac5939efbb9b66df6fb5cf381429e14b6b5a4df1bdabd07559283798b13ed35675dbf61858a44f72b89ab76a528b99a7a00e14fbaf110a82b4 SHA512 27cbed542794cbfb6bfa78fd188f751a7899385cb710916e8045a7bf88ad7361865f3fd218c901e953cf72bcd4b220fc87c4b67edbfcbcd0bdefd876bf30820d
+EBUILD soapyhackrf-9999.ebuild 632 BLAKE2B 3758a2f6cfd22aac5939efbb9b66df6fb5cf381429e14b6b5a4df1bdabd07559283798b13ed35675dbf61858a44f72b89ab76a528b99a7a00e14fbaf110a82b4 SHA512 27cbed542794cbfb6bfa78fd188f751a7899385cb710916e8045a7bf88ad7361865f3fd218c901e953cf72bcd4b220fc87c4b67edbfcbcd0bdefd876bf30820d
 MISC metadata.xml 433 BLAKE2B b7864a9b9321c5cf86ad577d28555f00e4fd49ac6fada7c22a4e204fb38508e3f3e4cd3020940b8cae33b0aa14338e3c96b044bd56804d181d018f5c31be82bd SHA512 6ca16459623f460a4d9b6b101aa96e1092ee29ccdb9098780b236596608505886d047d0207ea65a2415fe7096f595c2a9c3161bbcc1131ac0977b8d0f66011cf
diff --git a/net-wireless/soapyhackrf/soapyhackrf-0.3.3.ebuild b/net-wireless/soapyhackrf/soapyhackrf-0.3.3-r1.ebuild
index b5dece6d6651..0215983c3ec2 100644
--- a/net-wireless/soapyhackrf/soapyhackrf-0.3.3.ebuild
+++ b/net-wireless/soapyhackrf/soapyhackrf-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,6 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+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
index b5dece6d6651..0215983c3ec2 100644
--- a/net-wireless/soapyhackrf/soapyhackrf-9999.ebuild
+++ b/net-wireless/soapyhackrf/soapyhackrf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,6 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+RDEPEND="net-wireless/soapysdr:=
 		net-libs/libhackrf:="
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyplutosdr/Manifest b/net-wireless/soapyplutosdr/Manifest
index cc43387bddb7..bad5ab0b5947 100644
--- a/net-wireless/soapyplutosdr/Manifest
+++ b/net-wireless/soapyplutosdr/Manifest
@@ -1,4 +1,4 @@
 DIST soapyplutosdr-0.0_p20180825.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7
-EBUILD soapyplutosdr-0.0_p20180825.ebuild 714 BLAKE2B 105abb2805863cb268291cd5705bdd02241e5c1ca9c35e2c55ab27335067a363199d49ac079bb8700cfcebc4e03085161287f19687ee71a166ce1f78949d3390 SHA512 902bde9e0168da760af1735e6ed1b5fb2ec0412e21301c6367d2149c097aa81ec9934170e412df02af45fc5f6998d921d973c51588613c878b3d08f4071a96d0
-EBUILD soapyplutosdr-9999.ebuild 714 BLAKE2B 105abb2805863cb268291cd5705bdd02241e5c1ca9c35e2c55ab27335067a363199d49ac079bb8700cfcebc4e03085161287f19687ee71a166ce1f78949d3390 SHA512 902bde9e0168da760af1735e6ed1b5fb2ec0412e21301c6367d2149c097aa81ec9934170e412df02af45fc5f6998d921d973c51588613c878b3d08f4071a96d0
+EBUILD soapyplutosdr-0.0_p20180825-r1.ebuild 713 BLAKE2B 4d87dcef2f0e61075f5d8ce10fbac767aa5e30f9f8eb327c6b93ac5d462507326648c0fe2412a2ba460f7ca3a4e087e9fa96b84a0e52edc7c9a3c844ab46f17a SHA512 847eb690033af589a4624a643427d1d540c98f056feee104e1bbba3abe5d8ddce9e7c4ba78030cbba5f2c4908578a038d2db1f3dc2db949a694bccfbfdba422b
+EBUILD soapyplutosdr-9999.ebuild 713 BLAKE2B 4d87dcef2f0e61075f5d8ce10fbac767aa5e30f9f8eb327c6b93ac5d462507326648c0fe2412a2ba460f7ca3a4e087e9fa96b84a0e52edc7c9a3c844ab46f17a SHA512 847eb690033af589a4624a643427d1d540c98f056feee104e1bbba3abe5d8ddce9e7c4ba78030cbba5f2c4908578a038d2db1f3dc2db949a694bccfbfdba422b
 MISC metadata.xml 435 BLAKE2B 2a0b2a0043234cf560ee6b76935c546da77ae108e3fd4e8187dcac974d1ffed8e50e86f94fb943e4396c0bc338ae1a92b899da38f7a88d3bc0c6437bf95282af SHA512 c66683ba419f5dd3d7ea63d07478366ae751ecd38250ba07fe157375d937bc0f42ae6324716dd7068c33e1d405f98207b676c6dfee3b1b1870bfb6f73b9e8a7d
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825-r1.ebuild
index a5f9a164f11d..0ebf43c8590a 100644
--- a/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825.ebuild
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+RDEPEND="net-wireless/soapysdr:=
 		net-libs/libiio:=
 		net-libs/libad9361-iio:="
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild
index a5f9a164f11d..0ebf43c8590a 100644
--- a/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+RDEPEND="net-wireless/soapysdr:=
 		net-libs/libiio:=
 		net-libs/libad9361-iio:="
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyrtlsdr/Manifest b/net-wireless/soapyrtlsdr/Manifest
index 2048e7c8fb72..c09f9e773497 100644
--- a/net-wireless/soapyrtlsdr/Manifest
+++ b/net-wireless/soapyrtlsdr/Manifest
@@ -1,4 +1,4 @@
 DIST soapyrtlsdr-0.2.5.tar.gz 14101 BLAKE2B 3fc48e5cece291220a64ec1fd06492a94497e3e639c4fbdcb4c88d4b0431676bbf7a8d531123acc91d937380abe6a96a1b9df4cd7150203e31e17ba859da7113 SHA512 2e6343833d0ef48b11c6be6ea85c87276d58ab810b6b47fa2735b909beb6a758856ef2cbef3a0d478c27dd1fea829a049dd91252ae9807415f8ea66f15054a64
-EBUILD soapyrtlsdr-0.2.5.ebuild 642 BLAKE2B 7b21c292da81448ee01e86752502dd75bf0e403c6c7d2a849767c9aa525f4245654fa2b42c67fd7c5877a5217e312a11c96749905480cddd937492a737ee6f8e SHA512 f0dc7f8a53b950081d9e16a1394a933754fcdd566bebe4212d6e41d4402fd3c07d1d9e8b4d170ef5f38ca2673077a677b256a669062b6a53d2ac658ad4796399
-EBUILD soapyrtlsdr-9999.ebuild 642 BLAKE2B 7b21c292da81448ee01e86752502dd75bf0e403c6c7d2a849767c9aa525f4245654fa2b42c67fd7c5877a5217e312a11c96749905480cddd937492a737ee6f8e SHA512 f0dc7f8a53b950081d9e16a1394a933754fcdd566bebe4212d6e41d4402fd3c07d1d9e8b4d170ef5f38ca2673077a677b256a669062b6a53d2ac658ad4796399
+EBUILD soapyrtlsdr-0.2.5-r1.ebuild 641 BLAKE2B 0500aa30519312a6b95b4ec20cbd2066f456b2f95f81ee74554364588a9ae159fdafbc807176495dac3b5cef2a181b28c3325cb8ef39c756bc3cdd23011976ae SHA512 ebf01b8602e0eff83fe4d515923df6c13ff885352a31f3b0d0dc4ef8ba11c9c3e2148cbbce80cecf70fa4bdc64991150077c5dcb7cf14b17defcfab9641690f0
+EBUILD soapyrtlsdr-9999.ebuild 641 BLAKE2B 0500aa30519312a6b95b4ec20cbd2066f456b2f95f81ee74554364588a9ae159fdafbc807176495dac3b5cef2a181b28c3325cb8ef39c756bc3cdd23011976ae SHA512 ebf01b8602e0eff83fe4d515923df6c13ff885352a31f3b0d0dc4ef8ba11c9c3e2148cbbce80cecf70fa4bdc64991150077c5dcb7cf14b17defcfab9641690f0
 MISC metadata.xml 433 BLAKE2B 17192d2957af1deaddf7baec5c5ff77eb4ea40bbd80b7a91e5a36f91a4b53f6f6b142dc76ade70c016f8934905642c49851857bcb7823e5e3adee5e24cfccece SHA512 6b6295bd49522a9c1eb4747c4039a77201ec2dabb03250dae21b93605a1df695970d33ebe12108bd2effa7fc07ba6ab695de949e02099f89b7e334531145fe41
diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5-r1.ebuild
index 0527f6ff8d21..1ae13f826167 100644
--- a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5.ebuild
+++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,6 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+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
index 0527f6ff8d21..1ae13f826167 100644
--- a/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild
+++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,6 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+RDEPEND="net-wireless/soapysdr:=
 		net-wireless/rtl-sdr"
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
index 533c97dc58f6..3d9139c500ef 100644
--- a/net-wireless/soapysdr/Manifest
+++ b/net-wireless/soapysdr/Manifest
@@ -1,4 +1,6 @@
 DIST soapysdr-0.6.1.tar.gz 112820 BLAKE2B 42376a7a43c0d5a87a5b17b7d901cc7c74885083051c433c1f22427fe07a4fb0f111ddb460867bd7f748cb3ac6858b15e3dc69ba3ecca4574802c6bd0856a8cc SHA512 80ae8d0b096139e0df70524a1ff05fa1954755177d7920dbd8acb37e45cf86729e2745dcfd4e9c7ae2d7aa564335c2f197ca25ea387daa8f376d6c3e93234106
+DIST soapysdr-0.7.0.tar.gz 122933 BLAKE2B 2bd2f8812a6258a92ca4fe82ced10e3e97e348927dfc8a1f702a7ee4900b4fbe966a32566d1640a3474734074524cf31d8850b47a9b177e6e0e4d92c531409a6 SHA512 3dc69f070a2fe7acee9239154e58b21aa9c321fe35e2de77dfed8561016a93d5e693b5288da6d05e3d8c0f9ab7552ea12c4fd74ddb8d3c118d576f58251fb632
 EBUILD soapysdr-0.6.1-r1.ebuild 1287 BLAKE2B 26745867d415a983dce5bfcb5f300001dc11891ec2c63e7593b31367ec88cd3881a3a3a1bec201c58a8908ac295d072698c06023d6e8bf5cc0bcc1301d83b228 SHA512 1d955ae324654c320fca18fb7ff80b5de879ce074e6a3e50e1f650900e4c639a50e4a6882580e5bf6cefa7bd690a0f48d9baa908f4b9374b82af163e94e688da
-EBUILD soapysdr-9999.ebuild 1235 BLAKE2B 78b749481db6750124259a0e3a66034c94ede5fda924873edf807d78eff2f903b09d5c1fa1a3147810a4d930a1cd47a2eb6dbaa0e472e76d13559d00732dfcc6 SHA512 2e222f6e840fbb7e31fb4e56191a34c3b2bf1d469fbe4f60a8a09ec00fcdfc874aa0da63e48de686e1b17e6e70ee57490fda991b748db2e2321f47c879043673
+EBUILD soapysdr-0.7.0.ebuild 1290 BLAKE2B 3b2850132b31856a4b37374f28af34db3b88acc9d4c75a1a95cfd7d962932cd127424cf9a0199f1ec253ab7f13fb10baf9f4f468d40797ae2ac7c7ed79dd6372 SHA512 5e25b4f3f7f777d1413762b15e8adcca28506a498383b219c0c9de303897e2eff7e1e74a812ccd49717d471e7e3a6fb9aa5ef8a7507bf236f1a9ece8e11e9255
+EBUILD soapysdr-9999.ebuild 1290 BLAKE2B 3b2850132b31856a4b37374f28af34db3b88acc9d4c75a1a95cfd7d962932cd127424cf9a0199f1ec253ab7f13fb10baf9f4f468d40797ae2ac7c7ed79dd6372 SHA512 5e25b4f3f7f777d1413762b15e8adcca28506a498383b219c0c9de303897e2eff7e1e74a812ccd49717d471e7e3a6fb9aa5ef8a7507bf236f1a9ece8e11e9255
 MISC metadata.xml 775 BLAKE2B dbcad63785d9af5b1f2f93775c645f78e6344a2c47fe0ed1f71ab47d9945be2885e4becb2d9b329e145b035cf3af2f50daacc56175126d2fc3b6feae5e4579a7 SHA512 8805602022441e46c239411c7050ae3c4ef954c796a4293f3fb2eb0ff6cbc87a47eb554b89a29c22622e088f6cb232f05c154c0d6f8f864b35cc5f9c2a292862
diff --git a/net-wireless/soapysdr/soapysdr-0.7.0.ebuild b/net-wireless/soapysdr/soapysdr-0.7.0.ebuild
new file mode 100644
index 000000000000..238bf83a0e24
--- /dev/null
+++ b/net-wireless/soapysdr/soapysdr-0.7.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/${PV}"
+
+IUSE="bladerf hackrf python rtlsdr plutosdr 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 )
+		plutosdr? ( net-wireless/soapyplutosdr )
+		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
index 0669ed4ac687..238bf83a0e24 100644
--- a/net-wireless/soapysdr/soapysdr-9999.ebuild
+++ b/net-wireless/soapysdr/soapysdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,9 +22,9 @@ else
 fi
 
 LICENSE="Boost-1.0"
-SLOT="0"
+SLOT="0/${PV}"
 
-IUSE="bladerf hackrf python rtlsdr uhd"
+IUSE="bladerf hackrf python rtlsdr plutosdr uhd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 PDEPEND="bladerf? ( net-wireless/soapybladerf )
 		hackrf? ( net-wireless/soapyhackrf )
 		rtlsdr? ( net-wireless/soapyrtlsdr )
+		plutosdr? ( net-wireless/soapyplutosdr )
 		uhd? ( net-wireless/soapyuhd )"
 
 src_configure() {
diff --git a/net-wireless/soapyuhd/Manifest b/net-wireless/soapyuhd/Manifest
index 403cb6313849..a1b9632c570d 100644
--- a/net-wireless/soapyuhd/Manifest
+++ b/net-wireless/soapyuhd/Manifest
@@ -1,4 +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
+EBUILD soapyuhd-0.3.4-r1.ebuild 657 BLAKE2B 1da8f4801c2af090973d0b7b29d62f1f7270ce25c55c4e11fc3231b761964ab168b53e336b43c8e4107e268062ee8cf0344e3e025a565a52c4a24e17d2d67412 SHA512 91ebfe4f4789d1e868e9b22ffed57f0c54be3404aee873c7ad4d5bc879bd04ab99721ae3cd935e0a49c132fa647fefdc2428e31285ea66573ed95d19bc65ee5c
+EBUILD soapyuhd-9999.ebuild 657 BLAKE2B 1da8f4801c2af090973d0b7b29d62f1f7270ce25c55c4e11fc3231b761964ab168b53e336b43c8e4107e268062ee8cf0344e3e025a565a52c4a24e17d2d67412 SHA512 91ebfe4f4789d1e868e9b22ffed57f0c54be3404aee873c7ad4d5bc879bd04ab99721ae3cd935e0a49c132fa647fefdc2428e31285ea66573ed95d19bc65ee5c
 MISC metadata.xml 430 BLAKE2B 583986bcf088a9cfcda635a68fef35c98ad5d5504be93f03b1034936930b38a81f3a952f1a33409a71406b3178cccb98afac8c3dafef670cbda3383830d1c22d SHA512 31ca3b4aff913064ad156b644b1598cc3412d818cf0b67607b222770852e98fc1e4d5e164d053088bd53bdffe9f394a279a1525dabfa3f22db972bc5099101f6
diff --git a/net-wireless/soapyuhd/soapyuhd-0.3.4.ebuild b/net-wireless/soapyuhd/soapyuhd-0.3.4-r1.ebuild
index 626e9029a89c..664cf2685543 100644
--- a/net-wireless/soapyuhd/soapyuhd-0.3.4.ebuild
+++ b/net-wireless/soapyuhd/soapyuhd-0.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+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
index 626e9029a89c..664cf2685543 100644
--- a/net-wireless/soapyuhd/soapyuhd-9999.ebuild
+++ b/net-wireless/soapyuhd/soapyuhd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="net-wireless/soapysdr
+RDEPEND="net-wireless/soapysdr:=
 		net-wireless/uhd:=
 		dev-libs/boost:="
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 5f1efd73763a..25e30ece498b 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -6,12 +6,12 @@ DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076d
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
 DIST unifi-5.8.29.zip 80125147 BLAKE2B d7fcfd8ea5c29c79803f4ee715136a82fb69b3e69802a9a9c4b92e9d4c52d5a72eaeaa3b10405a4eb10df35f1a926c4fb51dcd0c30816d3e58efd15f48b2ea51 SHA512 8c69f406c632661fe713251304910016bed25c2bbabb3aef355626cf6ea6475ba9348d0bec4d2e0f64824190db4deff669ab748cb17cc289112ac07421b56128
 DIST unifi-5.8.30.zip 80120131 BLAKE2B c7e53ff047cd3fc6b0b551d8388a739adf86d0518a86c76aa1688534e2a708bdf9d38d30848ad6a41b03aea12de8f038cd5eb8e9186ecfa3c2a1b782464b7e21 SHA512 0d4a714ba875e17ce359b28e2a0a967366125971f021eb95f598c7e4860c03016afadcef0a4bb6e64f30b99afb790b65aaa166ccc31bb31f268412c1a1f1bffd
-DIST unifi-5.9.26.zip 105216711 BLAKE2B 057e95fb671495bab2082d48c9d0d53b4336a4069a9ff9189c9ea75c537d026c72a526f2e630ca657d4045a2af293f72f7eee86f6031e2f0ca785f0ce32dd92c SHA512 dd36729ceb578fdd26f01601df0603c44cb8cf6f9007e9f178ee2309234d0ab547bb5afa78ec36edea48693077793d18b848ced707c8328e6547d6ec2e693e3f
 DIST unifi-5.9.29.zip 105327499 BLAKE2B 9c5c1cb804231b72521fce968cb1240b7c64e75621eb6577fe09f43186e90347339159e0cb95e772a936d4d6e82b2ae77126c263fbf25ab244db7e5639972c45 SHA512 f00ba9470d78fa5922e81a5ff2e53927d2a2ec7d08ab543abf4b236ff9fb8761b060083025fc410f72c0ff48c75c915dd3561a3869dc4a2de0f8900e19af0976
+DIST unifi-5.9.32.zip 105373782 BLAKE2B c15b576fe745f1d8f2783a50a0265378a0b4947654ab79e1ba2526dfade73eb83890118d8a97d1d186539a428fc6705943e19cecde583b73c2f098575f3496f0 SHA512 c0269c9e9be723eb19dc541dbb7547b284082792c41c6a8012b677ca83e562848024b95ebd6dbae95042bde07c41375907fd9b47e725f3ae8ece661bcd77a71a
 EBUILD unifi-5.6.39-r1.ebuild 1721 BLAKE2B b3d2d6df884e5fdc1f09c191dda26eeb71cc05b4f2d51c3556d2b6bee834639f616d542a994f95a6c58bce8b9ae8374ace94d448751fed7fb5058dbdf8a6d67d SHA512 c7b7e8d2196319abacf2094ace35e5fdcb56feb9f22939b28839cc0bab8c40e6f7fe9e16cf2c8ae4992e64e9578f7bff7fcfe0011558c93625e73173b6cc992c
 EBUILD unifi-5.6.40.ebuild 1732 BLAKE2B 083dba38eb9f1007a2c596704d71b1e3064b1029e9c761c4603e32da466d8718d7a6f1cb4ce7a229916c1d89efd253539147acfbcfa43ca7cdbbeb2549ac2d73 SHA512 974837d60c8f133c8c266c0c7f51fdc7ce08f9ac51cb1f70126ba952e314927878a8200ac437a938296640cfd905e9e19266ba30fd6b3af8a62272738d6c92cb
 EBUILD unifi-5.8.29.ebuild 1839 BLAKE2B 970076efaa9aafedb1e93431fcb82c66ae001c3ff715ffbbe7544d0ed57d774ae92756fa905df8cd38cdc9d6d21114b6a664acd8ce93e60884b00a6da6ee078e SHA512 1c2b10eee5d1d11f6dac0642d72c3ad3c82b5b9fe843d5893e372930a70378365f3060eb42e9e62f037b0127346380250d7be2f61b3aa066b14c9956d24ca8b8
 EBUILD unifi-5.8.30.ebuild 1839 BLAKE2B b7cbb450654f49c4b110f0401b2e4aa2ebfc1e9b2e8ced942fb1d5da502c993df9e3f0ca2c7b0b1ccf57418417188bf2130041fa1e4829f0b5acbf6ebbf3cb94 SHA512 b102e3cfa16db09346e1649c8b82d6eef53ef96fa65497b84ca0aad08fca5cf00a4fe49eea21a9349cf4ca26cffa473db9363c943ebdc1bccbaa4e1660bb8491
-EBUILD unifi-5.9.26.ebuild 1845 BLAKE2B a170ca4e9dcbff14b02087224fdec920707983ce08d12c8ffe38535e8fc68c751882ba653699e98e1ec3e73147d5cd252d457ebc0c3bb16a5596cda0e2a789f1 SHA512 e4111035f3bc578e840854262823749d0e0504df627d9b1c0e4b891ad301580667a64b5eb4fdae3d7126b7da561784b46eb959ed7f672628e6465de13a0f28ad
 EBUILD unifi-5.9.29.ebuild 1845 BLAKE2B 68f13e0a721aba2a1ca2c6ad497dd5668337d1431979540549183491be516f3e976c05e57168b7388dd7959e872c6a648152b8038da8f708200de29991006678 SHA512 d52c718bcdd4062ead97594992fb089d34d35a87bfe6e22191c79c05f522da8bf5a75c1614c0f03c34cc756817df898a4c1371bec96ff8683410bbe5b9ca0a34
+EBUILD unifi-5.9.32.ebuild 1845 BLAKE2B 8e4eb5cac8fef454d7f5dbb50b6330fa9d272182587bd98050f1cc94f560343ebb87065af168574ff70b9bf6e3d88411c587dc2317384ca4762f4a1a8febab55 SHA512 69d79578a2d7e0baea6f8bc0da54008b492d78872204c9f5011b985d8dd9bf9ef70b28302eb973c0fc0d36387714e7f0a376862289aed905bd3ceb6d64039769
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.9.26.ebuild b/net-wireless/unifi/unifi-5.9.32.ebuild
index 7496ff62a2a3..bb328b127d20 100644
--- a/net-wireless/unifi/unifi-5.9.26.ebuild
+++ b/net-wireless/unifi/unifi-5.9.32.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-25460f7409"
+RC_SUFFIX="-016da0b7c1"
 
 inherit systemd user