net-wireless/gr-osmosdr: Update for v0.2.5

Signed-off-by: Quetzaly Daniela Solano Gómez <gentoo@sattvik.com>

4 files changed, 23 insertions, 132 deletions

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index e2c64b9..e72498a 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,5 @@
 AUX gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch 342 BLAKE2B fe7b93a8679eb11959560e41c8c9675d94f27578c98926327329139cab87cdab1d8556605809347a894a6cf66b44f9d585ace9c3edf51d938558cab0a7da67ef SHA512 dab43caa06b4073cc6832076b58a938f6ad0ea023870279c2f49588d88d2b208465d4788f6d0ed9d02a11a6678e21974a982a23565fcecbf72d841ea6b1a18a6
-DIST gr-osmosdr-0.2.3_p20210128.tar.gz 257938 BLAKE2B 1bdb3b57ec6a2f942769770c34d41b4e3db5b62f8c337d724b0099f9a2fe5bdb7231bc0727dfe4bd01cd62918b4847ea2f8780208c0960bced5853c716ec6f02 SHA512 4dcb6b2c10eeb2252111ba691be179fe5b6dc9598fa7e6129a3b214ee74d43ca2d67ab5eafa73cea2abb25729c24be0592585d149e13c7285f2ce330e52a6470
-DIST gr-osmosdr-0.2.4.tar.gz 260745 BLAKE2B 6af08b2658619edbbbf398aebcd3b3262f03aa7ed9d18c31970c255f093ea60d8da8597635fdd33a267a005a375fd54b82d1405c6674ad92721c38b3e4660a16 SHA512 04b54c92e40e58b76a9e6c9c3fb419f97af2599ca2f92cb58858464722e993ebe05896ffee2592ced729521ec65857eac9fac7809567c8b6de62a0ff99f615d5
-EBUILD gr-osmosdr-0.2.3_p20210128-r1.ebuild 2632 BLAKE2B 813ab0475d703fb049be1d12ab7ca8810b721bc8327138804cb26e810db0677185e704e3d22235a451dfa69f6c22431d2c6d3b5f91b15b66c5a3ef36b8c35265 SHA512 1cc5a69141fee910a1e37a3c4059a17f2fc2f704c9dc3a2497d027722cbc021be504ae7c7a9654610af014d9d3511c9a2fa7e658bdc3e0aa60f538db6466ab8c
-EBUILD gr-osmosdr-0.2.4.ebuild 2641 BLAKE2B c836482593d1bbb687bf4bc5cf30f8a6f9f2478960cea90a4c245a3148ec80c83412aa04bb0ef35c6d0f6b08d081949ce5bd5524aee4e4d7b26995ca192326c1 SHA512 f42509da8f302553d5f3972fb1716c70e9058e8029b348bfd62c75a087b9ed81daa6dae5d6f73299b6a6dae2f6493cc3a057379931b9ee97785de2c24eab4837
-EBUILD gr-osmosdr-9999.ebuild 2639 BLAKE2B b12b17b3bbe44f2b37e14c2234c0404f09735cb0867e5a63bf6db2ba97c840bde67a789aabb00716f1f2944624ef7b8e57f917133e893c62094508bd0a8e8aaa SHA512 6f5f49022a6f6675ca25e234fd83bb0fda65a32d3366ba812eb09c68ae102ee5d9465d5fd2d78caf71d78112a6ce6ed755c69743341dcf84d825a15f25cc5dde
+DIST gr-osmosdr-0.2.5.tar.gz 267914 BLAKE2B cec3790513a8e050610cb4b7f928c7b1d47e5b34e372f577c7f90a929a7353e2d7a86d04b8fcde57b24cc08554c5bee7257c052263de55e0f5ba3201f19a275c SHA512 d1c126d94accbd292624022df6ff7febecb1c73c3a1a0c3e8d0e3e4d882076df5b77ad14d79966a150e2c9d889c391239b1dc831acf49cdf891a19db7f830901
+EBUILD gr-osmosdr-0.2.5-r1.ebuild 2361 BLAKE2B 775c955b1703b0ebf13720af6f35487a4f7496429eb00d80e0e16913efc75abbbbbac662bbf45547d479a7b31734f666753a8ccf4ae2c6f5ddb4d8b95a8aa516 SHA512 3874df48b423477c5c8b9d66fbe912cc129f769ed30560c296eb784f20bbb9205f8268a7ec418a891c9cbbd8206238620f6bf8435b9233b821d2fb5fbfa4f3b0
+EBUILD gr-osmosdr-9999.ebuild 2361 BLAKE2B 775c955b1703b0ebf13720af6f35487a4f7496429eb00d80e0e16913efc75abbbbbac662bbf45547d479a7b31734f666753a8ccf4ae2c6f5ddb4d8b95a8aa516 SHA512 3874df48b423477c5c8b9d66fbe912cc129f769ed30560c296eb784f20bbb9205f8268a7ec418a891c9cbbd8206238620f6bf8435b9233b821d2fb5fbfa4f3b0
 MISC metadata.xml 1401 BLAKE2B 5c2c01686f36d74d15acc03762da676810507d88f5a43d0246bbd00d0f369f201e5a31a1a6feb9da9539871a7e371d9f7f350d811ca13665eeb9163c6ff639d1 SHA512 364e9cbdfc91822eb4153dec0a30cef4d1af45d5bbaee35fd08a38cd2c7a32c4fab052af13711d9701ffcaa15b766798d237e940557c1e6036c6aeffbb0773bb
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
deleted file mode 100644
index 3f3a2f6..0000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
-HOMEPAGE="
-	https://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-	https://gitea.osmocom.org/sdr/gr-osmosdr
-"
-
-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
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="airspy airspyhf bladerf doc hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/log4cpp
-	>=net-wireless/gnuradio-3.9.0.0:0=[${PYTHON_SINGLE_USEDEP}]
-	sci-libs/volk:=
-	airspy? ( net-wireless/airspy )
-	airspyhf? ( net-wireless/airspyhf )
-	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
-	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
-	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
-	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}/${P}-fix-enable-python.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DENABLE_FILE=ON
-		-DENABLE_AIRSPY="$(usex airspy ON OFF)"
-		-DENABLE_AIRSPYHF="$(usex airspyhf)"
-		-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="$(usex xtrx ON OFF)"
-		-DENABLE_DOXYGEN="$(usex doc ON OFF)"
-	)
-
-	cmake_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
-	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
-}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5-r1.ebuild
index ce3cdc6..28aedba 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,20 +14,16 @@ HOMEPAGE="
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
+	EGIT_REPO_URI="https://gitea.osmocom.org/sdr/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"
+	SRC_URI="https://gitea.osmocom.org/sdr/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	S="${WORKDIR}/${PN}"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy airspyhf bladerf doc hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
+IUSE="airspy airspyhf bladerf doc hackrf iqbalance rtlsdr sdrplay soapy uhd xtrx"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
@@ -49,7 +45,7 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="
 		$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
-		doc? ( app-doc/doxygen )
+		doc? ( app-text/doxygen )
 	"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -68,7 +64,7 @@ src_configure() {
 		-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_PYTHON=ON
 		-DENABLE_RTL="$(usex rtlsdr ON OFF)"
 		-DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)"
 		-DENABLE_SDRPLAY="$(usex sdrplay ON OFF)"
@@ -84,10 +80,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
-	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+	find "${ED}" -name '*.py[oc]' -delete || die
+	python_fix_shebang "${ED}"/usr/bin
+	python_optimize
 }
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index c6faf78..28aedba 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,20 +14,16 @@ HOMEPAGE="
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
+	EGIT_REPO_URI="https://gitea.osmocom.org/sdr/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"
+	SRC_URI="https://gitea.osmocom.org/sdr/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	S="${WORKDIR}/${PN}"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy airspyhf bladerf doc hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
+IUSE="airspy airspyhf bladerf doc hackrf iqbalance rtlsdr sdrplay soapy uhd xtrx"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
@@ -49,7 +45,7 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="
 		$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
-		doc? ( app-doc/doxygen )
+		doc? ( app-text/doxygen )
 	"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -68,7 +64,7 @@ src_configure() {
 		-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_PYTHON=ON
 		-DENABLE_RTL="$(usex rtlsdr ON OFF)"
 		-DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)"
 		-DENABLE_SDRPLAY="$(usex sdrplay ON OFF)"
@@ -84,10 +80,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
-	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+	find "${ED}" -name '*.py[oc]' -delete || die
+	python_fix_shebang "${ED}"/usr/bin
+	python_optimize
 }