net-wireless/gnuradio: Permit numpy-python2

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

diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
index 03fd5605be2857a2a162f6a55ea6bb2e97a8b5b8..5c9dcc3167877fc7922c5c7a0162c599322236f6 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
@@ -45,7 +45,10 @@ RDEPEND="${PYTHON_DEPS}
        )
        grc? (
                dev-python/lxml[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
+               || (
+                       dev-python/numpy-python2[${PYTHON_USEDEP}]
+                       dev-python/numpy[${PYTHON_USEDEP}]
+               )
                dev-python/pygtk:2[${PYTHON_USEDEP}]
        )
        jack? (

diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
index 3c132c32fca058dd365edb6b714995c4e6876c7b..afa455f35653407d7dc2c337f87a5d225d35c587 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
@@ -64,7 +64,10 @@ RDEPEND="${PYTHON_DEPS}
                dev-python/cheetah[${PYTHON_USEDEP}]
                dev-python/lxml[${PYTHON_USEDEP}]
                >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
+               || (
+                       dev-python/numpy-python2[${PYTHON_USEDEP}]
+                       dev-python/numpy[${PYTHON_USEDEP}]
+               )
        )
        jack? (
                media-sound/jack-audio-connection-kit
@@ -90,7 +93,10 @@ RDEPEND="${PYTHON_DEPS}
        )
        wxwidgets? (
                dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
+               || (
+                       dev-python/numpy-python2[${PYTHON_USEDEP}]
+                       dev-python/numpy[${PYTHON_USEDEP}]
+               )
        )
        zeromq? ( >=net-libs/zeromq-2.1.11 )
        "

diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 15027d0285d739b273d682c66b288479ae616cbd..ff1b29da54ebf7aa599105abd348acd92c930d70 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -61,7 +61,10 @@ RDEPEND="${PYTHON_DEPS}
                dev-python/cheetah[${PYTHON_USEDEP}]
                dev-python/lxml[${PYTHON_USEDEP}]
                >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
+               || (
+                       dev-python/numpy-python2[${PYTHON_USEDEP}]
+                       dev-python/numpy[${PYTHON_USEDEP}]
+               )
        )
        jack? (
                media-sound/jack-audio-connection-kit
@@ -80,7 +83,10 @@ RDEPEND="${PYTHON_DEPS}
        )
        wxwidgets? (
                dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
+               || (
+                       dev-python/numpy-python2[${PYTHON_USEDEP}]
+                       dev-python/numpy[${PYTHON_USEDEP}]
+               )
        )
        zeromq? ( >=net-libs/zeromq-2.1.11 )
        "

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index e99366eabc8ce01263acf87b7ad3be86214651f2..3861b55c8576bcda792c2d62aeebabf8293c7d2e 100644 (file)
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -50,7 +50,10 @@ RDEPEND="${PYTHON_DEPS}
        >=dev-lang/orc-0.4.12
        dev-libs/boost:0=[${PYTHON_USEDEP}]
        !<=dev-libs/boost-1.52.0-r6:0/1.52
-       dev-python/numpy[${PYTHON_USEDEP}]
+       || (
+               dev-python/numpy-python2[${PYTHON_USEDEP}]
+               dev-python/numpy[${PYTHON_USEDEP}]
+       )
        dev-python/six[${PYTHON_USEDEP}]
        sci-libs/fftw:3.0=
        alsa? (