From e8b975880f21cc0aa575bf1c3d377ce3a9a11d29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 28 Jan 2020 21:55:12 +0100 Subject: [PATCH] net-wireless/gnuradio: Permit scipy-python2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- ...adio-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(-) rename net-wireless/gnuradio/{gnuradio-3.7.13.5-r1.ebuild => gnuradio-3.7.13.5-r2.ebuild} (98%) 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 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}] -- 2.26.2