From c7b7c4910acf50cb7cc363be93fd721259280850 Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Tue, 3 Dec 2019 19:25:02 -0500 Subject: net-wireless/gr-osmosdr: add airspy support cosmetic version bump to match upstream Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Rick Farina --- net-wireless/gr-osmosdr/Manifest | 1 + .../gr-osmosdr-0.1.4_p20180626-r4.ebuild | 73 ---------------------- .../gr-osmosdr-0.1.4_p20180626-r5.ebuild | 2 - net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild | 69 ++++++++++++++++++++ net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild | 16 ++--- net-wireless/gr-osmosdr/metadata.xml | 1 + 6 files changed, 77 insertions(+), 85 deletions(-) delete mode 100644 net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild create mode 100644 net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild (limited to 'net-wireless') diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest index c2b2cbbba871..f79d0e5e0b5c 100644 --- a/net-wireless/gr-osmosdr/Manifest +++ b/net-wireless/gr-osmosdr/Manifest @@ -1 +1,2 @@ DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28 +DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983 diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild deleted file mode 100644 index 67f6413233c9..000000000000 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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" - KEYWORDS="" -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 sdrplay 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.4:= ) - sdrplay? ( net-wireless/sdrplay ) - 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)" - -DENABLE_SDRPLAY="$(usex sdrplay)" - -DENABLE_NONFREE="$(usex sdrplay)" - ) - - 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-r5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild index 08764526720e..75a47d73672f 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild @@ -13,14 +13,12 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 SRC_URI="" EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" - KEYWORDS="" 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="" fi LICENSE="GPL-3" diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild new file mode 100644 index 000000000000..780a3c706b83 --- /dev/null +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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 + EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" +else + SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="GPL-3" +SLOT="0/${PV}" +IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd" + +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:= + >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] + airspy? ( net-wireless/airspy ) + 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.4:= ) + sdrplay? ( net-wireless/sdrplay ) + 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_AIRSPY="$(usex airspy)" + -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)" + -DENABLE_SDRPLAY="$(usex sdrplay)" + -DENABLE_NONFREE="$(usex sdrplay)" + ) + + 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-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild index 67f6413233c9..780a3c706b83 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 ) inherit cmake-utils python-single-r1 @@ -11,25 +11,20 @@ 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" - KEYWORDS="" + EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.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" + SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd" +IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd" RDEPEND="${PYTHON_DEPS} dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] + airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] ) @@ -48,6 +43,7 @@ src_configure() { -DENABLE_DEFAULT=OFF -DPYTHON_EXECUTABLE="${PYTHON}" -DENABLE_FILE=ON + -DENABLE_AIRSPY="$(usex airspy)" -DENABLE_BLADERF="$(usex bladerf)" -DENABLE_FCD="$(usex fcd)" -DENABLE_HACKRF="$(usex hackrf)" diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml index b55e17a06367..daafe681c99c 100644 --- a/net-wireless/gr-osmosdr/metadata.xml +++ b/net-wireless/gr-osmosdr/metadata.xml @@ -6,6 +6,7 @@ Radio + Build with Airspy support Build with Nuand BladeRF support Build with Funcube Dongle support Build with Great Scott Gadgets HackRF support -- cgit v1.2.3-65-gdbad