gentoo auto-resync : 18:02:2023 - 02:09:39

5 files changed, 123 insertions, 11 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index f431e833afc0..d455539fe975 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 e0b10c636bf8..dc40bfc85f9d 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,5 +1,7 @@
 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
-EBUILD gr-osmosdr-0.2.3_p20210128-r1.ebuild 2441 BLAKE2B a702f0cd50f1ea47066b93a90991a77fd2954516028b83ec87536b440f9720ab624b945c0cd16086692d964687ac9bedcb3df9cbed6a1e868446b139600def95 SHA512 41bd9dd682ff56b39f80241ce3ed65833d660a682567b59618a807fecd50775f8fdab8fc0ce0f8e6b809f3dfee536204e0d4755c3f4a2645067faa98b08d4ad4
-EBUILD gr-osmosdr-9999.ebuild 2081 BLAKE2B 47d86594a37e4cdb512a16a88f7b19629ee9984e38ae054f801a58578439b2a8e8b25e82d3df02dc8a2b683aa9ec3f31ba461000f715d133998127ae5186d9eb SHA512 ad1a228686c37b2a756f5cc57f7137b648ef62e2ea558a46e1a6b22b161b429bd4827254a4ed3510de717dd0f8f47f2b5a75405381b6748912c628b072d14f9c
+DIST gr-osmosdr-0.2.4.tar.gz 260745 BLAKE2B 6af08b2658619edbbbf398aebcd3b3262f03aa7ed9d18c31970c255f093ea60d8da8597635fdd33a267a005a375fd54b82d1405c6674ad92721c38b3e4660a16 SHA512 04b54c92e40e58b76a9e6c9c3fb419f97af2599ca2f92cb58858464722e993ebe05896ffee2592ced729521ec65857eac9fac7809567c8b6de62a0ff99f615d5
+EBUILD gr-osmosdr-0.2.3_p20210128-r1.ebuild 2547 BLAKE2B a7736e3c4c0041c40cc0ef2df733f461bab72a6a87fc0a01bc85a1b8c513707712a33d1423eb77e8e01aeb7736a856056c2d86fc08db9fcd922e0da1538c6672 SHA512 8f183f3f92962366dad24687db97f6b58f965d1e4a594f0a1f3dadfbc7439d3ea06ae720b5d591c8d2a42a54b9c39b9c3ab11226aaace0a3c018ee7f33d2bde7
+EBUILD gr-osmosdr-0.2.4.ebuild 2556 BLAKE2B 2956c1d8ccaf4df01af6849bf4c55489528f2a61ba245adbfd3703c397aa1de01e9fe4ad10973dc533050fbc14c910020b6e789db064f921de9557b73daa0955 SHA512 e4d645caa55e890a574db0d8f4da8ab6b770686922e0ca029dd65bdd987cc23c7435f95a18353475a97b3a6f3b432029a0228432cf4dbe10e3890140020c8805
+EBUILD gr-osmosdr-9999.ebuild 2554 BLAKE2B d33c424222c85de0e0f670a6b801ef58fae10a34a2052be9241d8d4b4a221c1190b5ba33e46bd0f8ef51b93117b388847579a3ed405a3cfbc917e3256fc89975 SHA512 888b6ba983f1753ca4cb1fec809248158b37d24d6f3cca374006962134c38bd3f69db2f780ff45ee0a34a2afe393b0afb4f93a6273c3519707f54fda3b43cb94
 MISC metadata.xml 1299 BLAKE2B e91ccf502c25f2b6dd7e44dd4a945befdd66590be6d5d979b5c05830c20b82925f7ae5ee7cc3695477d90805eba05b1ac94ecdb032864c8772bd9922189d673e SHA512 96b58e7916e281ef27a791ac76535b26ea46a133649cabaa65a68c6587b3e3612706a7b39f58ec76786e73aebeefc89268db9b6b237e032a7f8248c34ed906d7
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-0.2.4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild
new file mode 100644
index 000000000000..e0a5f307ad31
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..10} )
+
+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 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 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