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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/
Date: Fri, 18 Dec 2020 19:41:36 +0000 (UTC)	[thread overview]
Message-ID: <1608320483.1af84b4fc6ad98dabfa8082c5da13cf9df39bb34.zerochaos@gentoo> (raw)

commit:     1af84b4fc6ad98dabfa8082c5da13cf9df39bb34
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 19:38:16 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 19:41:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af84b4f

net-wireless/gr-osmosdr: bump

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/gr-osmosdr/Manifest                   |  2 +-
 ...smosdr-0.2.2.ebuild => gr-osmosdr-0.2.3.ebuild} | 43 ++++++++++------------
 net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild     | 30 ++++++++-------
 3 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 9fafb3253f4..47ad3e6b11e 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,2 +1,2 @@
 DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B 036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1 SHA512 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
-DIST gr-osmosdr-0.2.2.tar.gz 251425 BLAKE2B e1e29280b84139bf4b1b25ee35553f48abe7f26f9f240852c25f883ec6df406157d9b734035fd6df87e50b6d6f8ddab679ea91430558716acba05a9a64844c3d SHA512 42aef6efd35fd9184a371202398455de7cac3a88374e761359ab837a329495b653a95f5641f0a9533daeaa08c0d7fd5649b1b33359009dd4e8a3b9b24aedd2af
+DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e

diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
similarity index 58%
rename from net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
rename to net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
index af9ebaa516a..33c1a0233fa 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
@@ -19,47 +19,44 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd"
 
+#xtrx? ( net-wireless/libxtrx )
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
-	sci-libs/volk
+	sci-libs/volk:=
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_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_SINGLE_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )
+	"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-src_prepare() {
-	cmake_src_prepare
-	sed -i "s:\${GR_DOC_DIR}/\${CMAKE_PROJECT_NAME}:\${GR_DOC_DIR}/${PF}:" CMakeLists.txt || die
-}
-
 src_configure() {
+	#-DENABLE_XTRX="$(usex xtrx ON OFF)"
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
-		-DENABLE_AIRSPY="$(usex airspy)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-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)"
+		-DENABLE_AIRSPY="$(usex airspy ON OFF)"
+		-DENABLE_BLADERF="$(usex bladerf ON OFF)"
+		-DENABLE_HACKRF="$(usex hackrf ON OFF)"
+		-DENABLE_IQBALANCE="$(usex iqbalance ON OFF)"
+		-DENABLE_PYTHON="$(usex python ON OFF)"
+		-DENABLE_RTL="$(usex rtlsdr ON OFF)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)"
+		-DENABLE_SDRPLAY="$(usex sdrplay ON OFF)"
+		-DENABLE_NONFREE="$(usex sdrplay ON OFF)"
+		-DENABLE_SOAPY="$(usex soapy ON OFF)"
+		-DENABLE_UHD="$(usex uhd ON OFF)"
+		-DENABLE_XTRX=OFF
 	)
 
 	cmake_src_configure
@@ -68,10 +65,8 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	if use python; then
-		# Remove incorrectly byte-compiled Python files and replace
-		# https://github.com/gnuradio/gnuradio/issues/2944
-		find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
 		python_fix_shebang "${ED}"/usr/bin
 		python_optimize
 	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }

diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 00b281ec675..33c1a0233fa 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -21,10 +21,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd"
 
+#xtrx? ( net-wireless/libxtrx )
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
-	sci-libs/volk
+	sci-libs/volk:=
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
@@ -32,27 +33,30 @@ RDEPEND="${PYTHON_DEPS}
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )
+	"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_configure() {
+	#-DENABLE_XTRX="$(usex xtrx ON OFF)"
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
-		-DENABLE_AIRSPY="$(usex airspy)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IQBALANCE="$(usex iqbalance)"
-		-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)"
+		-DENABLE_AIRSPY="$(usex airspy ON OFF)"
+		-DENABLE_BLADERF="$(usex bladerf ON OFF)"
+		-DENABLE_HACKRF="$(usex hackrf ON OFF)"
+		-DENABLE_IQBALANCE="$(usex iqbalance ON OFF)"
+		-DENABLE_PYTHON="$(usex python ON OFF)"
+		-DENABLE_RTL="$(usex rtlsdr ON OFF)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)"
+		-DENABLE_SDRPLAY="$(usex sdrplay ON OFF)"
+		-DENABLE_NONFREE="$(usex sdrplay ON OFF)"
+		-DENABLE_SOAPY="$(usex soapy ON OFF)"
+		-DENABLE_UHD="$(usex uhd ON OFF)"
+		-DENABLE_XTRX=OFF
 	)
 
 	cmake_src_configure

next             reply	other threads:[~2020-12-18 19:41 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-18 19:41 Rick Farina [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-12 11:16 [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/ Thomas Beierlein
2024-12-08  5:23 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-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
2018-02-19 17:29 Richard Farina
2015-12-19 14:04 Chí-Thanh Christopher Nguyễn

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:9fafb3253f dfblob:47ad3e6b11 dfblob:af9ebaa516
dfblob:33c1a0233f dfblob:00b281ec67 dfblob:33c1a0233f )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/" )
	(help)

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=1608320483.1af84b4fc6ad98dabfa8082c5da13cf9df39bb34.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