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

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index c2b2cbbba871b340da9efb849e15e0323c4f306d..97074e544a30f130d2ac4d67f3ebcd5a557c350f 100644 (file)
--- 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_p20170612-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
new file mode 100644 (file)
index 0000000..6e8fa04
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
+
+if [[ ${PV} == 9999* ]]; then
+       inherit git-r3
+       SRC_URI=""
+       EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+else
+       #SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
+       #git clone git://git.osmocom.org/gr-osmosdr.git
+       #cd gr-osmosdr
+       #git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
+       SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+       KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+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-2018.08_rc1:= )
+       hackrf? ( net-libs/libhackrf:= )
+       iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+       mirisdr? ( net-libs/libmirisdr:= )
+       rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+       soapy? ( net-wireless/soapysdr )
+       uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+       dev-python/cheetah"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+       local mycmakeargs=(
+               -DENABLE_DEFAULT=OFF
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DENABLE_FILE=ON
+               -DENABLE_BLADERF="$(usex bladerf)"
+               -DENABLE_FCD="$(usex fcd)"
+               -DENABLE_HACKRF="$(usex hackrf)"
+               -DENABLE_IQBALANCE="$(usex iqbalance)"
+               -DENABLE_MIRI="$(usex mirisdr)"
+               -DENABLE_PYTHON="$(usex python)"
+               -DENABLE_RTL="$(usex rtlsdr)"
+               -DENABLE_RTL_TCP="$(usex rtlsdr)"
+               -DENABLE_SOAPY="$(usex soapy)"
+               -DENABLE_UHD="$(usex uhd)"
+       )
+
+       cmake-utils_src_configure
+}
+
+src_install() {
+       cmake-utils_src_install
+       if use python; then
+               python_fix_shebang "${ED}"/usr/bin
+       fi
+}

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 579c974f8abeb8039dfe78627ef42ba266f1a49b..2286e8a9c6a10e86b9a7c75bf97a7c13c0a74fab 100644 (file)
--- 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:= )