gentoo auto-resync : 19:12:2024 - 06:30:51HEADmaster

4 files changed, 286 insertions, 28 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7f25466992fe..6b8a1885bc5b 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 8f55d616b245..386e86268838 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,5 +1,7 @@
 AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba
+DIST gnuradio-3.10.11.0.tar.gz 4659646 BLAKE2B 21d523030e578ac335dc1497da27a957026206b36323473d5e96d9bc3832a06765d26684c46c03017e23c0bc6302429c366befac40113f9987840d5c22f978af SHA512 faf47956924832b04c66469ba3bdf174876d25c41e0f1c1dde3755596d232e2d18f5dab7aa848463f2d23ec8bcda0283ee8ede34fd57b079fe3cdb62c6470a82
 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
+EBUILD gnuradio-3.10.11.0.ebuild 7189 BLAKE2B 53a0173296a87eaa0d1e5d1ab2fc6bba197423161d6480e6f6b6e4575999c64d138b07f7d7431fdc67d2b08e885d416655f1f3eb89836718774318566c0fab12 SHA512 ec2e2ae85567ac2fc333f8c1d9849393c7c6998fab540201b2be9357fd31c508adfd499064b4c9f66ab63bcf964a7b8ff7188b489103f0b819588789767abba9
 EBUILD gnuradio-3.10.9.2-r6.ebuild 7121 BLAKE2B 303ced66aafc13c232128e4147f4bc91df9e37b830caf2fc8ab63346c9f41c01ed478e5bed98510047c6d2bc8d0e0325d420bfd421e881c79cf8c2c9e6415602 SHA512 1e9cfae50f140ffa41b38897a4ad96f7c128f59e37838b649dcbaac1070420b9a9c7d792e45157b1dd216dffde21c0c857248a36334a8b7de3eceab4fa07327f
-EBUILD gnuradio-9999.ebuild 6718 BLAKE2B a6b7c4a17de476d65fd08935397a26eded8cb5abd18259beae7ef42d243a9788ad37bb199022e5aad9638acf3d71fea7c253ccb119bc38bdb4d03985d6aff537 SHA512 86a957e94886fefd8720e62d83175235f048e809f2ac5d8d9157da8cd8e4e96ec194ae25d83ae213dcc570c3e5eda6344b0845cb2fb442986fda7e6fbc4969fd
+EBUILD gnuradio-9999.ebuild 7189 BLAKE2B 53a0173296a87eaa0d1e5d1ab2fc6bba197423161d6480e6f6b6e4575999c64d138b07f7d7431fdc67d2b08e885d416655f1f3eb89836718774318566c0fab12 SHA512 ec2e2ae85567ac2fc333f8c1d9849393c7c6998fab540201b2be9357fd31c508adfd499064b4c9f66ab63bcf964a7b8ff7188b489103f0b819588789767abba9
 MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild
