gentoo auto-resync : 23:01:2025 - 06:45:02

4 files changed, 42 insertions, 10 deletions

diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 02720e875a49..43288bf0799e 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,9 +1,10 @@
+AUX 7570.patch 1549 BLAKE2B e7e9f0f745465549046eec50806fedf8f8b4a5850f203893abcf21438e9a6567b1d796f6f84aadbb371f858d806c9db313e7b90e4a88a48eed522487d7325d2b SHA512 8a8cfa32dc707e4bd293d5e818029a029c6eb64ef7e9a08493d86a40c84169e55bfd303adecf2de1fa2cbf3a10eb17019ba4d2062084821f55b1c73449549154
 AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba
 AUX gnuradio-3.10.11.0-boost-1.87.patch 6533 BLAKE2B dea2f7d662c2c7119234f6cddd1405bd2b942257bea75110c3c2464b5f5137887fab7e2ec8cc2851770af44f2bcd44a8499ba3f6a9ad3f6dd21311ec8ccc9904 SHA512 1a7656d7310e59cd8fd8259920bbcffb443948bbe8193bddc65610b1e4418ec3ea806d0fb21b565aa9a54ec8302f9d2e408c07ba912a6fe910a4c51ab416e775
 AUX gnuradio-3.10.9.2-libfmt-11.patch 1624 BLAKE2B a50f5db97a276ec1c1fbaa28338db377de8659ce8b1f19b271cb79672f807e152cec57f83b9e32ff39492e11b4b6e655a69cd77a5e925f0b2b598d66b2ad2381 SHA512 50398cbeba0bad9908d3f96795833a7ca683e169634ef4a89e1502c304c4a695be44538e99236b691c2e4ea105604e882048b0500579031a9516fbeba4984173
 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 7203 BLAKE2B 8865037aea821433bdf7f71497007f7b9092732fba5180b85d64774ba53503833264020473b5bb3f74ea9da7e6bdaa195b21ad9e3e48b6922875f7830a6688c6 SHA512 800484b01de328e97525befb78717450982acd488bf05f0b3ee7b1d68a5f6a8133becedc0c659d7126978d97847f83ba58fe61cf74e32407888d459147b2bbfd
+EBUILD gnuradio-3.10.11.0.ebuild 7074 BLAKE2B 7cfc3d8071da0819ce2cf9d4c779938808e013536fe5de8f0654f27c6b1e84fccf816ae2b827f49e6b44aafeda54bd27f8acf6e375bf54d8b0b15ab624693882 SHA512 689c4e862b5ad24c1a0d01872b9fac9431e3e346c8ec6c8101ec8697f2113317696bfea3695f158032207c3c7aadb4f7c9f1fd9a6095bcf89c8cb484c4cec31e
 EBUILD gnuradio-3.10.9.2-r6.ebuild 7168 BLAKE2B 6d7c121fd4f1bb6c614ea78417436d58cf03f64c39b7f3a776edc72cf81d2b775eb813821f5c5cc4ece13dce4f6db847a6ae004b03727ff9d52f15e0184ca3d2 SHA512 8162308fe3edee23d865fb4c0a3c507ae64a4407fa23b2adce5e8ea8a0a024feaa5639692e26470245536378bf440fb7b1a284080bed32aa69bfea60fbd8d3d6
-EBUILD gnuradio-9999.ebuild 7142 BLAKE2B 7d745da9a915959565a1ba95e34d778e3b2b2b3b8d488ed953e5a2a18bcec639aef9a27783dbb501012b879b5bdd56aa0369daa35c4efb74bf482b857cf07bcb SHA512 0c952b388e2a989f1ab2e7b6be8b413807c8e881bb443070e6e7ebc345f7a0540b600a5a61f90f9400fc4a97262426e3c07a5a1a527632260fb79913c00e753a
+EBUILD gnuradio-9999.ebuild 6987 BLAKE2B c70ae3d3f797cba882c6d1d5009c5c29935852492a437033d01d7baaca3ad00d6a022c9656ebef51bcfdc92d685557d4c806ab80ae3b692550c9c39198333d29 SHA512 1a1c530447c089e067a15e6476db9a9f911609f8a956f7c1d3ad5a6c38d2eac6f3ee56b048e9af5bd026acdf54c1175e6b0256542094050bdf64444bbb62ee2b
 MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/files/7570.patch b/net-wireless/gnuradio/files/7570.patch
new file mode 100644
index 000000000000..1adefd1674bb
--- /dev/null
+++ b/net-wireless/gnuradio/files/7570.patch
@@ -0,0 +1,34 @@
+From dc208e8c91a772ea3da462efd16d912cef44316c Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Fri, 30 Aug 2024 11:19:19 -0400
+Subject: [PATCH] digital: Fix NumPy 2 compatibility
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-digital/python/digital/qa_correlate_access_code_XX_ts.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py b/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py
+index c0fdc9dc246..8c242f2f792 100644
+--- a/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py
++++ b/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py
+@@ -12,6 +12,7 @@
+ from gnuradio import gr, gr_unittest, digital, blocks
+ import pmt
+ import numpy
++import struct
+ 
+ default_access_code = '\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC'
+ 
+@@ -74,8 +75,9 @@ def _variable_payload_t(self, payload_len=2**15 + 3):
+         # header contains packet length, twice (bit-swapped)
+         header = numpy.array([(payload_len & 0xFF00) >> 8, payload_len & 0xFF] * 2, dtype=numpy.uint8)
+         # make sure we've built the length header correctly
+-        self.assertEqual(header[0] * 256 + header[1], header[2] * 256 + header[3])
+-        self.assertEqual(header[0] * 256 + header[1], len(payload))
++        length1, length2 = struct.unpack(">HH", header)
++        self.assertEqual(length1, length2)
++        self.assertEqual(length1, len(payload))
+ 
+         packet = numpy.concatenate((header, payload))
+         pad = (0,) * PADDING_LEN
diff --git a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild
index 1afef5f54a9e..37cadf28ce7e 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -135,6 +135,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.10.11.0-boost-1.87.patch
+	"${FILESDIR}"/7570.patch
 )
 
 src_prepare() {
@@ -231,9 +232,7 @@ src_install() {
 
 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
+	virtx cmake_src_test -E 'metainfo_test' --output-on-failure
 }
 
 pkg_postinst() {
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 27cb13c82bc0..a7011ffe6be8 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -227,9 +227,7 @@ src_install() {
 
 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
+	virtx cmake_src_test -E 'metainfo_test' --output-on-failure
 }
 
 pkg_postinst() {