gentoo auto-resync : 04:01:2023 - 12:06:28

3 files changed, 102 insertions, 2 deletions

diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index da5e85cdbe9f..eeb5e3da387b 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,4 +1,5 @@
 AUX uhd-4.1.0.5-hidden-visibility-tests.patch 870 BLAKE2B 97c7e1c477d57f32cd1ed8a4c96de5761f422719783c1da247c3d00a1ddf51087484b95daa57fd3a4a417c6227a5fe2de2d7d3637575a7a5cab83a243ae270bf SHA512 017ce990463d332a5a67853dcf6362063935b10af67083c88385ef5659694e3af765349b89663b9e0f95ccd11da43f690feddbf71faa7ddcc109344c41c9dd6c
+AUX uhd-4.3.0.0-gcc-13.patch 2418 BLAKE2B 5abfff140f5eb95a77103f48468b0a976cac3d2f86742f6b22d841fee2276bead6fe94b7412ca6221e4a4409b3dc6d1ae15457813cad89e13e0c300d0ce53189 SHA512 ab1f7b9c44bc835355a2981e110a5e9fef49587f3d75f0b12ee5bec784300797f2b19c60c44a6b5da611b26fd3c2c743e343aa577474c19de896dad75c2f5c84
 DIST EttusResearch-UHD-4.1.0.5.tar.gz 37975618 BLAKE2B ff5b38be7ef7088168f2bf8908e59e74d2f492a860dac6b7fef48abd5d25840435a57b3ef980ceb7416efd1d3520a3f83bace3bc5bca5caaecc14088e9609fcd SHA512 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af
 DIST EttusResearch-UHD-4.2.0.0.tar.gz 38124395 BLAKE2B cbb149e6f6aaff628e40463b37b3e52ee758acaaf8e86f85586a70fb4d9744408fb2c807a491b91de64a8cb23adb566722eece99eb8bd844e704d5412372b2ec SHA512 a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c
 DIST EttusResearch-UHD-4.3.0.0.tar.gz 38204958 BLAKE2B 64b30d97611a96ed15b8a4bbe91065301d7b8b20e61b69e2dafd93088dcd7780c9c897462c482dff548b9b52081fa2832b09ff4a682208fed0a9a86aa3a3d957 SHA512 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc
@@ -7,5 +8,5 @@ DIST uhd-images_4.2.0.0.tar.xz 127034940 BLAKE2B ab186ad83fe607c745a56862363a8cc
 DIST uhd-images_4.3.0.0.tar.xz 126848556 BLAKE2B d352b0cbb5e23b0c16c540be756f23342aa63b14679bf19ae940cfd9f686ef2c7830b7feb0b3dc53aaec3cca502e8ab1ab9b8754c95edb116fd34f03ac378843 SHA512 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7
 EBUILD uhd-4.1.0.5.ebuild 3583 BLAKE2B a8ae2e10fd64441696392d078dd9a486b8c1c928405e1cca2fa9d6ea5d6f6444bb7fae03b5ecd5e3ccf5d78432ee09442419bb7c0c4e6ec9f9376c30a9ab3394 SHA512 56c1049a80c218b3a942c3c324973a047ae5e65307b60685c4e53c883a78af247cc41f36d3818f98551fc06cb45a9fa4947397620fe2c625b2b475215fd110ea
 EBUILD uhd-4.2.0.0.ebuild 3707 BLAKE2B 39de03dc19404fd3e5526512006140bcfc54ad02edc603c2cb94b9b1b65f9858afe5afec70f7f0ef276f79083e1c5fb4b0f197e31bceffae107a8951b4b2b97e SHA512 97c3b957c3be6a8118c3ed1e74448ca6b0a0086a0ca766f43fc59cae3b49b762f659e1a9ad556cee71790a413b1dae39ccaefa6dd482a5dba80b959be77a50bd