new file mode 100644
index 000000000000..b74126965c8a
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake desktop python-single-r1 virtualx xdg-utils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.10"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+# Tests are pulling in the installed python libs and breaking
+# https://github.com/gnuradio/gnuradio/issues/7568
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alsa? ( audio )
+	analog? ( filter )
+	audio? ( || ( alsa oss jack portaudio ) )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	jack? ( audio )
+	modtool? ( utils )
+	oss? ( audio )
+	portaudio? ( audio )
+	qt5? ( filter )
+	test? ( channels )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]')
+	dev-libs/gmp:=
+	dev-libs/log4cpp:=
+	$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
+	dev-libs/spdlog:=
+	dev-libs/libfmt:=
+	sci-libs/fftw:3.0=
+	sci-libs/volk:=
+	media-libs/libsndfile
+	sys-libs/libunwind
+	alsa? ( media-libs/alsa-lib:= )
+	ctrlport? (
+		$(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]')
+	)
+	fec? (
+		sci-libs/gsl:=
+		dev-python/scipy
+	)
+	filter? (
+		dev-python/scipy
+		$(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]')
+	)
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	iio? (
+		net-libs/libiio:=
+		net-libs/libad9361-iio:=
+		!net-wireless/gr-iio
+	)
+	jack? ( virtual/jack )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/pyqt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6=[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	soapy? (
+		net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}]
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( dev-python/scipy )
+	uhd? (
+		>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1:=
+	)
+	wavelet? (
+		sci-libs/gsl:=
+		sci-libs/lapack
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11:= )
+"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+	virtual/pkgconfig
+	doc? (
+		>=app-text/doxygen-1.5.7.1
+		<dev-libs/mathjax-3
+	)
+	grc? ( x11-misc/xdg-utils )
+	modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') )
+	oss? ( virtual/os-headers )
+	test? (
+		>=dev-util/cppunit-1.9.14
+		dev-python/pyzmq
+	)
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_ANALOG="$(usex analog ON OFF)"
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_CHANNELS="$(usex channels ON OFF)"
+		-DENABLE_GR_CTRLPORT="$(usex ctrlport ON OFF)"
+		-DENABLE_GR_DIGITAL="$(usex digital ON OFF)"
+		-DENABLE_DOXYGEN="$(usex doc ON OFF)"
+		-DENABLE_GR_DTV="$(usex dtv ON OFF)"
+		-DENABLE_GR_FEC="$(usex fec ON OFF)"
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_FILTER="$(usex filter ON OFF)"
+		-DENABLE_GRC="$(usex grc ON OFF)"
+		-DENABLE_GR_IIO="$(usex iio ON OFF)"
+		-DENABLE_GR_MODTOOL="$(usex modtool ON OFF)"
+		-DENABLE_GR_BLOCKTOOL="$(usex modtool ON OFF)"
+		-DENABLE_GR_NETWORK="$(usex network ON OFF)"
+		-DENABLE_GR_PDU=ON
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters ON OFF)"
+		-DENABLE_TESTING="$(usex test ON OFF)"
+		-DENABLE_GR_QTGUI="$(usex qt5 ON OFF)"
+		-DENABLE_GR_SOAPY="$(usex soapy ON OFF)"
+		-DENABLE_GR_TRELLIS="$(usex trellis ON OFF)"
+		-DENABLE_GR_UHD="$(usex uhd ON OFF)"
+		-DENABLE_GR_UTILS="$(usex utils ON OFF)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl ON OFF)"
+		-DENABLE_GR_VOCODER="$(usex vocoder ON OFF)"
+		-DENABLE_GR_WAVELET="$(usex wavelet ON OFF)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq ON OFF)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DMATHJAX2_ROOT="${EPREFIX}/usr/share/mathjax"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/${PN}-grc.desktop"
+		for size in 16 24 32 48 64 128 256; do
+			newicon -s $size "${fd_path}/"grc-icon-$size.png ${PN}-grc.png
+		done
+	fi
+
+	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test() {
+	# skip test which needs internet (metainfo_test)
+	# skip test which is currently broken (qa_correlate_access_code_XX_ts)
+	# https://github.com/gnuradio/gnuradio/issues/7566
+	virtx cmake_src_test -E 'metainfo_test|qa_correlate_access_code_XX_ts' --output-on-failure
+}
+
+pkg_postinst() {
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index d29a3fec6027..b74126965c8a 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -23,7 +23,10 @@ fi
 
 IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq"
 
-RESTRICT="!test? ( test )"
+#RESTRICT="!test? ( test )"
+# Tests are pulling in the installed python libs and breaking
+# https://github.com/gnuradio/gnuradio/issues/7568
+RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	alsa? ( audio )
@@ -149,33 +152,33 @@ src_configure() {
 		-DENABLE_GNURADIO_RUNTIME=ON
 		-DENABLE_PYTHON=ON
 		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ANALOG="$(usex analog ON OFF)"
 		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_CHANNELS="$(usex channels)"
-		-DENABLE_GR_CTRLPORT="$(usex ctrlport)"
-		-DENABLE_GR_DIGITAL="$(usex digital)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_CHANNELS="$(usex channels ON OFF)"
+		-DENABLE_GR_CTRLPORT="$(usex ctrlport ON OFF)"
+		-DENABLE_GR_DIGITAL="$(usex digital ON OFF)"
+		-DENABLE_DOXYGEN="$(usex doc ON OFF)"
+		-DENABLE_GR_DTV="$(usex dtv ON OFF)"
+		-DENABLE_GR_FEC="$(usex fec ON OFF)"
 		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_FILTER="$(usex filter)"
-		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_IIO="$(usex iio)"
-		-DENABLE_GR_MODTOOL="$(usex modtool)"
-		-DENABLE_GR_BLOCKTOOL="$(usex modtool)"
-		-DENABLE_GR_NETWORK="$(usex network)"
+		-DENABLE_GR_FILTER="$(usex filter ON OFF)"
+		-DENABLE_GRC="$(usex grc ON OFF)"
+		-DENABLE_GR_IIO="$(usex iio ON OFF)"
+		-DENABLE_GR_MODTOOL="$(usex modtool ON OFF)"
+		-DENABLE_GR_BLOCKTOOL="$(usex modtool ON OFF)"
+		-DENABLE_GR_NETWORK="$(usex network ON OFF)"
 		-DENABLE_GR_PDU=ON
-		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DENABLE_GR_SOAPY="$(usex soapy)"
-		-DENABLE_GR_TRELLIS="$(usex trellis)"
-		-DENABLE_GR_UHD="$(usex uhd)"
-		-DENABLE_GR_UTILS="$(usex utils)"
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_VOCODER="$(usex vocoder)"
-		-DENABLE_GR_WAVELET="$(usex wavelet)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters ON OFF)"
+		-DENABLE_TESTING="$(usex test ON OFF)"
+		-DENABLE_GR_QTGUI="$(usex qt5 ON OFF)"
+		-DENABLE_GR_SOAPY="$(usex soapy ON OFF)"
+		-DENABLE_GR_TRELLIS="$(usex trellis ON OFF)"
+		-DENABLE_GR_UHD="$(usex uhd ON OFF)"
+		-DENABLE_GR_UTILS="$(usex utils ON OFF)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl ON OFF)"
+		-DENABLE_GR_VOCODER="$(usex vocoder ON OFF)"
+		-DENABLE_GR_WAVELET="$(usex wavelet ON OFF)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq ON OFF)"
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PYTHON_DIR="$(python_get_sitedir)"
@@ -225,8 +228,10 @@ src_install() {
 }
 
 src_test() {
-	# skip test which needs internet
-	virtx cmake_src_test -E metainfo_test --output-on-failure
+	# skip test which needs internet (metainfo_test)
+	# skip test which is currently broken (qa_correlate_access_code_XX_ts)
+	# https://github.com/gnuradio/gnuradio/issues/7566
+	virtx cmake_src_test -E 'metainfo_test|qa_correlate_access_code_XX_ts' --output-on-failure
 }
 
 pkg_postinst() {