gentoo auto-resync : 22:10:2022 - 14:04:34

4 files changed, 33 insertions, 250 deletions

diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 2016c905d7dc..415263a39bf9 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,10 +1,11 @@
 AUX gnuradio-3.10.3.0-fix-fmt-v9.patch 4393 BLAKE2B eb915d3e63a96e0527b8525da35fa6ad9870f7ed8b113b7aeda5d616e235a89937f2187e6bd862ec3703ba2d763ae0f0d4821ed0d27f3fba290af2e7c8c1eb92 SHA512 cb45360160325fb8904a7d2edf2eaf09143327c3133575f91cfe2fb41a4ce06102b1ba364ac5917fddd78b24ebc0038f1eabc02476e211429410a39242069851
 AUX gnuradio-3.10.3.0-fix-gcc12.patch 1846 BLAKE2B eccb753a970b759509537ce221e0ef7e2f086573ea7feea735feca66c3204bbf01274f4c7f1b7ba5b87bec1bcfb5099464bd2e9ecd4dfb6762e9cf6b27243c82 SHA512 106348f3f1284529052ee9c6a80d3cfae8745b7312d1ae74c153357c895d1249addf2d64b712e17ed384ee9a0e22224ded8e14f2714acbe127162da38da798da
+AUX gnuradio-3.10.4.0-fix-blockinterleaving.patch 797 BLAKE2B 9a32f372f6a2600dda0f341404f922f51f349c88f285257f125b7c1c87db15a074471c44139fd27bb699e2ead3c81a527d24754e82b5910e57e132edb9b4cbad SHA512 343615c80b17fab076b9509d39c4fa0ac86c84d82093805b1bd488a7c8c95a935550c1acba30fc227f374b8842fec3b9d6cbf559eb67c2dd1abc82223708cc9d
 DIST gnuradio-3.10.3.0.tar.gz 4376594 BLAKE2B 676c16dda6c4b01ca922fe942e1572653c57dd8f6240ad74af2b10351470ad53ecc5c4a7347e04cb1c898388c48f561f7871c39140f77c50f9217963355793a6 SHA512 fe4cd2204257b65129f148bbdd6a1c192559b8824a131bd99cc2ac854e1880ee4fa07b702170452b3b6070df34d99db27ef0fe064c50e6e5a6335e61e38e6645
+DIST gnuradio-3.10.4.0.tar.gz 4392284 BLAKE2B 2a5766708534966bcea1e1ab57ae703b0b453278da5042c65ddcf5bda39dee084ee8f77d414e2c8ab3eae2397680f7591c456404a6cefc08b28a7d1f5d25534d SHA512 a8690016513df3928cb2f63eef190c7306bc3cc452dfeafab2e47b43aa1dd3f61515df49832e99530535f94deabfb614388a27212b09e1c816782f3fdd4915eb
 DIST gnuradio-3.8.5.0.tar.gz 3399660 BLAKE2B 19e3eecb40d7cdafe6fe551d3d36c0fcd34bb92ceb316537f4ebdc1c90d3c649daa1383f3642e2f64bba23026ed6638168fa77da0f21db03330b066e3108c880 SHA512 9b367c8afeb278b90e8ddd835e0ba301f07a53da26791e74913c812bde251daaa8f9611f21969938b215c9a110c9e69dfb6ec8b6d0db9c64013707c57596819a
-EBUILD gnuradio-3.10.3.0-r1.ebuild 6743 BLAKE2B b5368587fc591eb783b516db373df5b00805f2c62477573951c5af181b4db2ae8b52e713cc0d3721d27eb91dbd8b326a2cf1d38a1fb3750e03f1f033aed1ea02 SHA512 dd0cfb8040bbc524838890724aa645a33aaa669361186fbca1fd346eaf1763566c4d0bdcd91f57c7f554ca6a3fcc991cad8cc16c900ad7857a45c2a034d7fed1
 EBUILD gnuradio-3.10.3.0-r2.ebuild 6769 BLAKE2B 43e4db1645afc93336d8704617a117aeddebb81f148a6507071292a6e661a516d7b9eaefcb79dc4b262ae255c0dc2406e35438e0902455a99a4c384b7692d63a SHA512 ae472b26fc821c1dfcdc2426449dcb31c267c13227f1fce4a6da7746f70d4f3c300e7ad0f8a99460e57aca0b54b42ba68e90222398528b7bbcee4316be591f19
