net-wireless/gnuradio: Permit matplotlib-python2

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
index afa455f35653407d7dc2c337f87a5d225d35c587..2adf66594e3780f28ddd2caae14cff0978c5f447 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-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
@@ -85,7 +85,12 @@ RDEPEND="${PYTHON_DEPS}
        )
        sdl? ( >=media-libs/libsdl-1.2.0 )
        uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-       utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+       utils? (
+               || (
+                       dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+                       dev-python/matplotlib[${PYTHON_USEDEP}]
+               )
+       )
        vocoder? ( media-sound/gsm
                >=media-libs/codec2-0.8.1 )
        wavelet? (

diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index ff1b29da54ebf7aa599105abd348acd92c930d70..44ed5fe566f36025e95bd66606e81255b8fa7674 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.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=6
@@ -75,7 +75,12 @@ RDEPEND="${PYTHON_DEPS}
        )
        sdl? ( >=media-libs/libsdl-1.2.0 )
        uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-       utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+       utils? (
+               || (
+                       dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+                       dev-python/matplotlib[${PYTHON_USEDEP}]
+               )
+       )
        vocoder? ( media-sound/gsm
                >=media-libs/codec2-0.8.1 )
        wavelet? (

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 3861b55c8576bcda792c2d62aeebabf8293c7d2e..b91c70b209e1de34476a8931d933ff1c9afd0642 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-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=6
@@ -83,7 +83,12 @@ RDEPEND="${PYTHON_DEPS}
        sdl? ( >=media-libs/libsdl-1.2.0 )
        uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}]
                dev-libs/log4cpp )
-       utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+       utils? (
+               || (
+                       dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+                       dev-python/matplotlib[${PYTHON_USEDEP}]
+               )
+       )
        vocoder? ( media-sound/gsm
                >=media-libs/codec2-0.8.1 )
        wavelet? (