gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /net-wireless
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
60 files changed, 478 insertions, 248 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 1a0d4b121c21..cd24eaa7e8b3 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index 3574072c85d5..a0163eeeea8e 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,3 @@
 DIST blueberry-1.3.4.tar.gz 1410366 BLAKE2B a684c30b7457c4df8cc1f5449891cb43d0bc314692ad1d135377c861c669b0f4f8185396f39295268821ac6403dfd035201756dea4974f31066da766e36b559c SHA512 d5ca457ace0d46aab425b6821e690a94375de1222e90d0223afa97de5ce16f77089ba84b1b47a90e6494f34d3bd6824dbd6d2ff1e41e0b9be1d7bc9611abd6db
-EBUILD blueberry-1.3.4.ebuild 1288 BLAKE2B e6a836da4933dd5046db0a0b6c66054b96583e010b068d7e18ff1e0b38dbf9457cfc6fae39bb28743d6aaf223a5d86cce942873ff63f6a65655742b9971da082 SHA512 b57f1316cee9c1b1f81d38d08e4cbb1ea050edfe90bbd3aabf30b6a4723770b3b8f35c1b9364f5f70d325220e66a47f00a4fd826a74b6292a4316d054d501cdb
+EBUILD blueberry-1.3.4-r1.ebuild 1345 BLAKE2B 48f8bffe760cbd61a1a53de51fd0f550bdb94f6e84c4c5b6535a7947e2f72a774eec4cb00691614209c1ce9d29692cbfc09927edbbb02525ebf0442b7e4fe72b SHA512 53dd07b8f4277c91a584c524724f51598ff9d173d1c0e7ae3d1029c59dd599f8fc585c61765f66fce800d9598f2afd34a25aa2a354486051975f54eae41a9c95
 MISC metadata.xml 576 BLAKE2B 1c705170b11fd8afef9f65f90743b7d3443b3952c084b771dbf93ea5bb4765cedce34cc818334ec01c577c85774e26fcf28b45d35c601e033b3478cd7713d87a SHA512 0d04db85d6d5ce7df8bdddc00ec8ff040e3a1bfdbde15300d83b4c7d59b8577314b43716909fae926ba5ace3ed75ff9b5fed7e1da3e7f8bc54f4411018d1b445
diff --git a/net-wireless/blueberry/blueberry-1.3.4.ebuild b/net-wireless/blueberry/blueberry-1.3.4-r1.ebuild
index 9eda79f9577b..b5c019bbd2ac 100644
--- a/net-wireless/blueberry/blueberry-1.3.4.ebuild
+++ b/net-wireless/blueberry/blueberry-1.3.4-r1.ebuild
@@ -18,10 +18,12 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-wireless/gnome-bluetooth-3.14[introspection]
 	net-wireless/bluez[obex]
 	net-wireless/bluez-tools
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index ad2c31adef93..80fe1e8b5eac 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -9,6 +9,6 @@ AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399
 AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
 DIST bluez-5.51.tar.xz 1941904 BLAKE2B e8580388961c99305c6f723160e726232a097067815a88a056c1569c55c2ea410004cf92572afbef9b782807d8a940503b4501f9c6046cacac35136fbbe580a8 SHA512 8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f
 DIST bluez-5.52.tar.xz 1957504 BLAKE2B 670cdfb44eca1b184c0bd678bab34116f9172394b86fb69fa454f7bdcc1ae82c466a806879ddef96dddd6ae6cd31466b48f9e87113d43144659ae0c057b9def8 SHA512 9024481910d1dee85578bf3d7a4fc4be2bece516e6216c91aa1a7ac18537f092b47c41c4a5506ddd7e279599d58002e98203c5439745c01df4dbc22a75234c84
-EBUILD bluez-5.51-r2.ebuild 9270 BLAKE2B 6c4477f4e3331feae7418f11116478cd01f4d1eb1d58b8c203a1f48efea440747e235177ee20157edfe694966e4bb333a2015ee2ac221bc39f882a763fe58584 SHA512 345e2c61e1084bcd513e50a8677b3e33a1893d513e6a18724e9064add8964cb39134cfd3714bf672663f9b3ab34c9353410d03f5a94e8786a6e4d2dcf99e30b8
-EBUILD bluez-5.52.ebuild 8922 BLAKE2B 727df7ca3051a0355c65630034d1874d6c2053cbf94b2cc3d843d0a1dc99e071898198395a7499169d9cc26e87ad1cb291fd8743746195433c61f1f3b6d8a364 SHA512 c1b261a7d5a7fa355d2a554c54814da0673b5afcb1379bffcd1ed8a8fcb595c0da26654346731b62064420ab49084d51f6b32dd72264d4bcf0bffd14615400d3
+EBUILD bluez-5.51-r2.ebuild 9313 BLAKE2B acb48a3606e0cc5f7a2a48b28621af69f7c99f53b142ab5a20e3f8693fb28a4506193760885d2a181519ba89a6e6bd2dc23af4e16f79c6b7a5110fedf709e1cb SHA512 0a8d19a7e76782b2d33065d6c81a80a0a612276179658cfaeec43a106cf157126a8ba47e6a691d95e764b6652d0b25dae89cac0211ad4325d3f56af6856c642b
+EBUILD bluez-5.52-r1.ebuild 8965 BLAKE2B 846aa3a547bffbdccfda9a13be9d203f646a92406d6311d218d0c23c6d65ce21a5b566c60e13cc108c7dbaf1ef2869a110d0b22c538f9a4d5b57f7a437b3ad0d SHA512 a7cd8616336773cbe4f416499fc2a4cedf17fe4748e19c0474b79b6b87de30ecd63c095691daae29345ba3d2294ce08c37665b7ceaa02d63c92e5f81f2e8dbe4
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.51-r2.ebuild b/net-wireless/bluez/bluez-5.51-r2.ebuild
index f595bc3ad234..5b222563fc81 100644
--- a/net-wireless/bluez/bluez-5.51-r2.ebuild
+++ b/net-wireless/bluez/bluez-5.51-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,10 @@ REQUIRED_USE="
 "
 
 TEST_DEPS="${PYTHON_DEPS}
-	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 BDEPEND="
 	virtual/pkgconfig
diff --git a/net-wireless/bluez/bluez-5.52.ebuild b/net-wireless/bluez/bluez-5.52-r1.ebuild
index a73b178bd597..b3c94fefbc73 100644
--- a/net-wireless/bluez/bluez-5.52.ebuild
+++ b/net-wireless/bluez/bluez-5.52-r1.ebuild
@@ -25,8 +25,10 @@ REQUIRED_USE="
 "
 
 TEST_DEPS="${PYTHON_DEPS}
-	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 BDEPEND="
 	virtual/pkgconfig
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index a173e5f5b7af..308fd95c74de 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -11,5 +11,5 @@ AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197b
 DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588
 DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053
 EBUILD crda-3.18-r3.ebuild 2142 BLAKE2B b3735350fef553a7fb1137281fc9eaf3a550dd499be9d162c1c0448b13ff716f00e9e39106e5d473a6f37d8841ff033c087b83b1c1f49654c94b9c25e2982779 SHA512 f28109e1ae3f34d11a8d9186d0279f5b77de7c5c340964f4a776ecf4388a63e7974ed33865863e445d052a9dc90c4d1062258fba63a30b4d3b0a3cb930e7c623
-EBUILD crda-4.14.ebuild 2231 BLAKE2B b85f56aceeaa096887848775d01f5995c27d09e0756a3f92d368f2c82d5cb4aa01451ffe8fd92f9062abdf62a5f485af52ba680f60bfaf833c3db3797f520a37 SHA512 84f6688ee216a8f2f7530f4b17d694facaeee02ceac1a4202eaea6e83c2f92052f5f27eeaa95d0b757df19fdd8aa72ea04f3456168305bee8a3ccd7e94962fbc
+EBUILD crda-4.14.ebuild 2221 BLAKE2B 6acebb341dc2adc1559e737ef956d7eba9ced8ca928c82b67bed29f775e9321765b9d15c44536198d01c824c773f7888fc81f778276a3ac668f12dc16a8223af SHA512 d8e048822a1906fb4e5731f9fc5684c5b368eef761bf99a480ddc434be5159eb898ac950ffcc563a10d9736cc96637b36d2731bcc884c89ad27dd412a346aee2
 MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59
diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild
index 380cc3d2f089..f5a34d3b6444 100644
--- a/net-wireless/crda/crda-4.14.ebuild
+++ b/net-wireless/crda/crda-4.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit toolchain-funcs python-any-r1 udev
 
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index bf8a7ed6c449..0ecb89c0ca90 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -5,8 +5,8 @@ DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd
 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
