gentoo auto-resync : 16:08:2024 - 12:22:56

4 files changed, 37 insertions, 1 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 9e66db308ca9..38dbdb72c658 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 29d679d9aefc..18e1422266ea 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,10 +1,11 @@
 AUX lhapdf-6.3.0-egg.patch 749 BLAKE2B 6fbe8b3f9723fb45674d643b4825b0d73b6ddc3bb12502a3ff477cbb2733f7b522e9881129b65062e17b7c4d98f07567e89d895219c6dc4a3e942bd727e19ad9 SHA512 3355e16674c9c3caf51bfa5317819cd8411442d075cd35936b76e8e2926221a862437b6daf3f7ffd6030d5ae05cc83dfdada8fbab99a16e1afcdf567a9dcf15f
 AUX lhapdf-6.5.2-py.patch 391 BLAKE2B f5d904659a9163ec2e269e5c950c0610c9604dd936f307600641f68e5b22eb2e36fbc013b8d7432b158f61ca83ce2e8bcfb5202fff95a57e85ce0766299169f5 SHA512 c344b98d9f604cb530fa179b5ad4511edc7d1f56b5de3ec385d57a2823526b634bf8cf3cc0e51ca0b5dc868116fd5569bfb9e59d3dfbb1ffc377945570329b6a
+AUX lhapdf-6.5.4-include-cstdint.patch 1081 BLAKE2B 7e197ae51621a0984f74530240270fa845d35a739bd36264028f1bb975c2bfb04088c93c982d3866e847c64153517a181f95c3b518fd53e5f297a325d0a76e5f SHA512 204ab268e97600e7f2cfde1842d958cbfb8e77633c341a8cde304c846e59ffa6215cfaee7e1435a26d9dec8e0f30a8744fe30f6b866b301004e593a48fc58010
 DIST LHAPDF-6.3.0.tar.gz 770744 BLAKE2B 02b9fe3507b87c6f0c635ceb203304eb9b3ee8ac4d17c8b83578f8c05b78b17035b63b6d3d9a0b9fe3505a3daf8e9376fe25040b8826ea4976d2a717b1447eb9 SHA512 4a5aca6e2f06b59a44acc23ef76f1fae747f38e425803e7625cc68130da0c76d1e0d534b7b1867f09c86ee838d4f769d5097257170740db704c966d91c41f94b
 DIST LHAPDF-6.5.3.tar.gz 864918 BLAKE2B 2dd1b5b94523c0cadac2b63d3dcbc73c5d621463ec9a0e6736b40cb24f6f4da744cf74484b6a5cfb1cfc10054171858dfb3968b22da565747d9b0d00cb3f545c SHA512 444e1dd75c087b0618a65b0ebda0d06dac640d75e43de3a2e4cd5733dd2eaa6eeb6cb0aac437ee559b00b60a6b839a4125b3b26d398da81d52a3a97a7b875662
 DIST lhapdf-6.5.4.tar.gz 869707 BLAKE2B 9bd214f29ef0fb662095a045acf449bac60c2f12fb0e182c9c590ec51651f1c08d213a3f9280eda0711ec9a0d5cae620918f048c362838a9de8e69cc84f34798 SHA512 0e39f7f298e8c72eece9c3d19f471f48b3ee045cd54ecd318e0b2d60ada4f01a2151e6b2b5f27fccdf10c1043352a673492f8792be1964df7eafbe931282a83b
 EBUILD lhapdf-6.3.0-r2.ebuild 1714 BLAKE2B d800df7bdce87a40b72cf735ab6cb1c57f31385b38ee658478f08042316c1549712693a7ccc97cb119d6fc156bc4b55f89b20dd1484900843fa2e7801763a696 SHA512 b9660c65fe43c6ca0337c9faac28ae989f96845df722860f0e5c757128a98106867bd02cebbfb47b4461088c22367386d2e260104ff5c47a4b22ceb3f0b9b102
 EBUILD lhapdf-6.5.3-r1.ebuild 1168 BLAKE2B 659e092021b862c0bad7bb4b2c7cfb32103fdee72cb104e8c418269db1f829c31364765b473402af02e9465ba673522c9790771cfc526ddddb2d0f6355c4e1ef SHA512 7f3d34efe807d7820159fb1e9eb905fe968f5186da3b84b9da9662f67e2abda3b367f5adc949d73088c888a8127855c8acf9b1a39f5b8f2dcb41e89e3618c46f
