net-wireless/gnuradio: Permit scipy-python2

Signed-off-by: Michał Górny <mgorny@gentoo.org>

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 2adf66594e3780f28ddd2caae14cff0978c5f447..dec78f161e8c526a274b941bd1a22f693918cc3b 100644 (file)
--- 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 44ed5fe566f36025e95bd66606e81255b8fa7674..8c07aa105ae0549ecba7a82960bee535911aeed4 100644 (file)
--- 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 b91c70b209e1de34476a8931d933ff1c9afd0642..6687ca88195461d3ee6e53bd3243fafe3d67a290 100644 (file)
--- 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}]