Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/
Date: Tue, 28 Jan 2020 21:30:32
Message-Id: 1580247012.e8b975880f21cc0aa575bf1c3d377ce3a9a11d29.mgorny@gentoo
1 commit: e8b975880f21cc0aa575bf1c3d377ce3a9a11d29
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 28 20:55:12 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 28 21:30:12 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b97588
7
8 net-wireless/gnuradio: Permit scipy-python2
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 .../{gnuradio-3.7.13.5-r1.ebuild => gnuradio-3.7.13.5-r2.ebuild} | 7 ++++++-
13 net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 7 ++++++-
14 net-wireless/gnuradio/gnuradio-9999.ebuild | 7 ++++++-
15 3 files changed, 18 insertions(+), 3 deletions(-)
16
17 diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
18 similarity index 98%
19 rename from net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
20 rename to net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
21 index 2adf66594e3..dec78f161e8 100644
22 --- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
23 +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
24 @@ -59,7 +59,12 @@ RDEPEND="${PYTHON_DEPS}
25 media-libs/alsa-lib:=
26 )
27 fcd? ( virtual/libusb:1 )
28 - filter? ( sci-libs/scipy )
29 + filter? (
30 + || (
31 + sci-libs/scipy-python2[${PYTHON_USEDEP}]
32 + sci-libs/scipy[${PYTHON_USEDEP}]
33 + )
34 + )
35 grc? (
36 dev-python/cheetah[${PYTHON_USEDEP}]
37 dev-python/lxml[${PYTHON_USEDEP}]
38
39 diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
40 index 44ed5fe566f..8c07aa105ae 100644
41 --- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
42 +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
43 @@ -56,7 +56,12 @@ RDEPEND="${PYTHON_DEPS}
44 media-libs/alsa-lib:=
45 )
46 fcd? ( virtual/libusb:1 )
47 - filter? ( sci-libs/scipy )
48 + filter? (
49 + || (
50 + sci-libs/scipy-python2[${PYTHON_USEDEP}]
51 + sci-libs/scipy[${PYTHON_USEDEP}]
52 + )
53 + )
54 grc? (
55 dev-python/cheetah[${PYTHON_USEDEP}]
56 dev-python/lxml[${PYTHON_USEDEP}]
57
58 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
59 index b91c70b209e..6687ca88195 100644
60 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
61 +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
62 @@ -60,7 +60,12 @@ RDEPEND="${PYTHON_DEPS}
63 media-libs/alsa-lib:=
64 )
65 fcd? ( virtual/libusb:1 )
66 - filter? ( sci-libs/scipy )
67 + filter? (
68 + || (
69 + sci-libs/scipy-python2[${PYTHON_USEDEP}]
70 + sci-libs/scipy[${PYTHON_USEDEP}]
71 + )
72 + )
73 grc? (
74 dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
75 dev-python/pyyaml[${PYTHON_USEDEP}]