summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-01-28 21:55:12 +0100
committerMichał Górny <mgorny@gentoo.org>2020-01-28 22:30:12 +0100
commite8b975880f21cc0aa575bf1c3d377ce3a9a11d29 (patch)
treee853268327833384fa5f9081c923c67a7202f4fa
parentdev-python/cosmolopy: Permit scipy-python2 (diff)
downloadgentoo-e8b975880f21cc0aa575bf1c3d377ce3a9a11d29.tar.gz
gentoo-e8b975880f21cc0aa575bf1c3d377ce3a9a11d29.tar.bz2
gentoo-e8b975880f21cc0aa575bf1c3d377ce3a9a11d29.zip
net-wireless/gnuradio: Permit scipy-python2
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild (renamed from net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild)7
-rw-r--r--net-wireless/gnuradio/gnuradio-3.7.9999.ebuild7
-rw-r--r--net-wireless/gnuradio/gnuradio-9999.ebuild7
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
index 2adf66594e37..dec78f161e8c 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 44ed5fe566f3..8c07aa105ae0 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 b91c70b209e1..6687ca881954 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}]