From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 155A715800F for ; Fri, 17 Feb 2023 22:26:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C01BE07C5; Fri, 17 Feb 2023 22:26:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 100BAE07C5 for ; Fri, 17 Feb 2023 22:26:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 293C8335DA3 for ; Fri, 17 Feb 2023 22:26:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EE338A7 for ; Fri, 17 Feb 2023 22:26:04 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1676672762.9d62a8de100198e16cbadc29f7e67444c8febd52.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild X-VCS-Directories: net-wireless/gr-osmosdr/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 9d62a8de100198e16cbadc29f7e67444c8febd52 X-VCS-Branch: master Date: Fri, 17 Feb 2023 22:26:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a3049e1f-44a9-468a-922e-de4dd1728de0 X-Archives-Hash: 6a445dbdd6ffa672be1ccf7aec60d603 commit: 9d62a8de100198e16cbadc29f7e67444c8febd52 Author: Rick Farina gentoo org> AuthorDate: Fri Feb 17 21:50:30 2023 +0000 Commit: Rick Farina gentoo org> CommitDate: Fri Feb 17 22:26:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d62a8de net-wireless/gr-osmosdr: sync versioned with live Signed-off-by: Rick Farina gentoo.org> .../gr-osmosdr-0.2.3_p20210128-r1.ebuild | 7 +++-- net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild | 30 +++++++++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild index 803032a0f1cd..22abb0f97404 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{9..10} ) inherit cmake python-single-r1 @@ -16,9 +16,12 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" else + #commit COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03" SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" + #release + #SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~riscv ~x86" fi @@ -51,7 +54,7 @@ BDEPEND=" REQUIRED_USE="${PYTHON_REQUIRED_USE}" PATCHES=( - "${FILESDIR}"/${P}-fix-enable-python.patch + "${FILESDIR}/${P}-fix-enable-python.patch" ) src_configure() { diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild index 9a232d13ca0a..0450e7102319 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-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{9..10} ) inherit cmake python-single-r1 @@ -16,17 +16,22 @@ 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" + #commit + COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03" + SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + #release + #SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd" +IUSE="airspy bladerf doc hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx" -#xtrx? ( net-wireless/libxtrx ) RDEPEND="${PYTHON_DEPS} dev-libs/boost:= + dev-libs/log4cpp net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] sci-libs/volk:= airspy? ( net-wireless/airspy ) @@ -37,13 +42,22 @@ RDEPEND="${PYTHON_DEPS} sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] ) + xtrx? ( net-wireless/libxtrx ) " DEPEND="${RDEPEND}" +BDEPEND=" + $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') + doc? ( app-doc/doxygen ) + " + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +PATCHES=( + "${FILESDIR}/${PN}-0.2.3_p20210128-fix-enable-python.patch" +) + src_configure() { - #-DENABLE_XTRX="$(usex xtrx ON OFF)" local mycmakeargs=( -DENABLE_DEFAULT=OFF -DPYTHON_EXECUTABLE="${PYTHON}" @@ -59,7 +73,8 @@ src_configure() { -DENABLE_NONFREE="$(usex sdrplay ON OFF)" -DENABLE_SOAPY="$(usex soapy ON OFF)" -DENABLE_UHD="$(usex uhd ON OFF)" - -DENABLE_XTRX=OFF + -DENABLE_XTRX="$(usex xtrx ON OFF)" + -DENABLE_DOXYGEN="$(usex doc ON OFF)" ) cmake_src_configure @@ -68,6 +83,7 @@ src_configure() { src_install() { cmake_src_install if use python; then + find "${ED}" -name '*.py[oc]' -delete || die python_fix_shebang "${ED}"/usr/bin python_optimize fi