gentoo auto-resync : 12:12:2024 - 02:01:23

5 files changed, 4 insertions, 249 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 81c2307c2b4b..7e8488200896 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index cb5ebe035e30..8f55d616b245 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,6 +1,5 @@
 AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba
 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
-EBUILD gnuradio-3.10.9.2-r4.ebuild 6715 BLAKE2B 949af88fc726652b293f740ae1814835b6b8d3cf785a69a163e210331445f25df43e0bcf6c26f918484004609bf85a9eb67df1264e7c99b980ba602cad136f96 SHA512 e32c5f3cfb2f48d02c3732adb11a826a116594f6c99b5a1beb50ccc3a479a57da507f08928b082eb0bff558ee874943940dbeb9f98f8ece5ae1f4eb92c4bbc64
-EBUILD gnuradio-3.10.9.2-r5.ebuild 7117 BLAKE2B 89c4f8f2ea3ce535965c4a702c8255384c686990a6f4282485578b91527c5c4b52393c442674e23a269ce4b5c6affe7379e51c63cae14cec5f79c655649b223d SHA512 f73dfeb19ccca36f217f0536c81caaa670e8a908caaaaffd31eeb7232a6823534751548bc65fdcc6c13ac975df27c2bf2968a4f01f4e2bc45e42aa319b578088
-EBUILD gnuradio-9999.ebuild 6731 BLAKE2B 43b6d07e4cfe346cd02ebe34ff0546c793ff1c91540b1b0412f62e8c7c5ab3b2eb981a78453c1f877e1dd3a461e4b2a92d67932e46ac2106f314df32bcaa69c1 SHA512 5bfccf73043ce7d9efc558b62727ae0ce0080eb2758609379e32373703d19e42d1564c377a3297e0163c50c9e4bb6a142cfba0872532c679d9830c77f0807ed2
+EBUILD gnuradio-3.10.9.2-r6.ebuild 7121 BLAKE2B 303ced66aafc13c232128e4147f4bc91df9e37b830caf2fc8ab63346c9f41c01ed478e5bed98510047c6d2bc8d0e0325d420bfd421e881c79cf8c2c9e6415602 SHA512 1e9cfae50f140ffa41b38897a4ad96f7c128f59e37838b649dcbaac1070420b9a9c7d792e45157b1dd216dffde21c0c857248a36334a8b7de3eceab4fa07327f
+EBUILD gnuradio-9999.ebuild 6718 BLAKE2B a6b7c4a17de476d65fd08935397a26eded8cb5abd18259beae7ef42d243a9788ad37bb199022e5aad9638acf3d71fea7c253ccb119bc38bdb4d03985d6aff537 SHA512 86a957e94886fefd8720e62d83175235f048e809f2ac5d8d9157da8cd8e4e96ec194ae25d83ae213dcc570c3e5eda6344b0845cb2fb442986fda7e6fbc4969fd
 MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild
deleted file mode 100644
index 0c6c6a3c8bb8..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	audio? ( || ( alsa oss jack portaudio ) )
-	alsa? ( audio )
-	jack? ( audio )
-	oss? ( audio )
-	portaudio? ( audio )
-	analog? ( filter )
-	channels? ( filter analog qt5 )
-	digital? ( filter analog )
-	dtv? ( filter analog fec )
-	modtool? ( utils )
-	qt5? ( filter )
-	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 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-PATCHES=( "${FILESDIR}/PR7093.patch" )
-
-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)"
-		-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_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_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)"
-		-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
-	virtx cmake_src_test -E metainfo_test --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-3.10.9.2-r5.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild
index ab0fd8c976f1..f4eaff739bf2 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r5.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	filter? (
 		dev-python/scipy
-		$(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/pyqtgraph[qt5,${PYTHON_USEDEP}]')
 	)
 	grc? (
 		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 365631b67e4a..d29a3fec6027 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -226,7 +226,7 @@ src_install() {
 
 src_test() {
 	# skip test which needs internet
-	virtx MAKEOPTS=-j1 cmake_src_test -E metainfo_test --output-on-failure
+	virtx cmake_src_test -E metainfo_test --output-on-failure
 }
 
 pkg_postinst() {