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

[Rick Farina]

commit:     9d62a8de100198e16cbadc29f7e67444c8febd52
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 21:50:30 2023 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> 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 <zerochaos <AT> 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