net-wireless/gr-osmosdr: resolve complex deps

gr-osmosdr can't build if old rtlsdr and new gnuradio-9999 is installed,
but now we have the new rtlsdr snapshot so just let users upgrade like
normal.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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
index b6d21d3f25c00723164081d8fe265e103c716c99..ba56a992249feb073a5d0b9875ec57e0c5e0f2e2 100644 (file)
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
@@ -29,7 +29,6 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"
 RDEPEND="${PYTHON_DEPS}
        dev-libs/boost:=
        >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-       <net-wireless/gnuradio-9999
        bladerf? ( net-wireless/bladerf:= )
        hackrf? ( net-libs/libhackrf:= )
        iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )

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
index 87fd96eee08331aba65fd9be5eb3ff9339ce5643..156b4781b5701d45178355d77e1f4146ed73099d 100644 (file)
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
@@ -30,7 +30,6 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
 RDEPEND="${PYTHON_DEPS}
        dev-libs/boost:=
        >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-       <net-wireless/gnuradio-9999
        bladerf? ( net-wireless/bladerf:= )
        hackrf? ( net-libs/libhackrf:= )
        iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )

diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 86677af90cad4fe20d2abb5c6795fa76c3913f94..ffbeed261500af8510d050f6d13fa9a97f522624 100644 (file)
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -30,7 +30,6 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
 RDEPEND="${PYTHON_DEPS}
        dev-libs/boost:=
        >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-       <net-wireless/gnuradio-9999
        bladerf? ( net-wireless/bladerf:= )
        hackrf? ( net-libs/libhackrf:= )
        iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )