From 8cbd3b8d70bc07daa677dbee7205238478327cc3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 16 Jan 2020 07:23:56 +0100 Subject: [PATCH] net-wireless/gnuradio: Permit numpy-python2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild | 5 ++++- net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild | 10 ++++++++-- net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 10 ++++++++-- net-wireless/gnuradio/gnuradio-9999.ebuild | 5 ++++- 4 files changed, 24 insertions(+), 6 deletions(-) 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 03fd5605be28..5c9dcc316787 100644 --- 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 3c132c32fca0..afa455f35653 100644 --- 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 15027d0285d7..ff1b29da54eb 100644 --- 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 e99366eabc8c..3861b55c8576 100644 --- 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? ( -- 2.26.2