commit: e8b975880f21cc0aa575bf1c3d377ce3a9a11d29
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 20:55:12 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 21:30:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b97588
net-wireless/gnuradio: Permit scipy-python2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../{gnuradio-3.7.13.5-r1.ebuild => gnuradio-3.7.13.5-r2.ebuild} | 7 ++++++-
net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 7 ++++++-
net-wireless/gnuradio/gnuradio-9999.ebuild | 7 ++++++-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
b/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
similarity index 98%
rename from net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
rename to net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
index 2adf66594e3..dec78f161e8 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
@@ -59,7 +59,12 @@ RDEPEND="${PYTHON_DEPS}
media-libs/alsa-lib:=
)
fcd? ( virtual/libusb:1 )
- filter? ( sci-libs/scipy )
+ filter? (
+ || (
+ sci-libs/scipy-python2[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ )
+ )
grc? (
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 44ed5fe566f..8c07aa105ae 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -56,7 +56,12 @@ RDEPEND="${PYTHON_DEPS}
media-libs/alsa-lib:=
)
fcd? ( virtual/libusb:1 )
- filter? ( sci-libs/scipy )
+ filter? (
+ || (
+ sci-libs/scipy-python2[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ )
+ )
grc? (
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild
b/net-wireless/gnuradio/gnuradio-9999.ebuild
index b91c70b209e..6687ca88195 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -60,7 +60,12 @@ RDEPEND="${PYTHON_DEPS}
media-libs/alsa-lib:=
)
fcd? ( virtual/libusb:1 )
- filter? ( sci-libs/scipy )
+ filter? (
+ || (
+ sci-libs/scipy-python2[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ )
+ )
grc? (
dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
