From 176d37915d97fc4f7d8e58586d2bc88c163178cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 28 Jan 2020 21:21:17 +0100 Subject: [PATCH] net-wireless/gnuradio: Permit matplotlib-python2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild | 9 +++++++-- net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 9 +++++++-- net-wireless/gnuradio/gnuradio-9999.ebuild | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) 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 afa455f35653..2adf66594e37 100644 --- 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 ff1b29da54eb..44ed5fe566f3 100644 --- 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 3861b55c8576..b91c70b209e1 100644 --- 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? ( -- 2.26.2