[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/

[Richard Farina]

commit:     0bb9a9ef1a01d68b8d6e3e37c31fda41b67298d3
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 17:50:26 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 20:45:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb9a9ef

net-wireless/gr-osmosdr: fix deps

the libbladerf2 support commit breaks libbladerf1 support
so we just split versions and set deps right

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 net-wireless/gr-osmosdr/Manifest                                        | 1 +
 ...osdr-0.1.4_p20180626.ebuild => gr-osmosdr-0.1.4_p20170612-r1.ebuild} | 2 +-
 net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index c2b2cbbba87..97074e544a3 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1 +1,2 @@
+DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B 
d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e
 SHA512 
9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933
 DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 
223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda
 SHA512 
8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28

diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild 
b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
similarity index 97%
copy from net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
copy to net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
index 579c974f8ab..6e8fa0434f9 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
@@ -29,7 +29,7 @@ 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}]
-       bladerf? ( net-wireless/bladerf:= )
+       bladerf? ( <net-wireless/bladerf-2018.08_rc1:= )
        hackrf? ( net-libs/libhackrf:= )
        iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
        mirisdr? ( net-libs/libmirisdr:= )

diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild 
b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
index 579c974f8ab..2286e8a9c6a 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
@@ -29,7 +29,7 @@ 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}]
-       bladerf? ( net-wireless/bladerf:= )
+       bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
        hackrf? ( net-libs/libhackrf:= )
        iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
        mirisdr? ( net-libs/libmirisdr:= )