From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8E27138350 for ; Tue, 28 Jan 2020 20:40:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D38AE0856; Tue, 28 Jan 2020 20:40:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08DAAE0856 for ; Tue, 28 Jan 2020 20:40:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EF3434E44C for ; Tue, 28 Jan 2020 20:40:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25CF2109 for ; Tue, 28 Jan 2020 20:40:36 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1580244023.176d37915d97fc4f7d8e58586d2bc88c163178cc.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild net-wireless/gnuradio/gnuradio-3.7.9999.ebuild net-wireless/gnuradio/gnuradio-9999.ebuild X-VCS-Directories: net-wireless/gnuradio/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 176d37915d97fc4f7d8e58586d2bc88c163178cc X-VCS-Branch: master Date: Tue, 28 Jan 2020 20:40:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1dcfdd7d-68f9-4a24-948e-42c6c80a1762 X-Archives-Hash: 86218ac9653d01fd1b09bb29b8267b34 commit: 176d37915d97fc4f7d8e58586d2bc88c163178cc Author: Michał Górny gentoo org> AuthorDate: Tue Jan 28 20:21:17 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jan 28 20:40:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176d3791 net-wireless/gnuradio: Permit matplotlib-python2 Signed-off-by: Michał Górny gentoo.org> 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 afa455f3565..2adf66594e3 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 ff1b29da54e..44ed5fe566f 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 3861b55c857..b91c70b209e 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? (