1 |
commit: e09ac9a62ac481bb9c3591c587ff9b8a9ad9ba3a |
2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 22 03:14:41 2018 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 22 03:14:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e09ac9a6 |
7 |
|
8 |
net-wireless/gr-osmosdr: resolve complex deps |
9 |
|
10 |
gr-osmosdr can't build if old rtlsdr and new gnuradio-9999 is installed, |
11 |
but now we have the new rtlsdr snapshot so just let users upgrade like |
12 |
normal. |
13 |
|
14 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
15 |
|
16 |
net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild | 1 - |
17 |
net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild | 1 - |
18 |
net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild | 1 - |
19 |
3 files changed, 3 deletions(-) |
20 |
|
21 |
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild |
22 |
index b6d21d3f25c..ba56a992249 100644 |
23 |
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild |
24 |
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild |
25 |
@@ -29,7 +29,6 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd" |
26 |
RDEPEND="${PYTHON_DEPS} |
27 |
dev-libs/boost:= |
28 |
>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] |
29 |
- <net-wireless/gnuradio-9999 |
30 |
bladerf? ( net-wireless/bladerf:= ) |
31 |
hackrf? ( net-libs/libhackrf:= ) |
32 |
iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] ) |
33 |
|
34 |
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild |
35 |
index 87fd96eee08..156b4781b57 100644 |
36 |
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild |
37 |
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild |
38 |
@@ -30,7 +30,6 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd" |
39 |
RDEPEND="${PYTHON_DEPS} |
40 |
dev-libs/boost:= |
41 |
>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] |
42 |
- <net-wireless/gnuradio-9999 |
43 |
bladerf? ( net-wireless/bladerf:= ) |
44 |
hackrf? ( net-libs/libhackrf:= ) |
45 |
iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] ) |
46 |
|
47 |
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild |
48 |
index 86677af90ca..ffbeed26150 100644 |
49 |
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild |
50 |
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild |
51 |
@@ -30,7 +30,6 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd" |
52 |
RDEPEND="${PYTHON_DEPS} |
53 |
dev-libs/boost:= |
54 |
>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] |
55 |
- <net-wireless/gnuradio-9999 |
56 |
bladerf? ( net-wireless/bladerf:= ) |
57 |
hackrf? ( net-libs/libhackrf:= ) |
58 |
iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] ) |