commit: 2effdb97f7f844d1c75c97328b43b822bb157f1a
Author: Alexander Puck Neuwirth <apn-pucky <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 1 19:18:02 2025 +0000
Commit: Alexander Puck Neuwirth <apn-pucky <AT> gentoo <DOT> org>
CommitDate: Wed Oct 1 19:18:02 2025 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2effdb97
sci-physics/sherpa: fix gcc-15 bugs
Signed-off-by: Alexander Puck Neuwirth <apn-pucky <AT> gentoo.org>
.../sherpa/files/sherpa-3.0.1-cstdint.patch | 29 ++++++++++++++++
sci-physics/sherpa/files/sherpa-3.0.1-return.patch | 40 ++++++++++++++++++++++
.../{sherpa-9999.ebuild => sherpa-3.0.1-r1.ebuild} | 7 +++-
sci-physics/sherpa/sherpa-9999.ebuild | 2 +-
4 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/sci-physics/sherpa/files/sherpa-3.0.1-cstdint.patch
b/sci-physics/sherpa/files/sherpa-3.0.1-cstdint.patch
new file mode 100644
index 000000000..7eb40ecbe
--- /dev/null
+++ b/sci-physics/sherpa/files/sherpa-3.0.1-cstdint.patch
@@ -0,0 +1,29 @@
+From 72109dd489ddf6995453aa4af68ec85be8146e42 Mon Sep 17 00:00:00 2001
+From: Daniel Reichelt <[email protected]>
+Date: Wed, 21 May 2025 12:30:05 +0100
+Subject: [PATCH] Edit emitterutils.cpp to add missing header
+
+(cherry picked from commit 2bf656441fadb768b7fc40d539e4b9d534d4d9bb)
+
+2bf65644 Edit emitterutils.cpp to add missing header
+
+Co-authored-by: Andrii Verbytskyi <[email protected]>
+---
+ ATOOLS/YAML/emitterutils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ATOOLS/YAML/emitterutils.cpp b/ATOOLS/YAML/emitterutils.cpp
+index 09583f465c..9b417b5293 100644
+--- a/ATOOLS/YAML/emitterutils.cpp
++++ b/ATOOLS/YAML/emitterutils.cpp
+@@ -10,6 +10,7 @@
+ #include "stringsource.h"
+ #include "yaml-cpp/binary.h" // IWYU pragma: keep
+ #include "yaml-cpp/null.h"
++#include <cstdint>
+ #include "yaml-cpp/ostream_wrapper.h"
+
+ namespace SHERPA_YAML {
+--
+GitLab
+
diff --git a/sci-physics/sherpa/files/sherpa-3.0.1-return.patch
b/sci-physics/sherpa/files/sherpa-3.0.1-return.patch
new file mode 100644
index 000000000..892c411c3
--- /dev/null
+++ b/sci-physics/sherpa/files/sherpa-3.0.1-return.patch
@@ -0,0 +1,40 @@
+From 6de0bc2b225b12b5ae4e108fccf94db9c7ed2196 Mon Sep 17 00:00:00 2001
+From: Andrii Verbytskyi <[email protected]>
+Date: Fri, 27 Sep 2024 08:02:34 +0000
+Subject: [PATCH] Update Variations.C to prevent compiler warnings.
+
+---
+ ATOOLS/Phys/Variations.C | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ATOOLS/Phys/Variations.C b/ATOOLS/Phys/Variations.C
+index 235fae7c25..6849aa693a 100644
+--- a/ATOOLS/Phys/Variations.C
++++ b/ATOOLS/Phys/Variations.C
+@@ -134,6 +134,7 @@
Variations::GetVariationNameAt(Variations::Parameters_Vector::size_type i,
+ case Variations_Type::custom:
+ THROW(fatal_error, "Variations does not manage custom variations.");
+ }
++ return std::string();
+ }
+
+ size_t Variations::Size(Variations_Type t) const
+@@ -148,6 +149,7 @@ size_t Variations::Size(Variations_Type t) const
+ case Variations_Type::custom:
+ THROW(fatal_error, "Variations does not manage custom variations.");
+ }
++ return 0;
+ }
+
+ void Variations::ReadDefaults()
+@@ -812,6 +814,7 @@ namespace ATOOLS {
+ case Variations_Type::qcut: return o << "Qcut";
+ case Variations_Type::custom: return o << "Custom";
+ }
++ return o;
+ }
+
+ std::ostream& operator<<(std::ostream& s, const Variations& v)
+--
+GitLab
+
diff --git a/sci-physics/sherpa/sherpa-9999.ebuild
b/sci-physics/sherpa/sherpa-3.0.1-r1.ebuild
similarity index 93%
copy from sci-physics/sherpa/sherpa-9999.ebuild
copy to sci-physics/sherpa/sherpa-3.0.1-r1.ebuild
index 53cae07ee..b15ffcb9d 100644
--- a/sci-physics/sherpa/sherpa-9999.ebuild
+++ b/sci-physics/sherpa/sherpa-3.0.1-r1.ebuild
@@ -49,13 +49,18 @@ DEPEND="
root? ( sci-physics/root )
mpi? ( virtual/mpi[cxx,fortran] )
ufo? ( ${PYTHON_DEPS} )
- openloops? ( sci-physics/openloops[ppllj,pplljj] )
+ openloops? (
sci-physics/openloops[openloops_processes_ppllj,openloops_processes_pplljj] )
"
# blackhat? ( sci-physics/blackhat )
# gosam? ( sci-physics/gosam )
# recola? ( sci-physics/recola )
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-cstdint.patch"
+ "${FILESDIR}/${P}-return.patch"
+)
+
pkg_setup() {
use ufo && python-single-r1_pkg_setup
}
diff --git a/sci-physics/sherpa/sherpa-9999.ebuild
b/sci-physics/sherpa/sherpa-9999.ebuild
index 53cae07ee..0e11b77c1 100644
--- a/sci-physics/sherpa/sherpa-9999.ebuild
+++ b/sci-physics/sherpa/sherpa-9999.ebuild
@@ -49,7 +49,7 @@ DEPEND="
root? ( sci-physics/root )
mpi? ( virtual/mpi[cxx,fortran] )
ufo? ( ${PYTHON_DEPS} )
- openloops? ( sci-physics/openloops[ppllj,pplljj] )
+ openloops? (
sci-physics/openloops[openloops_processes_ppllj,openloops_processes_pplljj] )
"
# blackhat? ( sci-physics/blackhat )
# gosam? ( sci-physics/gosam )