-EBUILD gnuradio-3.6.5.1-r3.ebuild 5185 BLAKE2B 62bbbfaf2b1eb52c03e52b64eed81a8eb8277443f7d96ad3db5d8b37988ea7ef7c8385234df9a16177d2f9c9cf71b095ea0684d7f4fc737c46502dfdf318c8ff SHA512 b5fbdb677e9e9b9e24c220cdc6e5e536419f8323a93771c750b1d737fc5df7095b60d0fad113e510c9e804a1f882cc08f0170cf37b3c3428dc2d602a72181588
-EBUILD gnuradio-3.7.13.5-r2.ebuild 7705 BLAKE2B 24752c60e3fac15e0c2f3906fa6a17ca2c8c12a41daa81c20eb6e5c39679028fb2150d1aca9e15ed5f78af2c841e937feab0987dcb8ffe79d3acf335bad35404 SHA512 6a49ed931aadf866a78dc733b2bf7e86d8fa4b02d7587089af2e3982efaf04e710d25418b79b3aa242c324d6b4026435438e0ffd0aee2bdd13084c6a9def7fdf
-EBUILD gnuradio-3.7.9999.ebuild 7187 BLAKE2B 874bd12aa475f4ae983b872a58d639483f028cb23a03f579a7532503c9c7fbebb4a5cecad012f51138bdcc2485cccc6b74bedd5fc332ff4b121462dd895e0853 SHA512 a8a33b42bd8433cf0b162e24f7884a768e6a7ed6720811d126c0d5332fba4e1a59db9fd1a1c3cdf036f4c52e7d7dc08013d21a366e2e1e0960fd44c33b0410b9
-EBUILD gnuradio-9999.ebuild 7164 BLAKE2B 830e9b82735f020a10daa506b1aa3ef9af7ab73cfd08f28fe12296de202b54186ffc44102607f4a3d5edf027a462b4a642d73b7783df63254c1fd5a4ad53b751 SHA512 249d7c9f2f08126fc0afc4e7a68b4f1a19adcc44bab6c9fab9ddbf0173531599d491380df5f90744ca255cc6b1034999f466da45c1d4ef9c061adce560d365ed
+EBUILD gnuradio-3.6.5.1-r3.ebuild 5339 BLAKE2B 40342241899afb64e9ef4bd4c3ddf74e488dfcef7290c733589868bc17cb12bb9f4dadfccb987817c278921e2606a5fbec15a136823839df696c689cda104548 SHA512 d7427110295bbe6c561ff98b859725498b93e4a479e73e17a6e0dbf766ef9c3d5e18f66ab61ed98c01ef4655d225d45c49f0d9be5e26f9f7cce5e990531535c4
+EBUILD gnuradio-3.7.13.5-r3.ebuild 7959 BLAKE2B bc68f79eb279d53a1e25fcb534882716ad9e4c129e892367f8ba88e2da175c0422d3ee8e37f4c4f37c8b9bdc498c4a253119cbee26c72c4aae29c1974b5d5efa SHA512 f4d7d68b943b950d5517a8705674c293635928189cce3cc161534f36401a860d134d528108305fcb60390fc437566ec18cab2bb1e86beca3cb242e2856d50544
+EBUILD gnuradio-3.7.9999.ebuild 7383 BLAKE2B c6178e81d4a1a982a8cc9a305faad53cbd04836a4a2ddc6aa6f10785f09ab40d3c3ac5d4a8a41b1dbd0ee5529409e8b7b1ca869525a56a424dcfe535597f6bd0 SHA512 566f559aed55f2e8f58d4818c90722b20a13d242d155a0512e17c923a4beab9aaa1c1c86290618cba78c7ec3868b7414518c1df428e36b2cb649631179222853
+EBUILD gnuradio-9999.ebuild 7340 BLAKE2B 3184d2a662f4b5b1974bd3b520e3d03a04098b23196f5cd346dbda30a4a05e3b801231dcd171e8aa3f5075452574d73a50d97e6473f88f4ad8cb9d56bf0df930 SHA512 74975e565a74ac889d37f299a2bcdc06a87f9e6fb63da0d9fbfea4df3dab3812c82f1740736042f09223e695302fd4bd7cbe43503bebee2dac33bb1df898b7e9
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
index 5c9dcc316787..a38d393dfebb 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,21 +35,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # 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}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
+	')
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
 	dev-util/cppunit
 	sci-libs/fftw:3.0=
 	fcd? ( virtual/libusb:1 )
 	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
+		media-libs/alsa-lib[${PYTHON_SINGLE_USEDEP}]
 	)
 	grc? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	jack? (
 		media-sound/jack-audio-connection-kit
@@ -58,19 +62,21 @@ RDEPEND="${PYTHON_DEPS}
 		>=media-libs/portaudio-19_pre
 	)
 	sdl? ( media-libs/libsdl )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_SINGLE_USEDEP}] )
 	wavelet? (
 		sci-libs/gsl
 	)
 "
 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}]
