| 1 |
commit: 176d37915d97fc4f7d8e58586d2bc88c163178cc |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 28 20:21:17 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 28 20:40:23 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176d3791 |
| 7 |
|
| 8 |
net-wireless/gnuradio: Permit matplotlib-python2 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild | 9 +++++++-- |
| 13 |
net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 9 +++++++-- |
| 14 |
net-wireless/gnuradio/gnuradio-9999.ebuild | 9 +++++++-- |
| 15 |
3 files changed, 21 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild |
| 18 |
index afa455f3565..2adf66594e3 100644 |
| 19 |
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild |
| 20 |
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2019 Gentoo Authors |
| 23 |
+# Copyright 1999-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -85,7 +85,12 @@ RDEPEND="${PYTHON_DEPS} |
| 28 |
) |
| 29 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 30 |
uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) |
| 31 |
- utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) |
| 32 |
+ utils? ( |
| 33 |
+ || ( |
| 34 |
+ dev-python/matplotlib-python2[${PYTHON_USEDEP}] |
| 35 |
+ dev-python/matplotlib[${PYTHON_USEDEP}] |
| 36 |
+ ) |
| 37 |
+ ) |
| 38 |
vocoder? ( media-sound/gsm |
| 39 |
>=media-libs/codec2-0.8.1 ) |
| 40 |
wavelet? ( |
| 41 |
|
| 42 |
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild |
| 43 |
index ff1b29da54e..44ed5fe566f 100644 |
| 44 |
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild |
| 45 |
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild |
| 46 |
@@ -1,4 +1,4 @@ |
| 47 |
-# Copyright 1999-2019 Gentoo Authors |
| 48 |
+# Copyright 1999-2020 Gentoo Authors |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
|
| 51 |
EAPI=6 |
| 52 |
@@ -75,7 +75,12 @@ RDEPEND="${PYTHON_DEPS} |
| 53 |
) |
| 54 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 55 |
uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) |
| 56 |
- utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) |
| 57 |
+ utils? ( |
| 58 |
+ || ( |
| 59 |
+ dev-python/matplotlib-python2[${PYTHON_USEDEP}] |
| 60 |
+ dev-python/matplotlib[${PYTHON_USEDEP}] |
| 61 |
+ ) |
| 62 |
+ ) |
| 63 |
vocoder? ( media-sound/gsm |
| 64 |
>=media-libs/codec2-0.8.1 ) |
| 65 |
wavelet? ( |
| 66 |
|
| 67 |
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 68 |
index 3861b55c857..b91c70b209e 100644 |
| 69 |
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 70 |
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 71 |
@@ -1,4 +1,4 @@ |
| 72 |
-# Copyright 1999-2019 Gentoo Authors |
| 73 |
+# Copyright 1999-2020 Gentoo Authors |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
|
| 76 |
EAPI=6 |
| 77 |
@@ -83,7 +83,12 @@ RDEPEND="${PYTHON_DEPS} |
| 78 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 79 |
uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] |
| 80 |
dev-libs/log4cpp ) |
| 81 |
- utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) |
| 82 |
+ utils? ( |
| 83 |
+ || ( |
| 84 |
+ dev-python/matplotlib-python2[${PYTHON_USEDEP}] |
| 85 |
+ dev-python/matplotlib[${PYTHON_USEDEP}] |
| 86 |
+ ) |
| 87 |
+ ) |
| 88 |
vocoder? ( media-sound/gsm |
| 89 |
>=media-libs/codec2-0.8.1 ) |
| 90 |
wavelet? ( |
Archives