-EBUILD uhd-4.3.0.0.ebuild 3707 BLAKE2B 39de03dc19404fd3e5526512006140bcfc54ad02edc603c2cb94b9b1b65f9858afe5afec70f7f0ef276f79083e1c5fb4b0f197e31bceffae107a8951b4b2b97e SHA512 97c3b957c3be6a8118c3ed1e74448ca6b0a0086a0ca766f43fc59cae3b49b762f659e1a9ad556cee71790a413b1dae39ccaefa6dd482a5dba80b959be77a50bd
+EBUILD uhd-4.3.0.0.ebuild 3762 BLAKE2B 13f671f1e801f3ae2a3b42fc2b3ef0033ad49f3c4a3bfa1c0c7a0a0c4a51957bd5af9f7a158f430bb9eca2d565957c92d6eb17d2b7af98ad253f3aaa44d8cd82 SHA512 1410e6e611d9dbd022c30a08b18b67a8d88c71466fb75b957b0bc0a55698aae049fe66fa18a548696c7d47697159866c8471ef5c3a1f65bc8519c338ec95d2a8
 MISC metadata.xml 1160 BLAKE2B 0bcd5e0ea7008a4847cd0ec47e900eaad894c1b37f9917197ed408edb6525f3526fce2086fa318d66f9fe3a355a8a3d5b92dcdffd2518439fb4813f9cdec5b8a SHA512 b53864ec397c266c6c914c9d7bf44eb30187585fac7d5c871b54e91e7909186c756bcd49850343a28093e77148b506bbab5583834a0a125cefe9280c2e324c4d
diff --git a/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch b/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch
new file mode 100644
index 000000000000..8559ecb8331f
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch
@@ -0,0 +1,95 @@
+https://github.com/EttusResearch/uhd/pull/652
+
+From 48a05bf621a056af7764437760ad5d64684ce7d2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 3 Jan 2023 23:04:52 +0000
+Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> is no longer transitively included.
+
+Explicitly include <cstdint> for uint8_t.
+
+```
+/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type
+   43 | static const uint32_t DEFAULT_NOC_ID  = 0xFFFFFFFF;
+      |              ^~~~~~~~
+/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
+  +++ |+#include <cstdint>
+    1 | //
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/include/uhd/cal/database.hpp
++++ b/include/uhd/cal/database.hpp
+@@ -8,6 +8,7 @@
+ 
+ #include <uhd/config.hpp>
+ #include <stddef.h>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include <functional>
+--- a/include/uhd/rfnoc/defaults.hpp
++++ b/include/uhd/rfnoc/defaults.hpp
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ namespace uhd { namespace rfnoc {
+--- a/include/uhd/types/eeprom.hpp
++++ b/include/uhd/types/eeprom.hpp
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <map>
+ #include <string>
+ #include <vector>
+--- a/include/uhd/usrp/zbx_tune_map_item.hpp
++++ b/include/uhd/usrp/zbx_tune_map_item.hpp
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ #include <uhd/config.hpp>
++#include <cstdint>
+ #include <cstring>
+ #include <string>
+ #include <vector>
+--- a/lib/usrp/dboard/magnesium/magnesium_constants.hpp
++++ b/lib/usrp/dboard/magnesium/magnesium_constants.hpp
+@@ -9,6 +9,7 @@
+ 
+ #include <uhd/types/ranges.hpp>
+ #include <cstddef>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/lib/usrp/dboard/rhodium/rhodium_constants.hpp
++++ b/lib/usrp/dboard/rhodium/rhodium_constants.hpp
+@@ -9,6 +9,7 @@
+ 
+ #include <array>
+ #include <cstddef>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/lib/utils/serial_number.cpp
++++ b/lib/utils/serial_number.cpp
+@@ -5,6 +5,7 @@
+ //
+ 
+ #include <uhdlib/utils/serial_number.hpp>
++#include <cstdint>
+ #include <stdexcept>
+ #include <string>
+ 
+-- 
+2.39.0
+
diff --git a/net-wireless/uhd/uhd-4.3.0.0.ebuild b/net-wireless/uhd/uhd-4.3.0.0.ebuild
index 43bc62d7590a..8e1f3f3cd9ac 100644
--- a/net-wireless/uhd/uhd-4.3.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,6 +50,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P}/host"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0.0-gcc-13.patch
+)
+
 src_unpack() {
 	default
 	mv "uhd-images_${PV}" images || die