-	)
+	$(python_gen_cond_dep '
+		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+		doc? (
+			>=app-doc/doxygen-1.5.7.1
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	grc? (
 		x11-misc/xdg-utils
 	)
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
index dec78f161e8c..a73f9f65dc64 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
@@ -50,30 +50,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # 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,${PYTHON_USEDEP}]
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0=
 	alsa? (
 		media-libs/alsa-lib:=
 	)
 	fcd? ( virtual/libusb:1 )
-	filter? (
-		|| (
-			sci-libs/scipy-python2[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}]
-		)
-	)
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
 	jack? (
 		media-sound/jack-audio-connection-kit
 	)
@@ -81,44 +63,67 @@ RDEPEND="${PYTHON_DEPS}
 	portaudio? (
 		>=media-libs/portaudio-19_pre
 	)
-	qt5? (
-		dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		x11-libs/qwt:6[qt5(+)]
-		dev-qt/qtwidgets:5
-	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-	utils? (
-		|| (
-			dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-		)
-	)
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
 	vocoder? ( media-sound/gsm
 		>=media-libs/codec2-0.8.1 )
 	wavelet? (
 		>=sci-libs/gsl-1.10
 	)
-	wxwidgets? (
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		filter? (
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		grc? (
+			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		qt5? (
+			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			x11-libs/qwt:6[qt5(+)]
+			dev-qt/qtwidgets:5
+		)
+		utils? (
+			|| (
+				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		wxwidgets? (
+			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')
 	"
 
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.2
 	>=dev-lang/swig-3.0.5
 	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+		doc? (
+			>=app-doc/doxygen-1.5.7.1
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	grc? ( x11-misc/xdg-utils )
 	oss? ( virtual/os-headers )
 	test? ( >=dev-util/cppunit-1.9.14 )
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 8c07aa105ae0..f8ecf5a77873 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -47,30 +47,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # 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/mako[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0=
 	alsa? (
 		media-libs/alsa-lib:=
 	)
 	fcd? ( virtual/libusb:1 )
-	filter? (
-		|| (
-			sci-libs/scipy-python2[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}]
-		)
-	)
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
 	jack? (
 		media-sound/jack-audio-connection-kit
 	)
@@ -79,26 +60,47 @@ RDEPEND="${PYTHON_DEPS}
 		>=media-libs/portaudio-19_pre
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-	utils? (
-		|| (
-			dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-		)
-	)
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
 	vocoder? ( media-sound/gsm
 		>=media-libs/codec2-0.8.1 )
 	wavelet? (
 		>=sci-libs/gsl-1.10
 	)
-	wxwidgets? (
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
+		!<=dev-libs/boost-1.52.0-r6:0/1.52
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		filter? (
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		grc? (
+			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		utils? (
+			|| (
+				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		wxwidgets? (
+			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')
 	"
 
 DEPEND="${RDEPEND}
@@ -107,7 +109,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	grc? ( x11-misc/xdg-utils )
 	oss? ( virtual/os-headers )
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 6687ca881954..7bbe445db144 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -48,29 +48,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # 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-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	dev-python/six[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0=
 	alsa? (
 		media-libs/alsa-lib:=
 	)
 	fcd? ( virtual/libusb:1 )
-	filter? (
-		|| (
-			sci-libs/scipy-python2[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}]
-		)
-	)
-	grc? (
-		dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
 	jack? (
 		media-sound/jack-audio-connection-kit
 	)
@@ -78,22 +61,9 @@ RDEPEND="${PYTHON_DEPS}
 	portaudio? (
 		>=media-libs/portaudio-19_pre
 	)
-	qt5? (
-		dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		x11-libs/qwt:6[qt5(+)]
-	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}]
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
 		dev-libs/log4cpp )
-	utils? (
-		|| (
-			dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-		)
-	)
 	vocoder? ( media-sound/gsm
 		>=media-libs/codec2-0.8.1 )
 	wavelet? (
@@ -101,6 +71,38 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11
 			dev-libs/gmp:= )
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		filter? (
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		grc? (
+			dev-python/pygobject:*[cairo(+),${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		)
+		qt5? (
+			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+			x11-libs/qwt:6[qt5(+)]
+		)
+		utils? (
+			|| (
+				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')
 	"
 
 DEPEND="${RDEPEND}
@@ -109,7 +111,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	grc? ( x11-misc/xdg-utils )
 	oss? ( virtual/os-headers )
diff --git a/net-wireless/gr-air-modes/Manifest b/net-wireless/gr-air-modes/Manifest
index ef96075f7c4b..8c349d004fad 100644
--- a/net-wireless/gr-air-modes/Manifest
+++ b/net-wireless/gr-air-modes/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-air-modes-9999.ebuild 1029 BLAKE2B f2488f40e21eecc4a6c8076031059a8a80b8c906b633f5472ee5e12b2bfddfef23e998817d96da4ec52b9f41e6617bbd2f030205cc9440228889b5dac8034d7a SHA512 7853b515d2708fdf9bc0bb1802f61b854ba4ead2b39de3a236bf836d5082bcf0f1ab8a611ee006fd002847b7b64a2675dc8e8c1f90f71c3e8141e5159a82240c
+EBUILD gr-air-modes-9999.ebuild 1084 BLAKE2B 107ce69f6da9100384c8dd2e47a9dad9993223a4d09340eed01adaa1622a89fdf8cffafcda8ae1ccdf321b674a538f0b04096d93e1f8cdebb719a111459c92a1 SHA512 b825167b4ae905824d2765744e4039259b1d4e7343a454d05bb9e4dbcea9eedf98ba056d241e5c7bb62c579b77e75254d9c9c42cefdd3f3f44bfbe71def392fe
 MISC metadata.xml 447 BLAKE2B 3d205cace1b2c5446d3b3db17116f0e8d071cc1a1e59b17597c1a083b781e6ea1bc9e2f52de22d685ca53a96b08a13965e121f5924559040da23a827243579d3 SHA512 d05f480160792ec408d852a61ddaebe4088e38a7efbee14e8b576fb4ac2e2c98e5196b0c6fe62457e7de9ed2db80317e452061e90d5c6a760f5b5cf941027f0c
diff --git a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
index 5f10964933fd..c0aad83ffd8c 100644
--- a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
+++ b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
@@ -24,16 +24,18 @@ IUSE="fgfs rtlsdr uhd"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	dev-python/pyzmq[${PYTHON_USEDEP}]
 	>=net-wireless/gnuradio-3.7.0:=
 	net-wireless/gr-osmosdr
-	fgfs? (
-		games-simulation/flightgear
-		|| (
-			sci-libs/scipy-python2[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		fgfs? (
+			games-simulation/flightgear
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
+	')
 	rtlsdr? ( net-wireless/rtl-sdr )
 	uhd? ( >=net-wireless/uhd-3.4.0 )
 "
diff --git a/net-wireless/gr-baz/Manifest b/net-wireless/gr-baz/Manifest
index ffec431dd7be..be14dfab8c04 100644
--- a/net-wireless/gr-baz/Manifest
+++ b/net-wireless/gr-baz/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-baz-9999.ebuild 968 BLAKE2B 80c60da9adf5d94f128a2073f7c0abebe7b434f763501b768df3aafa0b5f5d33e15e79bc5438082b40afc9a8f205cbbbd3dde3dda908ee3bc17b2553e01a21ac SHA512 0e1a893b9761203954c70e1621f57ef61ec2c03b66f7d9909b44f795e2395cd7d8667563c35c57763def795b7b157d6a9fbf8963d788a1dac8caa0279e877be7
+EBUILD gr-baz-9999.ebuild 1018 BLAKE2B d189a04998b7093d13c580ee2aef1614eb85731409a7b016148ec4513a673fb5090aab391251a8e5726adbe2895a3b43c53bfc320b499c77a2abc82b365dd104 SHA512 d2386763973341407a95f75600a22b99176e0b684769252823771a39997fa66818c9c71824fc708ea3a569d04008df7d0e204409bf4be2628bc2f4bfc8d51595
 MISC metadata.xml 522 BLAKE2B 6f6257b56aebf6189db585f5bdb502d59950c416bf7f06b0f5f2a71520fb32360d4c427c7284e1d7b5f66a886d045304a47e89fbb28dd1676a2eb53d2ce0f166 SHA512 2d5ba9656be7bb652bd96331027dda5bd4d963e949ed1ef24dae55e8945ac9dfc3863fd2a223f47dadd5731475433cf2b1018d7390a47bdd8725a8907a173c64
diff --git a/net-wireless/gr-baz/gr-baz-9999.ebuild b/net-wireless/gr-baz/gr-baz-9999.ebuild
index e43cd434a9af..36f890e014d4 100644
--- a/net-wireless/gr-baz/gr-baz-9999.ebuild
+++ b/net-wireless/gr-baz/gr-baz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,11 +23,13 @@ IUSE="armadillo doc rtlsdr uhd"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[threads,${PYTHON_USEDEP}]
-	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[threads,${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_SINGLE_USEDEP}]
 	armadillo? ( sci-libs/armadillo )
 	rtlsdr? ( virtual/libusb:1 )
-	uhd? ( net-wireless/uhd[${PYTHON_USEDEP}] )
+	uhd? ( net-wireless/uhd[${PYTHON_SINGLE_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-wireless/gr-doa/Manifest b/net-wireless/gr-doa/Manifest
index 34e3b11876d1..e28c57df6fac 100644
--- a/net-wireless/gr-doa/Manifest
+++ b/net-wireless/gr-doa/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-doa-9999.ebuild 936 BLAKE2B 4966c0c015b9bc67bb7a38ca3dfcfd8fd53081b0335bcd1cd7d387e2b5f45b0149f74e9740f4236502c8b4d284eccdebb8b96185213dfbc3bd085a33ece87495 SHA512 c82840a52c1b7ecd42761f51a597b904cddb4d3f4b838c47f615c262c05246168a6a132fafbf7673ddabfa1a4f6784891fe3c848e5f039b5cc02d092fcf20c6a
+EBUILD gr-doa-9999.ebuild 940 BLAKE2B dc60f8544a5cee46b01d7f5659f9d8e0425ceddadd7433a3192a24dcc5098c31af53b35b60ed0f9d51b21668bdf90930d8c6022ddf97327ff4d533d6d8325782 SHA512 a5cf17fb15c6d118dc0955512df20f843ca6176aa27865fc14c8b51951ec5b357b01e2d16a4046a5c783e45878e54aba952bb9175697234ffc87a425cfb4e354
 MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/gr-doa/gr-doa-9999.ebuild b/net-wireless/gr-doa/gr-doa-9999.ebuild
index 7901c0c44685..ea4932a57e95 100644
--- a/net-wireless/gr-doa/gr-doa-9999.ebuild
+++ b/net-wireless/gr-doa/gr-doa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_SINGLE_USEDEP}]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
diff --git a/net-wireless/gr-foo/Manifest b/net-wireless/gr-foo/Manifest
index 856fead7a44e..ee5a53ebad0b 100644
--- a/net-wireless/gr-foo/Manifest
+++ b/net-wireless/gr-foo/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-foo-9999.ebuild 1169 BLAKE2B 9ee12e7c3c8721cc2f36a0a2f8cfdee5aa429cb9694c751e2080a97c11f510ac8dd1f479e7e790cd6397a7099d13ae4610b23d5dda029e98b00fc4a4d41c22c9 SHA512 e0fce7665744039b6cf25626ad148d91b1ab4e3e0c8eec368700048312eb0a57a75005446cb80a1b7fd4eeffcbd03cf1193fc3957d096008a8c6e7d70ca0f3fe
+EBUILD gr-foo-9999.ebuild 1219 BLAKE2B ff830fdcce826a6d0082e7eb0027cfa4116839911a4a3622d91d69e717ccf9cea6772b33590d7c5b418c550a9ed7748daa55a95e5ed055e3103e7527b5cde6a4 SHA512 858a6e2b6493dfca94cf69319136030011092b290833a91aa21599a534cc18347c2d803f16ac1a7e3cf6a75c9a342d3b0949644cbc472a79ebcb245e225a030c
 MISC metadata.xml 317 BLAKE2B a600d3d673f37d66dbb32b1480bc115a246665dc69ef42a9e7ea144bc9145b23fd01eae793a313e7f6ccba4d072e80b97430f3dfa4937ed606716cd4519eee66 SHA512 4a8573f02b2807a76df349c29d61cf6d64631dac6fa13a86579b8df9ccba8abe379168e47eef796b02cf6b93765ae4826c25189c3f012105e8d949a939c966f1
diff --git a/net-wireless/gr-foo/gr-foo-9999.ebuild b/net-wireless/gr-foo/gr-foo-9999.ebuild
index b54cc9402c9a..035e0e058a23 100644
--- a/net-wireless/gr-foo/gr-foo-9999.ebuild
+++ b/net-wireless/gr-foo/gr-foo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,9 +22,11 @@ SLOT="0/${PV}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[${PYTHON_USEDEP}]
-	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
-	net-wireless/uhd:=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+	net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig:0
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index b71f75c7360b..12909b33d6fd 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,4 @@
 DIST gr-ieee802154-0.0_p20180402.tar.gz 195464 BLAKE2B 391bd4eefb5a90135a084a94c2edd83e6f2c2bd6dca26be4d9a54448382d5ee463e1740c305e9583be0107b424c67e74fac84ece147844e7c2a63f6096c7dd36 SHA512 90f164bdcd636dee68a49fe844901ca73e1f743fdeacd8019edddc57c681ec3d1fcfe209d8abd89e2013c2c2c436b7992fe0b0dbe9c88c04352aebc0813a9d96
-EBUILD gr-ieee802154-0.0_p20180402.ebuild 1325 BLAKE2B b7747fd6122f2901578effdca4b729b526abe2aa01f3535c1f98cc80bd4591edb6a75f58f6b5e875488474bd4903673bb217b499d81d545b9bb3e9c46ed18896 SHA512 5c08a8ee25f84f05a2cb5bceb5e45382fed59ce06751fe4c9e9cd7bd1485405dd19d7a04042a70cff1e87cef5fb0d28742db824554dddc342b4f8cb30456b74c
-EBUILD gr-ieee802154-9999.ebuild 1325 BLAKE2B b7747fd6122f2901578effdca4b729b526abe2aa01f3535c1f98cc80bd4591edb6a75f58f6b5e875488474bd4903673bb217b499d81d545b9bb3e9c46ed18896 SHA512 5c08a8ee25f84f05a2cb5bceb5e45382fed59ce06751fe4c9e9cd7bd1485405dd19d7a04042a70cff1e87cef5fb0d28742db824554dddc342b4f8cb30456b74c
+EBUILD gr-ieee802154-0.0_p20180402.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
+EBUILD gr-ieee802154-9999.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
index 558bac59bdce..e99620f1b2aa 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,10 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
-	dev-libs/boost:=[${PYTHON_USEDEP}]
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
index 558bac59bdce..e99620f1b2aa 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,10 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
-	dev-libs/boost:=[${PYTHON_USEDEP}]
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index bc0dc2c8e7f5..ad4fed5e84b7 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 708 BLAKE2B 7e319c4e617232077b829d6ca03be9f54867b693f75445a3740ad3f62d3d2eda4cdeb4a879e16546cad900b44252c1b5e6794d00300eeff01e2810770a544434 SHA512 2e8078c8fb2079959ade82bbfd68a4b3dd3c70912c2071b28b8d74ea9864e9660d33de0ee07c887321df631c87f42702e78db6863ad34540b05fa989bbbd9f85
-EBUILD gr-iqbal-9999.ebuild 708 BLAKE2B 7e319c4e617232077b829d6ca03be9f54867b693f75445a3740ad3f62d3d2eda4cdeb4a879e16546cad900b44252c1b5e6794d00300eeff01e2810770a544434 SHA512 2e8078c8fb2079959ade82bbfd68a4b3dd3c70912c2071b28b8d74ea9864e9660d33de0ee07c887321df631c87f42702e78db6863ad34540b05fa989bbbd9f85
+EBUILD gr-iqbal-0.37.2.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
+EBUILD gr-iqbal-9999.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
 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 96ada0f6ce62..1ed8501d81d5 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index 96ada0f6ce62..1ed8501d81d5 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 3c63c14d546b..73da69406661 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,7 @@
 AUX csete-iio.patch 18603 BLAKE2B 437bc8318e88090012cfc98a1b5910ade54b191abb6cb96ea82ba1974c68682477d7429489546fca21ce19d3b9042d6321146d34c0cf8bf94f591bf8da576a39 SHA512 b8c41a1df12a1a74a4d491e694e89d9de753791a433da4d8451c2b20a3e448312316cf66b8bd7d2c1445d91e483331c4328e0acc738fc0dc61ab98b30d48a14a
 DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
 DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
-EBUILD gr-osmosdr-0.1.4_p20180626-r5.ebuild 2184 BLAKE2B 98ae2d534d26af6ff530dc04c177a444600dbeb69ef3092fd54b6eaa8424cb689c2d3cf8b2fa9dc62ee970a12b096c817db4df976f171307c41828dae9fbc9e5 SHA512 fb9d602fc7d68f944d2e51e3d3c94005686ea122e5ea5b5e342e0b1cce9b833fa3a4f66999fd7a8791fdda404ba7cffdcf7cda47f715110cfe4cf42473582b3e
-EBUILD gr-osmosdr-0.1.5.ebuild 1908 BLAKE2B 8e65405df93193eca8f29142ec345791f18ca9b8cab98b68922eb0c0c1e352fc2712edb6949de9cf41b03aff566fa357a12f2f427e78ba5e3ab6bfd09b945af0 SHA512 096fb93288971b08de28b8ab163d8733b493be29353dc5bd4fca3f8c022162a2004665e43971aac5cfd01e3dfb3a57214e54e81c2a33e7ce1efbc350971d41cb
-EBUILD gr-osmosdr-9999.ebuild 1908 BLAKE2B 8e65405df93193eca8f29142ec345791f18ca9b8cab98b68922eb0c0c1e352fc2712edb6949de9cf41b03aff566fa357a12f2f427e78ba5e3ab6bfd09b945af0 SHA512 096fb93288971b08de28b8ab163d8733b493be29353dc5bd4fca3f8c022162a2004665e43971aac5cfd01e3dfb3a57214e54e81c2a33e7ce1efbc350971d41cb
+EBUILD gr-osmosdr-0.1.4_p20180626-r5.ebuild 2205 BLAKE2B 4120f8b37dca5a30a842b6a6d37ce8dd36b04ac8bb55a034b6578bc3fa089962041bdf948ff06e1c8f0004076d8f4e094c9d6e1d8aa04908511f0e49d0c87642 SHA512 6954a1bba9e4f3f5010722e095803c00ff2125d03ba806f255546d655d25eb89ba88c485aeead5cd8505a1cdbee64dab04b521d62f5140b84d912b6a236794d3
+EBUILD gr-osmosdr-0.1.5.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
+EBUILD gr-osmosdr-9999.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
 MISC metadata.xml 1064 BLAKE2B 5f01d598ec69e9f78d594a33487b58242049b020461fbae3e2eaf51d4d894c01c9bc73af28b101bc855e09567c16176d56fbe52b77b7cb719ce2d8ef3f6459a9 SHA512 8f4b7a3cbdf0b0edb3e707cb8c44d5e40e72dc87d36312865647996181c419f4a67c6783110abbdb150264ca9e49cca3264ba39098acf0b05955dff3fdf29072
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
index 75a47d73672f..eb6cdd6fe1d5 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,16 +27,16 @@ IUSE="bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
 	iio? ( net-wireless/gr-iio )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
 
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
index 780a3c706b83..69775452090e 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,16 +23,16 @@ IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uh
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_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 780a3c706b83..69775452090e 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,16 +23,16 @@ IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uh
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
 
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index fb00a4479a40..aa9f2d43f7b2 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-paint-9999.ebuild 874 BLAKE2B 440d2408d8e996fb0c26dfd4416e1770ea0cb148e6b969e9b4aedbd988dec9e1347013c9f4a8f7f84ec1d231f957cd8d7b857ded4ca157dc9e87e2b64d048368 SHA512 810adbbcf95402e41f269864b66b067a4ffaf5be74d9f34cfd329ed2487ccddd6187ea88bb85761006cf52359ba170be69a7056adc19a9cc79ab0a78541d0311
+EBUILD gr-paint-9999.ebuild 917 BLAKE2B 03c173165eedabead625e867712e792f48bd99b0fe7a39b0760bebc699458866e1ca7836a063c995a4e3556aff20ee74cf0c7e493a82692d5a3331dbc97561dd SHA512 128a122b5ebd7782a6cf693554730f53931dbc9d0288be192149a06300a56fefb01f4d46610df41c1bb2739ffec6a13a4e7eeaa1a675db22ac30b1c50efc9f16
 MISC metadata.xml 426 BLAKE2B c0655dfe4af8bc17dc267dcadf37625b86e4830bc565044fe43b0911d166a19d6ab56dc73d2ad37890e5d0f83ca52fd078034fd6675310447361cebd2730b704 SHA512 10082af73f8e1acbf8a97062d4802b8ae6a3f187034933c7a14fe932aac3e654b3dde399ec33b3cf174c528ac77d41f2ab75969e39cb6e2f9c343ce52f7d0b64
diff --git a/net-wireless/gr-paint/gr-paint-9999.ebuild b/net-wireless/gr-paint/gr-paint-9999.ebuild
index e61888f8ab75..7f891f888a4e 100644
--- a/net-wireless/gr-paint/gr-paint-9999.ebuild
+++ b/net-wireless/gr-paint/gr-paint-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,8 +23,10 @@ IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[${PYTHON_USEDEP}]
-	net-wireless/gnuradio:=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	net-wireless/gnuradio:=[${PYTHON_SINGLE_USEDEP}]
 "
 RDEPEND="${DEPEND}
 	media-gfx/imagemagick
diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest
index dab672fbd635..b89f56c89ebb 100644
--- a/net-wireless/gr-rds/Manifest
+++ b/net-wireless/gr-rds/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-rds-9999.ebuild 1121 BLAKE2B 1e99aa7d84a20395e619fa2bacf0a9b0ae5ec7631eb63c6961cc9faea51bc15e235dc11b4dc8fff287e4a69a97733d0652356f014395d357a4463622811f26c8 SHA512 0756b8aaf8a8a653fe4f676396c686315886784aa4551951f7699ef9fbcd9967a84fc7f7c44b98d708a3c167f38adcfa50f2e91a324ef931e791eea50fb0d82f
+EBUILD gr-rds-9999.ebuild 1164 BLAKE2B 84b1858c4c791de99615269e68abb270137d376c597b51c45571cdab542314fc4ba38ac7323b657c44beae50fa6f1f24a20b239a6adf276aecf85fde76edb08a SHA512 a7e3c647c67c62c89b061c1d9c8ec44fa7f58e0f8d47b7bfc8ff8b1ba8198d2d7a0e662a40a50ba7ba928a14869cfcdaf7ed0234a9221d8f8321f26596f2116b
 MISC metadata.xml 317 BLAKE2B 38ab4417f4befdeb7d9912a3712a259653e223aac63528287493cde0094efbe7c985f1cd93e871a10fb1a99b8add72f20d6b31a93d06017171a85a276f4b9840 SHA512 a5cb2c2182d2c0a2afbb3ebc9ac175af13be57ea5ca28abd3cb59d25a562484f8dc01b08da9e0644929a6cbd63f2c850eb6169f574dbed838180e5a5e89ad510
diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild
index 7a3bffd7a3f4..10e9f43865de 100644
--- a/net-wireless/gr-rds/gr-rds-9999.ebuild
+++ b/net-wireless/gr-rds/gr-rds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,8 +22,10 @@ SLOT="0/${PV}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[${PYTHON_USEDEP}]
-	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/net-wireless/gr-rftap/Manifest b/net-wireless/gr-rftap/Manifest
index 1f12dde1be18..b0af9411bc49 100644
--- a/net-wireless/gr-rftap/Manifest
+++ b/net-wireless/gr-rftap/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-rftap-9999.ebuild 1127 BLAKE2B 2437cd7205d3123a5ce64cb1ba1e57c401794853a7245f0ab0d195a2517e9d54584d05b48a7a222d903e924a60686324a435c9445ebacc8e8e2480c4656c89bd SHA512 e214ccef445f01b05cd1a821731940eb3d904a3703f36c00202e0a3b9d59ed6c23adbe75b90630c451d0af9eb7328e0517b523dab11a23a4495508966d6aa3b3
+EBUILD gr-rftap-9999.ebuild 1170 BLAKE2B 29333fb8ff876250f6f95471f1a33341f8a27cdf170c4c11c7234ffb243b483fd751fd48e66dde2403e266d8b9b9799a9877bc98c010fd7fffdcdf04fec9b7a6 SHA512 2f6421bcc1d9c24b9465a9a45a7b68bfd830cefbdedd39fc7aa6bab8390cf58bbc9460c859e37e7385699202b2e0e6e8a496823d84eb536c11718ad2719b4429
 MISC metadata.xml 317 BLAKE2B 4970c2c939374961593cf134bf3f1030d14fed37ebdc9c15369a1c94dc4786649920c349f9aa6ea76b7d56bd720ae560b4b7e900c046f573cc75c55d7429f658 SHA512 bd237119e49e0e715f528eea05fc9cb8fd758779209849c7a5e5ffd964c98b3912c63af8363192ba94db59d2b62a4dd28c9d1521d61b843b02fe3feb6ad9558a
diff --git a/net-wireless/gr-rftap/gr-rftap-9999.ebuild b/net-wireless/gr-rftap/gr-rftap-9999.ebuild
index 621dada2edb8..54059b6ad6cd 100644
--- a/net-wireless/gr-rftap/gr-rftap-9999.ebuild
+++ b/net-wireless/gr-rftap/gr-rftap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,8 +22,10 @@ SLOT="0/${PV}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[${PYTHON_USEDEP}]
-	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/net-wireless/gr-specest/Manifest b/net-wireless/gr-specest/Manifest
index cf26c2265166..6bd156f99ab0 100644
--- a/net-wireless/gr-specest/Manifest
+++ b/net-wireless/gr-specest/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-specest-9999.ebuild 701 BLAKE2B 06b6a33946f22af69af7ae59a642c9749782b31e39a9b99897b288937a8e41d160ee8c09ce3171d5d80924dd2e90b90a405864109d0b3b018dee71f26a44838f SHA512 7735c9acf40e0ba70e06b6f2f51f84985aaefe6341b40b9d60547c7a8d886b02f45118d8f9b8cca6439d55be653bc07431ebc3bca68228921b6ad7306dad3800
+EBUILD gr-specest-9999.ebuild 705 BLAKE2B c1ab054b70cc03ebcad46faf4554744ff34d4e4b3265e1021c61be668f41e1e1a36fe94390058f4a6b1b95f3ab134acee72f4bfcdc05359e1b3d1370287e32d6 SHA512 b2aed42b65770c00ac5dd8c8f6ed48bec96424b64f47afa75c4d6f2ee718ba0fdc2acd9066161cf03543088d5262085c1834e893ce547643261fcdd86f069172
 MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/gr-specest/gr-specest-9999.ebuild b/net-wireless/gr-specest/gr-specest-9999.ebuild
index 12a9c520a90b..f6bdadd0aeb1 100644
--- a/net-wireless/gr-specest/gr-specest-9999.ebuild
+++ b/net-wireless/gr-specest/gr-specest-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_SINGLE_USEDEP}]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 4f29d1aafc41..d355f1a47892 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -2,7 +2,9 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.4.tar.xz 830548 BLAKE2B 2d03767a5308c72206aefbafce39a241e353c1ef8751758d0a336a7ad5b86ef02062da037db423b805810eb45a9467628cd241682a63835b63e3ea920f39ace9 SHA512 3b06fa24666e7cf37353d95d0e9abc41b8be921ae7313c014f20f704fe7919d154d6a5441c6d87d4cd08ee65e15218ec01f4ff4aafc7e4a358faf3ca4a6dcb18
+DIST iwd-1.5.tar.xz 834688 BLAKE2B b3d585963c93954e4038dd85e5d57b60d8baaa7028edb79b54d8650a400a149666140f6ba438ccccb5be2d67fc7b842f6272b5efc61d75a7d4dae333410625bb SHA512 55017941f2e100d644864d2ed0528c67a486da6ba2bf7782e9df019727ce0af53cdff37c53f6625e536aa756387dd4e0d20a169710da8c3ce00f615040c9da32
 EBUILD iwd-1.4-r1.ebuild 4219 BLAKE2B 36f70ad55bc4c2832fcb182999f26ab236ef852c31292c0943d7efb880bb5f8616ba38a84ce47c973c562111d116f2d68c0f55a55c563c7bb44fb3ab5b8ed575 SHA512 af3820df6cbd44468e4f5a109e051cbfdcfd0b05e6666958f5c906963a40a4b27a3e3b0cb5beb0b64b9716e26becd26d430bad75417bf49b688d2f81ad7539ff
 EBUILD iwd-1.4.ebuild 4211 BLAKE2B 81bb8365ba4b39878b9c4531e1c927ef4a068d9a6d6de9bf40180202c5cc6f75b88cbc8c54da1bf95cb19160def27148385302203ac6a7695ac0ba2da45487aa SHA512 a3f380e75083e90fcdc3510ae779da7392c7e4c11d7a378af567cf97066b93bc028141ae03dc8a9b85f0cf254409288b09ebe3f9c2d54912387bf63ca0c703d4
+EBUILD iwd-1.5.ebuild 4219 BLAKE2B 624c40476f2fd5847e8a4ec81956339c1bff2604effb993c924fb8d6505caddac226c31b07f20afd3a5ce9876359bd40adfe16731bcfa8ac525bdac4da889c00 SHA512 4a351309df1a0df69f131d0773a97842141fadc5a575dd1c071306f8edba9763b58f3f696a7b26b7afab3b14ebf115f518503b8fe147fc1a9943b6cf08441b22
 EBUILD iwd-9999.ebuild 4203 BLAKE2B a3804e0c45f950489b07e6c4a710f3722148287314539b33887f9b39c87510b27a3632a57b6dd419b7a4dbf575b1d137b64c9506b72508dee09851ef3c63a987 SHA512 87e22d525b0cc8288d28dbc0429cd5588a341ba3a18f4450afe382d3f0cd46a39e92dd913d39d5772438e21c879906f5a51a1a3e44cdcd1f1765880c9100c6cb
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/iwd-1.5.ebuild b/net-wireless/iwd/iwd-1.5.ebuild
new file mode 100644
index 000000000000..b2e8a422b118
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.5.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic linux-info systemd
+
+#Set this variable to the required external ell version
+ELL_REQ="0.28"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+COMMON_DEPEND="sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
+
+RDEPEND="${COMMON_DEPEND}
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~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 crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
+		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 && use amd64; 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
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
+		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
+		$(use_enable client)
+		$(use_enable monitor)
+		$(use_enable ofono)
+		$(use_enable wired)
+		--enable-systemd-service
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+	)
+	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 249f7ffec26a..f957c47846ac 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -8,7 +8,7 @@ DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e115
 DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88
 DIST kismet-2019-12-R2.tar.xz 3127064 BLAKE2B b7ffac6a6a4d7d7893d3564f9471080e055798c325b102f98fa0e86db37bcbab33422afae9c2694b747ae0c369259b62c218a77c673d0e0c05969a56e42311c2 SHA512 b1e3de74a6d314150d849ac3d95c8b99324bba14522dc4f00244d1c09acb690cce40d35dbe33845ffb1060a69cd38f036d59a0283ed9b1a70b022e3d57cde5a0
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2019.09.1-r1.ebuild 4630 BLAKE2B 9c302952243e30c5002d613d824e266837f80620aec815540fe10bb75ebf7c61d28477f7b3c72331b0396ea50fe51686645e6e71454bf7876686734353f3cc7e SHA512 4cd45d2a225f73880b9c1b3e6f1271c9a8e83458b39aa944e604fef1ac5c3c1334b23823647c8cc5e7ee63602aa88dd8c6af22b662fcfd48bafc0624471a2859
-EBUILD kismet-2019.12.2.ebuild 4806 BLAKE2B eff96d3957f26ff8616d1f4f3e1f1ce05cb16819a07e1d2c6d5894c2410455b57d23db1ce393f8c8b500f5a6699bf64c09b212806ec2714fb3b11cfa3a1a8c0e SHA512 221043f10fc049922646e60c5408626c0b6263f8403effae30f5cbced7b2472122565a3005a9fc56ef6dc9c8be9df8652595b501aa335335560a873987c31dd0
-EBUILD kismet-9999.ebuild 4806 BLAKE2B eff96d3957f26ff8616d1f4f3e1f1ce05cb16819a07e1d2c6d5894c2410455b57d23db1ce393f8c8b500f5a6699bf64c09b212806ec2714fb3b11cfa3a1a8c0e SHA512 221043f10fc049922646e60c5408626c0b6263f8403effae30f5cbced7b2472122565a3005a9fc56ef6dc9c8be9df8652595b501aa335335560a873987c31dd0
+EBUILD kismet-2019.09.1-r2.ebuild 4702 BLAKE2B 5ab2650fda3f9c669eb02d81e11c89a376e4704c46f1ad9b9a0b491c5accf56811edaea7fd4021ee23ee171207203c082e132a441ab147bc79dcea43e1ce5bb7 SHA512 4ea2cffec42a04b0e0588cc0a37f52b898b9dd81d5a72d17d13ec8b1eebaa1eea9d6d807de1bb1a1ebc345e264b9e7dfd1b77463fdf884631199e4d4c600225d
+EBUILD kismet-2019.12.2-r1.ebuild 4919 BLAKE2B b64aa866a750583e867308e5eb53aad49c4c897f13cd36c2d92e9881b1a1196dade4ce87968db86d0ed5cf6fc9e636917bb46830fe991ffee1936660680aff2c SHA512 ffa77d9843091abf23bf9789243567eb369d9cf3e505237647e7a4cef2b34025df243272f7ebf45445e4a908d6126b563442ca2ec5b5c8d0cc6d6daae46debd8
+EBUILD kismet-9999.ebuild 4919 BLAKE2B b64aa866a750583e867308e5eb53aad49c4c897f13cd36c2d92e9881b1a1196dade4ce87968db86d0ed5cf6fc9e636917bb46830fe991ffee1936660680aff2c SHA512 ffa77d9843091abf23bf9789243567eb369d9cf3e505237647e7a4cef2b34025df243272f7ebf45445e4a908d6126b563442ca2ec5b5c8d0cc6d6daae46debd8
 MISC metadata.xml 1545 BLAKE2B c1b1fe5d6f61ca1141bf0bec03e7f416a0c7e8ec2b15aaaefe0cfc763af9c385e791747eeaf6c3d0b83594acbb528e0c6ef4abfcb348edd027d77a5ef720fa83 SHA512 49e887edfcde73eea51e96dad9c648f70f59524fc0e3f6567aeff116bf33ad7b9e57f4e8dcdfd02b0fef524a101f172bf1035437a6138376b0a41f1e8e60af32
diff --git a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild
index 01ac8b25a826..178c532ebfb5 100644
--- a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,7 +51,9 @@ CDEPEND="
 	mousejack? ( virtual/libusb:1 )
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )
 	pcre? ( dev-libs/libpcre )
@@ -63,7 +65,9 @@ DEPEND="${CDEPEND}
 "
 
 RDEPEND="${CDEPEND}
-	dev-python/pyserial[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+	')
 	selinux? ( sec-policy/selinux-kismet )
 "
 
diff --git a/net-wireless/kismet/kismet-2019.12.2.ebuild b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild
index 2a02da5e4246..73b8a86810b3 100644
--- a/net-wireless/kismet/kismet-2019.12.2.ebuild
+++ b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild
@@ -51,7 +51,9 @@ CDEPEND="
 	libusb? ( virtual/libusb:1 )
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )
 	pcre? ( dev-libs/libpcre )
@@ -64,11 +66,18 @@ DEPEND="${CDEPEND}
 "
 
 RDEPEND="${CDEPEND}
-	dev-python/pyserial[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+	')
 	selinux? ( sec-policy/selinux-kismet )
 "
-PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}]
-				net-wireless/rtl-sdr )"
+PDEPEND="
+	rtlsdr? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+		net-wireless/rtl-sdr
+	)"
 
 src_prepare() {
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 2a02da5e4246..73b8a86810b3 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -51,7 +51,9 @@ CDEPEND="
 	libusb? ( virtual/libusb:1 )
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )
 	pcre? ( dev-libs/libpcre )
@@ -64,11 +66,18 @@ DEPEND="${CDEPEND}
 "
 
 RDEPEND="${CDEPEND}
-	dev-python/pyserial[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+	')
 	selinux? ( sec-policy/selinux-kismet )
 "
-PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}]
-				net-wireless/rtl-sdr )"
+PDEPEND="
+	rtlsdr? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+		net-wireless/rtl-sdr
+	)"
 
 src_prepare() {
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
diff --git a/net-wireless/kismetdb/Manifest b/net-wireless/kismetdb/Manifest
index 60a6d11e6fc7..33538e0f1346 100644
--- a/net-wireless/kismetdb/Manifest
+++ b/net-wireless/kismetdb/Manifest
@@ -1,4 +1,4 @@
 DIST kismetdb-2019.05.05.tar.gz 31425 BLAKE2B 4aa4ee6924792376e84fb4a4fb86a425319ea21fc10dc5874df35aa551ce444f62dd381359bad994b89defee3fef8f0bed5e80ffc0d18c025bed28b5cb2efa45 SHA512 0b36c1d4dfb0ffb5749c32884ce1b44c1ece196ebaf07db66157aed2c649c2b4dc650a6553a2e263c4518da2f06f1602754917d5db07f3ab39efb63c38dd8327
-EBUILD kismetdb-2019.05.05.ebuild 710 BLAKE2B 2bc009bb6d5e49cb711c02a14c85b882f3d6b057e58c99c1ee59d2ef5ca2f6402cd19761ec8fde0585f20c206dea8abdc36c9a084183fd23516672441ba026c9 SHA512 32025e8f40220ae66908eddd1bca7389778e969449830b1deb73e04997e7d16b7e800ddf4e945c20cc369c58274d69013fece956e3348f5f0e497fcc9a6c9b95
-EBUILD kismetdb-9999.ebuild 710 BLAKE2B 2bc009bb6d5e49cb711c02a14c85b882f3d6b057e58c99c1ee59d2ef5ca2f6402cd19761ec8fde0585f20c206dea8abdc36c9a084183fd23516672441ba026c9 SHA512 32025e8f40220ae66908eddd1bca7389778e969449830b1deb73e04997e7d16b7e800ddf4e945c20cc369c58274d69013fece956e3348f5f0e497fcc9a6c9b95
+EBUILD kismetdb-2019.05.05.ebuild 705 BLAKE2B 991ba7bf261d18b0485457426ce0e4744cf742a231cc955c5dd0d3ee0db3b1b2c0308d10ff09c1d1feeb582ad8cf6dccfecfd7a6be19d8330b64c9f7e7560c87 SHA512 3d189f94faf493815dfdcdc03d349bd2f5e25ea0c06dcae394fdc405a79c688f8fa5456861d828b229613f90697ec6e3ef600fdefc3e66242fcc374713a1ee97
+EBUILD kismetdb-9999.ebuild 705 BLAKE2B 991ba7bf261d18b0485457426ce0e4744cf742a231cc955c5dd0d3ee0db3b1b2c0308d10ff09c1d1feeb582ad8cf6dccfecfd7a6be19d8330b64c9f7e7560c87 SHA512 3d189f94faf493815dfdcdc03d349bd2f5e25ea0c06dcae394fdc405a79c688f8fa5456861d828b229613f90697ec6e3ef600fdefc3e66242fcc374713a1ee97
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild b/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild
index a0a5fee7f90e..bc8b41e5efe7 100644
--- a/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild
+++ b/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Kismetdb database log helper library"
diff --git a/net-wireless/kismetdb/kismetdb-9999.ebuild b/net-wireless/kismetdb/kismetdb-9999.ebuild
index a0a5fee7f90e..bc8b41e5efe7 100644
--- a/net-wireless/kismetdb/kismetdb-9999.ebuild
+++ b/net-wireless/kismetdb/kismetdb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Kismetdb database log helper library"
diff --git a/net-wireless/mousejack/Manifest b/net-wireless/mousejack/Manifest
index 7788236a0ade..9d0973cb2515 100644
--- a/net-wireless/mousejack/Manifest
+++ b/net-wireless/mousejack/Manifest
@@ -1,4 +1,4 @@
 AUX mousejack 858 BLAKE2B 5989e4f8c6645bc2feb8fe2ebbb9d2a2b5beba328016aa3c0c53ff20720b8e62cd08f83dc08dc608eb1b8ff27f3a92ea0a547547074bf9cca56276b0e63caad3 SHA512 31c89a7d85ab36a978439ecaaa03dbae1b1e8511d3aa02b1acb521854d81b4e8c012c202792abbf28f25283ec718ad4abd4d14a16ba4c8ead073c054490e9c84
 DIST mousejack-0.0_p20160726.tar.gz 34252 BLAKE2B 7511d29aa94f2fb5590b34d52eaa64150f3931933f043c9028e2d9cae61342a314a369e80e51e1150294afaadca06e58ec71ba4df4150a7a58d9a82d28919a58 SHA512 01fc87a347aea9ccad7611ef494da0521da278b7664e511409f0f822327b02f6fb555c5b5da86aae998b8fd34b7a55260d03594fbd9bb61c3ceca77e7d54958c
-EBUILD mousejack-0.0_p20160726-r1.ebuild 1256 BLAKE2B b5216698c51d765e2ce77d477a33854356a95b8d27c80c9ea8cc127206815b1189e19017c978fd259b53befdfbaea13b78ac4621b62e015daf6beaf8fe772b0c SHA512 a1b2635d221d160ea2ab0823e39aa892cc799e8b2b9b33b18d21aa155c4d18a2080f33d3af21fa3a0141d863724d5d636138844f49625b7dac6c40ca8f2234a2
+EBUILD mousejack-0.0_p20160726-r2.ebuild 1290 BLAKE2B 033a8ce1143e0762ffea92f11bca5243e27795baa346c340021c3ca508d27c071ecd845e83731ffe693c63dda158487b5c40aa1ecbcbacc7a806966d3cb5680c SHA512 99be115e435f1fb455e267c1576577c55f90071dba74e25ac91b3f6055a456d1c10d727a75d7e227650ee8456e63596d652bb686e773dea95516f6666ab413c9
 MISC metadata.xml 360 BLAKE2B ca2e678d3f96cece827270a7c5ee404a5e926c0a231979c4cc4442085fde9af1ce8d28f2a07b5bcf7f475eccb3b772d843ef36c03ae405205e710f5a3a240195 SHA512 ed42ea84e9b7f97be6aafb2cea3495e63abab197759a31795ebab8900f29caf500040b0deaf7997c6f598a8a8db3b2a64925d6df05f9b5b851037bd4e25b0b3a
diff --git a/net-wireless/mousejack/mousejack-0.0_p20160726-r1.ebuild b/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
index 207ef24f16c2..f5149a462303 100644
--- a/net-wireless/mousejack/mousejack-0.0_p20160726-r1.ebuild
+++ b/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,8 +19,10 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND="dev-embedded/sdcc[device-lib,mcs51,sdbinutils]"
 RDEPEND="${DEPEND}
-		${PYTHON_DEPS}
-		dev-python/pyusb[${PYTHON_USEDEP}]"
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pyusb[${PYTHON_MULTI_USEDEP}]
+	')"
 
 src_prepare() {
 	mv tools/lib tools/nrf24 || die
diff --git a/net-wireless/multimode/Manifest b/net-wireless/multimode/Manifest
index e6d93df0e08b..a40562eb56b1 100644
--- a/net-wireless/multimode/Manifest
+++ b/net-wireless/multimode/Manifest
@@ -1,4 +1,4 @@
 DIST multimode-1.4_p20140831.tar.xz 7648 BLAKE2B 1efec8c12e46b63f5501f1cf28f2e1f57d378c578656ecae771f0b98b873bbc1f119652a9f4607c9c0f3c5f3ca4f7109c48509f8339a1b22b8e3ef2af7214407 SHA512 891428e6c049cfd94787bd7580a59b3a9eb488dbf97cd21a1d82be04648e5423c3ce73983d38c5a3c280519ebea73c9572e9b0cdc7df453114e6aa220a58eaff
-EBUILD multimode-1.4_p20140831-r1.ebuild 1014 BLAKE2B 26fe4ac18b123cf0dbf83bfd2428d490d6d23db486ef0036311842e9fb56a9bc324bc8f3cb3e70caac5b9098f550480cb827f5e42a9ecc0d0e83ad7263c51d89 SHA512 87a27c09ea6bb831581127ecb9261b848aac1f74ead76e4f2f1149ca15b8fcb1eb6d06e89831b0431ff2e4787b71a5eb901ecec5fac1ccd942a7b913d9afef52
-EBUILD multimode-9999.ebuild 1012 BLAKE2B e1e426b5a3cfd57fc09d1578a4588c9abe7babb06cacdfde47732294b31e0d51d0bd585e871a36a58a95a2b6db21abc8e0a6b1819327333529bc163193ad1169 SHA512 4ca89c3de9a95dd830f7f3b9cd5f0403bd8f787497654de9a7ac8e6ea8b81f4eebb35466cd6abe0d1534a32517b61a729af457ba7266ab0a2e7384686787a6cb
+EBUILD multimode-1.4_p20140831-r2.ebuild 1021 BLAKE2B eb3dd39de35cb6290e09f142d42367c6f21fb9b65c05fbcfec24a3e82d1a6d2aa7fa47550cf66e2783de0a443efcd024058070dc345f0fbdce16b20f2a5b7d6a SHA512 7dad0686877039d3277f29861dfa685ca9d2209033ea0121706bb69a0ebb16a3442b72d45e4834a467e862ae13018dbad3a95451ba8d5836a94070943f898587
+EBUILD multimode-9999.ebuild 1019 BLAKE2B f033db89ecd60f881d2f69f190cdc64e26ab12aff10624225d40bbe5f55337d72694f525e4d7282f432c3dc3d2eae7f44bf479a8326836d13fc441758daddb77 SHA512 7184a74ac071012328c753f01b39f1e8943481b13645473a1f09198d5eb97d1ef1a4f6af0865f2c6cd03ffcca5234716b2d9716f9019ca6fbef24a145ac1cc60
 MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild b/net-wireless/multimode/multimode-1.4_p20140831-r2.ebuild
index b57130054c5c..3cdc6cd432c7 100644
--- a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
+++ b/net-wireless/multimode/multimode-1.4_p20140831-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ else
 fi
 
 DEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7:=[grc,utils,${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7:=[grc,utils,${PYTHON_SINGLE_USEDEP}]
 	>=net-wireless/gr-osmosdr-0.1.0:="
 RDEPEND="${DEPEND}"
 
diff --git a/net-wireless/multimode/multimode-9999.ebuild b/net-wireless/multimode/multimode-9999.ebuild
index 8de909cb3401..e8614f1c94d4 100644
--- a/net-wireless/multimode/multimode-9999.ebuild
+++ b/net-wireless/multimode/multimode-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ else
 fi
 
 DEPEND="${PYTHON_DEPS}
-	=net-wireless/gnuradio-9999:=[grc,utils,${PYTHON_USEDEP}]
+	=net-wireless/gnuradio-9999:=[grc,utils,${PYTHON_SINGLE_USEDEP}]
 	=net-wireless/gr-osmosdr-9999:="
 RDEPEND="${DEPEND}"
 
diff --git a/net-wireless/pyrit/Manifest b/net-wireless/pyrit/Manifest
index 5b7cefe2f7f0..19f6507d9a99 100644
--- a/net-wireless/pyrit/Manifest
+++ b/net-wireless/pyrit/Manifest
@@ -1,5 +1,5 @@
 DIST pyrit-0.4.0.tar.gz 191614 BLAKE2B 4cace6de8ba8d66445b9a082cc4d257b19ad2ac3a8003ce45c667dded0438e7da26bc6d25a3a33b2ef998d7af137c03b59610bc6e5637b6c7c70897e1b76d68a SHA512 8111b3f6f1a94319f5e146db6c184eb391c03ca554b20ea7227237afbc546a064898835ad16007333bb63aa725079046d413be11dfc3ecb76c77b6ac5096f7e9
 DIST pyrit-0.5.0.tar.gz 267614 BLAKE2B 2a0df7ebf2a06aee3367e9780d075ec2b6b76a8d9227ada17778eb386fa0243a06639ac27b8e7f6de2370d88836196288670c9d5112dada5dcb8b32efcae7da9 SHA512 912742cd7d9cd9231b9b3aa155a5170c0ba36c3865280423e100c1d12df34e093ee56305d8738d4f406abbfef9b1d540872872b8ef23d699466298d41289ad25
-EBUILD pyrit-0.4.0-r1.ebuild 788 BLAKE2B 931c997b9c16912075670e4705cd528fcc0928970811c6e8c1c9a61a1239145325bd61d71e29a0ab25216bba8633ba678c60a0563a0cc2a7be1801863045f4c3 SHA512 d457c03f473e57e25b8dbb33884c8b6f05866b54c9173f72f8d212142479ad787201abd8dd259301c6a7d01acaa59bbda8ec2223c18e7bdb6f1f553063e416e0
-EBUILD pyrit-0.5.0.ebuild 837 BLAKE2B 8ed2cfec705a25a18cb28d1d0f365c01231dc4c02c5add82bdbe416e2ea7ee460a4016271e6774b7171f783c4ce50ddb9366fc0bf1feca1fec22a910f9c2dc32 SHA512 fc09ff776268b188ee56ab7e789e41a72a47d15594bfccf24a158b648519e6108e5c652914257f24f57fc39ed5ed2e70e15c3c2f13f012bbf39070bd4e90fbbb
+EBUILD pyrit-0.4.0-r1.ebuild 829 BLAKE2B dc1cd9c6c96e71d02e95e030eebcfdd82cdde96168bd4d89bb0ddfc91b896ea0318da8a68f0cf20d8e8702c1bea023b215516c29c0d24e379de9943912712db9 SHA512 87a90cbfafa92d5ec0c0ba010d18ec998c17c4531fcd1097bde3435ea4df0d3d8d19cd3a217f717fed73c3c21c4ffdb26f2758aa73db12dc6415dae97d84c7ee
+EBUILD pyrit-0.5.0-r1.ebuild 878 BLAKE2B b4b40a474875926a0e196faf3e74670dbde5307aab9d4d9a735642a9dc0a4db04234d4beebc501c588ec35ec3167f8a188ea2f6db724130d6d43c1b7a73615d9 SHA512 4b9a2099780aa4e72076599bad5f01ef55d65493e42555e851e85cb9e2ad2e301c3ab5cb1ba275ff3db874cf1c521c2bed136a570c780e1d90259af0f2b0d01d
 MISC metadata.xml 748 BLAKE2B df71b5873e8e4dae8a99c55089dc2be37ebb1c9f952ad690e1fb420e65356b62a097685a33f97f229c8f3c56ec04fe6938913b8eb86e399b1ad4b9645dbd627a SHA512 df0f3711149c3db962c544ec7c4733e69039b1a27dfaf2fedfe0330049f4524c686b65c83307b3eafd5c592c41e9a75f8517d262ef7e66440d7f279164ff7e9a
diff --git a/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild b/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild
index 81a725a49490..5f819594a5f5 100644
--- a/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild
+++ b/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,11 @@ RESTRICT="!test? ( test )"
 
 DEPEND="dev-libs/openssl
 	net-libs/libpcap
-	test? ( >=net-analyzer/scapy-2[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep '
+			>=net-analyzer/scapy-2[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 RDEPEND=">=net-analyzer/scapy-2
 	opencl? ( net-wireless/cpyrit-opencl )
 	cuda? ( net-wireless/cpyrit-cuda )"
diff --git a/net-wireless/pyrit/pyrit-0.5.0.ebuild b/net-wireless/pyrit/pyrit-0.5.0-r1.ebuild
index 0ed8d1961bda..451b7678ac0f 100644
--- a/net-wireless/pyrit/pyrit-0.5.0.ebuild
+++ b/net-wireless/pyrit/pyrit-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,11 @@ RESTRICT="!test? ( test )"
 
 DEPEND="dev-libs/openssl
 	net-libs/libpcap
-	test? ( >=net-analyzer/scapy-2[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep '
+			>=net-analyzer/scapy-2[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 RDEPEND=">=net-analyzer/scapy-2
 	opencl? ( net-wireless/cpyrit-opencl )
 	cuda? ( net-wireless/cpyrit-cuda )"
diff --git a/net-wireless/reaver/Manifest b/net-wireless/reaver/Manifest
index 0994b99b79ff..2fcf4a590cc3 100644
--- a/net-wireless/reaver/Manifest
+++ b/net-wireless/reaver/Manifest
@@ -1,4 +1,4 @@
 AUX reaver-1.6.5-confdir.patch 281 BLAKE2B d8c1b89bf6a5291b75b99182a2a9b2149f6f83191fa5c0586ef5780acbc6e7d5fcf496f9b1f4715df0a3f7b097073e9a1a80ddc218c96d285aa297ddb595e1cd SHA512 36e2ede41de78573dae93727cee30c7f4031edce6b485d940a3f30209573e21be06d3e75ffb8239105e383bbd849fb728dc9ce9d28c5bab7d85b1b9526a67f5f
 DIST reaver-1.6.5.tar.gz 479441 BLAKE2B 21a1c54da559be4346b0c874947e982ea49ec6f20e612e3699d25524d49681a197a2a8cad0a31dd8dba919d065de48082572a471aa4f736397066edf7f7d8a43 SHA512 3e70d9fffefee3f6d60e72d7d7b1da91032e184c7d27f94b9f26e2260b7274d491f2e41f8056b386a211b9838d21afc6b65a8a826d310b51fc1065fa9e135dc0
-EBUILD reaver-1.6.5.ebuild 724 BLAKE2B a49ce91b2bc68438ab73917f2262e567edfa227de7528cd408c8b1cbaf8177672de9b234ae2776b5c53b719966a02410d86095302b1acbb9fab44911e55bcd33 SHA512 6402633b4819bb1f1036d1c7925e5002ac74025096bfcc4324f878cc486a907501a08548de4092e4a40853b9a6da1998ecfb68ddc2ae5227441c00efa7ae471b
+EBUILD reaver-1.6.5.ebuild 735 BLAKE2B 01f0f63737879c54b45580ca228d6ee64453f79e8225130fa49fc4cffa5e02143b752c2a9108384895fb79ad560bc444716c04ae171b6ed076d47159a292aa8e SHA512 22f79e17cd0b12e052bce31b0922e12be8f32e72596ca90b51d33ab1b6422f43868ad56399eb3b6b69f68e0955c1f1b1abd371f47fb91663b1a8d8ad8d77ad11
 MISC metadata.xml 461 BLAKE2B b23d4c4b8865ca1c58140486368ee2f4daa29d67af27cc5cce63c137d652c4d28b131140807735e9a5125790cc53629eeef074705278c5a550073d92c3447894 SHA512 503400e6ae36b1819015f51f0e5e01d7ba3c18c0133d625f3c35242dcaef5cd5ce72d57caf1b18892dee2865fcd1af1313f42140f360c249f2048874985d5d5d
diff --git a/net-wireless/reaver/reaver-1.6.5.ebuild b/net-wireless/reaver/reaver-1.6.5.ebuild
index dd1c5685b545..a46582c37173 100644
--- a/net-wireless/reaver/reaver-1.6.5.ebuild
+++ b/net-wireless/reaver/reaver-1.6.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="reaver-wps-fork-t6x"
 
 DESCRIPTION="Brute force attack against Wifi Protected Setup"
-HOMEPAGE="https://github.com/t6x/${MY_PN}"
+HOMEPAGE="https://github.com/t6x/reaver-wps-fork-t6x"
 SRC_URI="https://github.com/t6x/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-wireless/wifi-radar/Manifest b/net-wireless/wifi-radar/Manifest
index e30da8c96046..f45011ca3526 100644
--- a/net-wireless/wifi-radar/Manifest
+++ b/net-wireless/wifi-radar/Manifest
@@ -1,3 +1,3 @@
 DIST wifi-radar-2.0.s08.tar.bz2 62781 BLAKE2B f7ea7a2a884ac2ddc4dcc74f44c1bd4799dcf7ce03a19a5c32aea886f0c4bca47a33fe8789f1b75d26867604b9f2703e1f6664e789636605faf6bf313ee36078 SHA512 8b14a227c4e1e60f05c981b51777dcb5318a1dda2026bc32e9fd761adb0a4243caabd7444768630ad54258f9f065f4c7cc73e9d8b17bc2ccd98f63f3119ce584
-EBUILD wifi-radar-2.0.8-r2.ebuild 1779 BLAKE2B 35ac085a2b725201aa782555533d1f6e18ef7c88db2a7a0f21d356295d8ed1a9d9b9beb608d0738c494bb8a0aef5b186b62ee1ecb08d35fcd9646c0613da22dc SHA512 afb5e98dcc5ea9e5cafa143ca1fb2ecd2dde01c700b468b9c61239a40cd33081d90fcebea017bd84fe7bb81a061bc77dbc65ac9978929f4e694d10591e264792
+EBUILD wifi-radar-2.0.8-r3.ebuild 1812 BLAKE2B 1c3df36a678c81c9992e48b598390c0f9822535009734c02522e3bb9e4fa7a22f719d4a3ad0d13d888719ca8724f02404ff6cf88beb6a76da41c282b5f2c4693 SHA512 8f38bdac4fcc9f40773563858952a3bf8c4b0f8c88a34f7faa0a073c28f343353b8e10353293d2dbf0c4d910e13d13ba6de3640f8e5670461125f5f62774ee6b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-wireless/wifi-radar/wifi-radar-2.0.8-r2.ebuild b/net-wireless/wifi-radar/wifi-radar-2.0.8-r3.ebuild
index ccaf9ea896b5..0e2d255179ee 100644
--- a/net-wireless/wifi-radar/wifi-radar-2.0.8-r2.ebuild
+++ b/net-wireless/wifi-radar/wifi-radar-2.0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	app-admin/sudo
-	>=dev-python/pygtk-2.16.0-r1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.16.0-r1[${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-wireless/wireless-tools-29
 	|| ( net-misc/dhcpcd net-misc/dhcp net-misc/pump )
 "
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /net-wireless
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)