-EBUILD lhapdf-6.5.4-r1.ebuild 1589 BLAKE2B 6a2efe38c713f0136c98362a0fc355292a5ed53398fb3fa3b4c2f8259cecf7a550a5193141261fb48c77b49e17d4b3869ca1cb75f8a3bbe207a4b1e153e91419 SHA512 5b674ce4d5b9115da0ec071becb2790faeb84f9e5e6751242f4d180deb8e00bb851753a968189c6fd6007a84d407e375ce16db86deff6cbc3ffb7f57ebee1fcd
+EBUILD lhapdf-6.5.4-r1.ebuild 1651 BLAKE2B 009ca7a9ead036af3cb3372329ea52f5e7f66824332b36de9922f1511d893649d8e50f537fba6c2a9a3c80a0cea904db4dea1de78fb187d49a79c647892038ea SHA512 585d8f58f3ba53ebaf6bc18dba9a2935d08f8be0536fe05b9235dacec47ac4bef773c3dd9616752df374dbeb68902a091e67774088ebf34bfa8173ef75e6b0c2
 EBUILD lhapdf-9999.ebuild 1528 BLAKE2B e16564e6b107acf1acf3bd8f7e7ae3d1b4dc29d73484583a88c27c964ca3bd11b57fa0259ed8b9f76a0770b584c406bc932fce8ff65f1c603a4112a61a7d716b SHA512 042708303d7bbd5bb5291d25785300e843e767badfc373c3dd867d529e43d404d1eab42d8235df7de016a273a8afe8db9f6f8090fee28c1dcd75aaed668d4f6e
 MISC metadata.xml 1234 BLAKE2B 059e7abca0dd0583b71bbc3b48c3125952c1642c4bad30d2776b2d6a5ea44eaee0ce6f1ac44e92a7c179b11d50bbe24ed2f947bf870ebee51c6c3d49a6a6b98e SHA512 2c94513c3e3287fe186b6212e48b9aa09fee0da5bee50887432a985b1466aa40b3d2086955ee0b9d03b70bdb615b72caa3e0c74ca1d0c32590f7ad1d31a45a0e
diff --git a/sci-physics/lhapdf/files/lhapdf-6.5.4-include-cstdint.patch b/sci-physics/lhapdf/files/lhapdf-6.5.4-include-cstdint.patch
new file mode 100644
index 000000000000..2afed53f210b
--- /dev/null
+++ b/sci-physics/lhapdf/files/lhapdf-6.5.4-include-cstdint.patch
@@ -0,0 +1,31 @@
+https://gitlab.com/hepcedar/lhapdf/merge_requests/96
+
+From: Christopher Fore <csfore@posteo.net>
+Date: Wed, 14 Aug 2024 20:38:03 -0400
+Subject: [PATCH] yamlcpp: Explicitly include <cstdint>
+
+GCC 15 will no longer include <cstdint> by default, resulting in build
+failures in projects that do not explicitly include it.
+
+Error:
+emitterutils.cpp:221:11: error: 'uint16_t' was not declared in this scope
+  221 | std::pair<uint16_t, uint16_t> EncodeUTF16SurrogatePair(int codePoint) {
+      |           ^~~~~~~~
+emitterutils.cpp:13:1:
+note: 'uint16_t' is defined in header '<cstdint>';
+this is probably fixable by adding '#include <cstdint>'
+   12 | #include "yaml-cpp/null.h"
+  +++ |+#include <cstdint>
+   13 | #include "yaml-cpp/ostream_wrapper.h"
+
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+See-also: https://bugs.gentoo.org/937778
+Signed-off-by: Christopher Fore <csfore@posteo.net>
+--- a/src/yamlcpp/emitterutils.cpp
++++ b/src/yamlcpp/emitterutils.cpp
+@@ -1,4 +1,5 @@
+ #include <algorithm>
++#include <cstdint>
+ #include <iomanip>
+ #include <sstream>
+ 
diff --git a/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild b/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild
index 7e3801a3d0e3..f5d5eb09c594 100644
--- a/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
 	')
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.5.4-include-cstdint.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }