public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Richard Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/
Date: Mon, 19 Feb 2018 17:29:32 +0000 (UTC)	[thread overview]
Message-ID: <1519061365.f929c88a71e18663f11ffbf87216016dae32b526.zerochaos@gentoo> (raw)

commit:     f929c88a71e18663f11ffbf87216016dae32b526
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 16:52:08 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 17:29:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f929c88a

net-wireless/gr-osmosdr: add soapy backend

bump, minor updates

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-wireless/gr-osmosdr/Manifest                   |  2 +-
 .../gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild   |  3 +-
 ....4.ebuild => gr-osmosdr-0.1.4_p20170612.ebuild} | 40 ++++++++++++----------
 net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild     | 34 +++++++++---------
 net-wireless/gr-osmosdr/metadata.xml               |  1 +
 5 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 81784e2b4ec..8ca6ce87462 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,2 +1,2 @@
-DIST gr-osmosdr-0.1.4.tar.xz 141500 BLAKE2B 1e65d59440cd4beadcb54e6c20cb38b2ad222811348475ac9a7109971b64bbdc11991f6b4e7f0de1fba79f6eddba9befedf9a0a3903211cbae7581f99a13bd40 SHA512 930a7f6065fba709fb770fd373f0fe7eba13abf09e49f6e839718d547ce69176d93d89d1b037ee3f0cdffda7060ac6c9ff4023dc835ec50ef456d51d383046ab
 DIST gr-osmosdr-0.1.4_p20150730.tar.xz 1148596 BLAKE2B ff5f27dc32438c94ac920e77e7722b3a4331c350b0535a8a787b72ad8653f57dc2a434c3dec9499bbe791e12dc863323c8f9f6c750b2c154ab35ed722e8e221f SHA512 7e6847eba0d4e217ea71bb4b8105290b329bf8840a7193df013b3a0cd9c9ef57f3686252da48cb0df239288b5794c75178a8bb45ff2a2dd8b605f63fec2426d9
+DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933

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 417f9cbdcf4..b6d21d3f25c 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,6 +29,7 @@ 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.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
similarity index 62%
rename from net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild
rename to net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
index 3290d91a6d3..87fd96eee08 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -15,49 +15,49 @@ if [[ ${PV} == 9999* ]]; then
 	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="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"
+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}] )
 	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_prepare() {
-	epatch_user
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
-		$(cmake-utils_use_enable bladerf)
-		$(cmake-utils_use_enable fcd)
-		$(cmake-utils_use_enable hackrf)
-		$(cmake-utils_use_enable iqbalance)
-		$(cmake-utils_use_enable mirisdr MIRI)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable rtlsdr RTL)
-		$(cmake-utils_use_enable rtlsdr RTL_TCP)
-		$(cmake-utils_use_enable uhd)
+		-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
@@ -65,5 +65,7 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/bin
+	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 8c05c70733f..86677af90ca 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-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -15,49 +15,49 @@ if [[ ${PV} == 9999* ]]; then
 	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="http://cgit.osmocom.org/gr-osmosdr/snapshot/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 uhd"
+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}] )
 	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_prepare() {
-	epatch_user
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
-		$(cmake-utils_use_enable bladerf)
-		$(cmake-utils_use_enable fcd)
-		$(cmake-utils_use_enable hackrf)
-		$(cmake-utils_use_enable iqbalance)
-		$(cmake-utils_use_enable mirisdr MIRI)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable rtlsdr RTL)
-		$(cmake-utils_use_enable rtlsdr RTL_TCP)
-		$(cmake-utils_use_enable uhd)
+		-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

diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index e8e448711ac..9dc2a893a65 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
 	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
 	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
+	<flag name="soapy">Build with SoapySDR support</flag>
 	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>
 </use>
 </pkgmetadata>


             reply	other threads:[~2018-02-19 17:29 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-19 17:29 Richard Farina [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-08  5:23 [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/ Matt Jolly
2024-06-22 14:54 Thomas Beierlein
2024-05-31 10:43 Thomas Beierlein
2024-01-03 19:31 Rick Farina
2024-01-03 19:31 Rick Farina
2024-01-03 19:31 Rick Farina
2023-12-16  3:04 Rick Farina
2023-04-06  2:18 Rick Farina
2023-04-04 23:55 Sam James
2023-02-17 22:26 Rick Farina
2023-02-17 22:26 Rick Farina
2023-01-25  6:10 Sam James
2023-01-25  6:10 Sam James
2023-01-25  6:10 Sam James
2023-01-25  6:10 Sam James
2023-01-25  6:10 Sam James
2022-11-22 16:42 Thomas Beierlein
2022-11-22  7:16 Thomas Beierlein
2022-11-22  7:16 Thomas Beierlein
2022-11-19  1:07 Yixun Lan
2022-11-18  6:38 Arthur Zamarin
2022-08-29 12:08 Thomas Beierlein
2022-08-18 17:51 Thomas Beierlein
2022-07-19  1:50 Sam James
2022-07-19  1:50 Sam James
2022-06-10 13:45 Thomas Beierlein
2021-06-02 17:31 Rick Farina
2021-03-25 18:29 Rick Farina
2021-02-15  2:19 Rick Farina
2020-12-18 19:41 Rick Farina
2020-11-24 18:22 Rick Farina
2020-10-11 14:33 Mikle Kolyada
2020-09-04 16:22 Rick Farina
2020-09-04 16:22 Rick Farina
2020-09-04 16:22 Rick Farina
2020-06-01 20:45 Rick Farina
2020-02-09 16:34 Michał Górny
2019-12-04  0:25 Rick Farina
2019-08-28 16:14 Rick Farina
2019-07-03  5:22 Rick Farina
2018-11-07 20:01 Rick Farina
2018-11-07 20:01 Rick Farina
2018-08-25 19:22 Christian Ruppert
2018-08-16 20:45 Richard Farina
2018-08-16 20:45 Richard Farina
2018-06-06  8:17 Andreas Sturmlechner
2018-06-06  8:13 Andreas Sturmlechner
2018-02-22  3:14 Richard Farina
2015-12-19 14:04 Chí-Thanh Christopher Nguyễn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519061365.f929c88a71e18663f11ffbf87216016dae32b526.zerochaos@gentoo \
    --to=zerochaos@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox