gentoo auto-resync : 16:12:2023 - 08:53:44

5 files changed, 94 insertions, 12 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index aadec8e41916..f5b3f8f0b646 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 72c024efadc3..aa02ea1a9073 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,9 @@
 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
+DIST gr-osmosdr-0.2.5.tar.gz 267914 BLAKE2B cec3790513a8e050610cb4b7f928c7b1d47e5b34e372f577c7f90a929a7353e2d7a86d04b8fcde57b24cc08554c5bee7257c052263de55e0f5ba3201f19a275c SHA512 d1c126d94accbd292624022df6ff7febecb1c73c3a1a0c3e8d0e3e4d882076df5b77ad14d79966a150e2c9d889c391239b1dc831acf49cdf891a19db7f830901
 EBUILD gr-osmosdr-0.2.3_p20210128-r1.ebuild 2547 BLAKE2B 54f99e5906116aad85bcde19d771e444ef88cdee1181da3f2cac4aee795974830e74b8aa23ad06d91888bdec5b2b2fc1327dd49ce5a8767942e81023dfd05160 SHA512 5130d2687d2ebd6d69b8e47602ee64fd68569ed864cfe67e1bcb1073da9afa9883b23f04831e8ca0282a56d15cdcaf395b738fd2b79168bae457fa302cb4854e
 EBUILD gr-osmosdr-0.2.4.ebuild 2556 BLAKE2B 24df69e2868205869fd044e288206af8e05636a9403035a70cabe30582cffb5ce3bf377980680518a3d31a637cae34054e983d72710200db1914d9bcf06a42c4 SHA512 d6f2213d5322f62bf354159d850397d135c3f57c0ff27bdbc0d52c57f4632a67e46ddc9f13c22d3062875336b4c481e75f84bbed42bf9057870d219cc451e28f
-EBUILD gr-osmosdr-9999.ebuild 2554 BLAKE2B 36f656c29e011d38c5cc5a61c9d6425d1692ac340dd67acbb4485b7930dec899a4b980aaa7cb1d5f885f657c82cdc65ca9894737cf4cf4f4e7ee0822808d32f8 SHA512 e66a8a80d1fd2a11fa627cf248ebaf2642fc5d5daa3f298047e9c8e56335b85e6920bec086f24466bcbe1242562aac952e01d247072d0034e6e567a841ff6261
-MISC metadata.xml 1299 BLAKE2B e91ccf502c25f2b6dd7e44dd4a945befdd66590be6d5d979b5c05830c20b82925f7ae5ee7cc3695477d90805eba05b1ac94ecdb032864c8772bd9922189d673e SHA512 96b58e7916e281ef27a791ac76535b26ea46a133649cabaa65a68c6587b3e3612706a7b39f58ec76786e73aebeefc89268db9b6b237e032a7f8248c34ed906d7
+EBUILD gr-osmosdr-0.2.5.ebuild 2390 BLAKE2B f0f8cf05d3a2ab37bf7f28a7e5b62d5e65d388c9d537efc3d7327454f26a960a2aa2d779dec24b67d3d51604986662dc515237857577574f3d4e24f0c2cc3eed SHA512 5433c373e0282420fca588ac202b14e6702857f0f82718439f44f7da5a5a4950fb0ed9780167e27ffb168555dd100be5f933b288d2264f57f38cd409493e2ac6
+EBUILD gr-osmosdr-9999.ebuild 2390 BLAKE2B f0f8cf05d3a2ab37bf7f28a7e5b62d5e65d388c9d537efc3d7327454f26a960a2aa2d779dec24b67d3d51604986662dc515237857577574f3d4e24f0c2cc3eed SHA512 5433c373e0282420fca588ac202b14e6702857f0f82718439f44f7da5a5a4950fb0ed9780167e27ffb168555dd100be5f933b288d2264f57f38cd409493e2ac6
+MISC metadata.xml 1216 BLAKE2B 4a6151282aebb42160bfdce62e8bcfce7a032b51909d1026ddda460d6a1b2ad0a1a2d9314ab7ffe2d038cdd8843ec74d3efd2bb3630b604550ae25c34e443cdb SHA512 880f182511fbfec4359e40362f44064bd76ca4e3fce60d65eb3c233d74faf7b148667147219086be2ac49541c8ebb286fa9ea083626b200b3c8ee2b6ca6f07fa
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5.ebuild
new file mode 100644
index 000000000000..9ff0faaaba65
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5.ebuild
@@ -0,0 +1,87 @@
+# 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://gitea.osmocom.org/sdr/gr-osmosdr.git"
+else
+	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 bladerf doc hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/log4cpp
+	net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}]
+	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}] )
+	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}/${PN}-0.2.3_p20210128-fix-enable-python.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_FILE=ON
+		-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="$(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-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index c2a2986ffc9f..9ff0faaaba65 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -14,15 +14,11 @@ 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"
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index e19fa75ed167..034011869409 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -16,7 +16,4 @@
 		<flag name="uhd">Build with Ettus Research USRP Hardware Driver support through <pkg>net-wireless/uhd</pkg></flag>
 		<flag name="xtrx">Build with xtrx Hardware Driver support through <pkg>net-wireless/libxtrx</pkg></flag>
 	</use>
-	<upstream>
-		<remote-id type="github">osmocom/gr-osmosdr</remote-id>
-	</upstream>
 </pkgmetadata>