gentoo resync : 10.02.2020

5 files changed, 147 insertions, 128 deletions

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 )