commit: c7b7c4910acf50cb7cc363be93fd721259280850
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 4 00:25:02 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Dec 4 00:25:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b7c491
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 <zerochaos <AT> gentoo.org>
net-wireless/gr-osmosdr/Manifest | 1 +
.../gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild | 2 --
...0.1.4_p20180626-r4.ebuild => gr-osmosdr-0.1.5.ebuild} | 16 ++++++----------
net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild | 16 ++++++----------
net-wireless/gr-osmosdr/metadata.xml | 1 +
5 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index c2b2cbbba87..f79d0e5e0b5 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-r5.ebuild
b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
index 08764526720..75a47d73672 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.4_p20180626-r4.ebuild
b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
similarity index 77%
rename from net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild
rename to net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
index 67f6413233c..780a3c706b8 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.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/gr-osmosdr-9999.ebuild
b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 67f6413233c..780a3c706b8 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 b55e17a0636..daafe681c99 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -6,6 +6,7 @@
<name>Radio</name>
</maintainer>
<use>
+ <flag name="airspy">Build with Airspy support</flag>
<flag name="bladerf">Build with Nuand BladeRF support</flag>
<flag name="fcd">Build with Funcube Dongle support</flag>
<flag name="hackrf">Build with Great Scott Gadgets HackRF support</flag>