-EBUILD gnuradio-3.10.3.0.ebuild 6696 BLAKE2B 7b843a13b83b7c6dcf3f1b995a2eb5c735311b79384333e3c3af4116499ed73072790d50ee4df1ecebdd08c8217048d1755894aac13d9f20346010157c663801 SHA512 92ef8dbd0b5f38eb76c886c714339cb0edafa2032460a61e4f36ceb5bd2dd7f0fc30165bad753ea3fe859ab7c8d9f17f72be033b2a83e18f48ec5161d12e37e2
+EBUILD gnuradio-3.10.4.0.ebuild 6773 BLAKE2B 5ca6f874a6f8ffe76e315e027477d5aaf8fe341f71e4e1eafbfd5407745bfc3682d79b9be0cd93ad9e4f15a0f05ea1331572cdb8a447bdc8173e8c17c69313bb SHA512 037326b9fa1169314d4d105ea856a0e2b955bc174c81fa4b41c0c8324f58ac9f19790e4bc215c8854dabc564ee0e4f30bf9675679583dd1b027b1fd1ff1e494a
 EBUILD gnuradio-3.8.5.0-r1.ebuild 6178 BLAKE2B cdedec89f141e00730682bca719ed15ccfedcdd6847d6b0d60b4fd73bf53d7eba3f1635f98c04f218adbfb89ef2c1a02b41716ece6d8a863d14d516e1a0d5174 SHA512 30af79dbf1e33eb37004855d853c13f101ac78da953d164c1c68f3e22571f51bce3bf6b9f213383f31392bfccfafe9b588646e20620d870a8aa6700e02de15e7
 EBUILD gnuradio-3.8.5.0.ebuild 6124 BLAKE2B 6aec653673b0912b34fb895862d7ba0bfbdede475fc7018c0c9b743ee137a5febbfb49e2cf3e735588ff9781d91f2a093930f6206c3aeb982590049c88b918d4 SHA512 805292aa5b6f2c3f2fdb2a4dd4808bee9f1a74ce94017a5004b647332ba1343490271b5b5c3d1a379bd5a4adfa0529e9849baa71b0ae9acf1de79ade2f5c8632
 EBUILD gnuradio-9999.ebuild 6597 BLAKE2B 5c3bb1bb7084e8ec3fd2eb5fde5ae2fff20f7ba1dbeacb3c261f4cdbc0851adc6c18ff867cbf4a881a4499334ecbec11aa7842299b464ad2b151c69978639ae6 SHA512 798170a2002e48736ecd0b3f9ddd34ba1ae93a00c8c19718b60a6f5375c9cb684c67d3ef988c39402f2029857a0b662b824e16a56723ba93d18e814a2d2d8ed5
diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch b/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch
new file mode 100644
index 000000000000..b2c8270338c5
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch
@@ -0,0 +1,26 @@
+diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
+index 9d4e0f2..f6b8bc6 100644
+--- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
++++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
+@@ -12,7 +12,8 @@
+ #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H
+ 
+ #include <gnuradio/blocks/api.h>
+-
++#include <cstddef>
++#include <vector>
+ 
+ namespace gr {
+ namespace blocks {
+diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc
+index fc5873e..768ad9e 100644
+--- a/gr-blocks/lib/blockinterleaving.cc
++++ b/gr-blocks/lib/blockinterleaving.cc
+@@ -12,6 +12,7 @@
+ #include <spdlog/fmt/fmt.h>
+ #include <algorithm>
+ #include <numeric>
++#include <vector>
+ 
+ namespace gr {
+ namespace blocks {
diff --git a/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
deleted file mode 100644
index 7738fd356d4c..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake 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 ~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 known broken right now
-RESTRICT="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/log4cpp:=
-	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
-	$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
-	sci-libs/fftw:3.0=
-	sci-libs/mpir:=
-	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:=
-	)
-	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? (
-		$(python_gen_cond_dep 'net-wireless/soapysdr[${PYTHON_USEDEP}]')
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	trellis? ( dev-python/scipy )
-	uhd? (
-		$(python_gen_cond_dep '>=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:=
-		dev-libs/gmp:=
-		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}]')
-	$(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]')
-	dev-libs/spdlog
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-libs/mathjax
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
-	"${FILESDIR}/${PN}-3.10.3.0-fix-gcc12.patch" #858665
-)
-
-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() {
-	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_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_NETWORK="$(usex network)"
-		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DENABLE_GR_SOAPY="$(usex soapy)"
-		-DENABLE_GR_BLOCKTOOL=OFF		# for now
-		-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}/"*.desktop
-	#	doicon "${fd_path}/"*.png
-	#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() {
-	virtx cmake_src_test
-}
-
-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.3.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.10.4.0.ebuild
index efd3b42236ee..85f8829152e8 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.3.0-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} =~ "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~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"
@@ -50,6 +50,8 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/log4cpp:=
 	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
+	dev-libs/spdlog
+	dev-libs/libfmt:=
 	sci-libs/fftw:3.0=
 	sci-libs/mpir:=
 	sci-libs/volk:=
@@ -119,7 +121,6 @@ DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.2
 	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
 	$(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]')
-	dev-libs/spdlog
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
@@ -133,7 +134,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
-	"${FILESDIR}/${PN}-3.10.3.0-fix-gcc12.patch" #858665
+	"${FILESDIR}/${PN}-3.10.4.0-fix-blockinterleaving.patch"
 )
 
 src_prepare() {