commit: 870219dd89909df7f39434620db4646d965673dc Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Tue Nov 25 20:48:25 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Tue Nov 25 20:48:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=870219dd
sci-physics/rivet: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> sci-physics/rivet/files/rivet-3.1.10-ref_cin.patch | 28 ---------- sci-physics/rivet/files/rivet-3.1.10-uint16.patch | 22 -------- .../rivet/files/rivet-3.1.10-versions.patch | 65 ---------------------- 3 files changed, 115 deletions(-) diff --git a/sci-physics/rivet/files/rivet-3.1.10-ref_cin.patch b/sci-physics/rivet/files/rivet-3.1.10-ref_cin.patch deleted file mode 100644 index 1c93e92d48b4..000000000000 --- a/sci-physics/rivet/files/rivet-3.1.10-ref_cin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 668d391c6b26da4684534bafe1fec3bff29a58ff Mon Sep 17 00:00:00 2001 -From: Alexander Puck Neuwirth <[email protected]> -Date: Fri, 12 Apr 2024 14:25:06 +0200 -Subject: [PATCH] Wrap std::cin in std::ref - ---- - src/Core/Run.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Core/Run.cc b/src/Core/Run.cc -index 83c5d719b6..4d643fac92 100644 ---- a/src/Core/Run.cc -+++ b/src/Core/Run.cc -@@ -82,9 +82,9 @@ namespace Rivet { - // Turn off the buffering to make IO faster and make ungetc work on cin - std::basic_ios<char>::sync_with_stdio(false); - #ifdef HAVE_LIBZ -- _istr = make_shared<zstr::istream>(std::cin); -+ _istr = make_shared<zstr::istream>(std::ref(std::cin)); - #else -- _istr = make_shared<std::istream>(std::cin); -+ _istr = make_shared<std::istream>(std::ref(std::cin)); - #endif - // Use standard HepMC3 deduction on stream. For HepMC3 < 3.2.0 the function is implemented in Rivet - _hepmcReader = RivetHepMC::deduce_reader(*_istr); --- -GitLab - diff --git a/sci-physics/rivet/files/rivet-3.1.10-uint16.patch b/sci-physics/rivet/files/rivet-3.1.10-uint16.patch deleted file mode 100644 index 444735288f1c..000000000000 --- a/sci-physics/rivet/files/rivet-3.1.10-uint16.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b52b246eadeb92ca0f1301061f8c757e1bdc377c Mon Sep 17 00:00:00 2001 -From: Alexander Puck Neuwirth <[email protected]> -Date: Wed, 11 Dec 2024 18:35:50 +0000 -Subject: [PATCH] yamlcpp: Explicitly include <cstdint> - ---- - src/Core/yamlcpp/emitterutils.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Core/yamlcpp/emitterutils.cpp b/src/Core/yamlcpp/emitterutils.cpp -index c033427e17..4943267206 100644 ---- a/src/Core/yamlcpp/emitterutils.cpp -+++ b/src/Core/yamlcpp/emitterutils.cpp -@@ -1,4 +1,5 @@ - #include <algorithm> -+#include <cstdint> - #include <iomanip> - #include <sstream> - --- -GitLab - diff --git a/sci-physics/rivet/files/rivet-3.1.10-versions.patch b/sci-physics/rivet/files/rivet-3.1.10-versions.patch deleted file mode 100644 index 394a7dde9885..000000000000 --- a/sci-physics/rivet/files/rivet-3.1.10-versions.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/configure.ac 2024-11-28 14:14:00.608290493 +0100 -+++ b/configure.ac 2024-11-28 14:19:41.434877928 +0100 -@@ -21,9 +21,9 @@ - AC_SUBST(LT_OBJDIR) - - ## Compute version code --let rivet_major=[`echo "$PACKAGE_VERSION" | cut -d. -f1 | sed -e 's/^0*//'`] --let rivet_minor=[`echo "$PACKAGE_VERSION" | cut -d. -f2 | sed -e 's/^0*//'`] --let rivet_micro=[`echo "$PACKAGE_VERSION" | cut -d. -f3 | sed -e 's/^0*//' | sed -e 's/[^0-9].*//g'`] -+let rivet_major=[`echo "$PACKAGE_VERSION" | cut -d. -f1 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] -+let rivet_minor=[`echo "$PACKAGE_VERSION" | cut -d. -f2 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] -+let rivet_micro=[`echo "$PACKAGE_VERSION" | cut -d. -f3 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] - let PACKAGE_VERSION_CODE=10000*$rivet_major+100*$rivet_minor+$rivet_micro - - ## Package-specific #defines -@@ -79,9 +79,9 @@ - AC_MSG_CHECKING([YODA version using yoda-config]) - YODA_VERSION=`$YODACONFIG --version` - AC_MSG_RESULT([$YODA_VERSION]) -- YODA_VERSION1=[`echo $YODA_VERSION | cut -d. -f1 | sed -e 's/^0*//' | sed -e 's/\([0-9]*\).*/\1/g'`] -- YODA_VERSION2=[`echo $YODA_VERSION | cut -d. -f2 | sed -e 's/^0*//' | sed -e 's/\([0-9]*\).*/\1/g'`] -- YODA_VERSION3=[`echo $YODA_VERSION | cut -d. -f3 | sed -e 's/^0*//' | sed -e 's/\([0-9]*\).*/\1/g'`] -+ YODA_VERSION1=[`echo $YODA_VERSION | cut -d. -f1 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] -+ YODA_VERSION2=[`echo $YODA_VERSION | cut -d. -f2 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] -+ YODA_VERSION3=[`echo $YODA_VERSION | cut -d. -f3 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] - let YODA_VERSION_INT=YODA_VERSION1*10000+YODA_VERSION2*100+YODA_VERSION3 - if test $YODA_VERSION_INT -lt 10800; then - AC_MSG_ERROR([YODA version isn't sufficient: at least version 1.8.0 required]) -@@ -154,8 +154,8 @@ - fi - hepmc_version=`./conftest` - if test x$hepmc_version != x; then -- let hepmc_major=[`echo "$hepmc_version" | cut -d. -f1 | sed -e 's/^0*//'`] -- let hepmc_minor=[`echo "$hepmc_version" | cut -d. -f2 | sed -e 's/^0*//'`] -+ let hepmc_major=[`echo "$hepmc_version" | cut -d. -f1 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] -+ let hepmc_minor=[`echo "$hepmc_version" | cut -d. -f2 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] - fi - rm -f conftest conftest.cpp conftest.cc conftest.C - HEPMC_VERSION=$hepmc_major$hepmc_minor -@@ -184,9 +184,9 @@ - fi - hepmc_version=`./conftest` - if test x$hepmc_version != x; then -- let hepmc_major=[`echo "$hepmc_version" | cut -d. -f1 | sed -e 's/^0*//'`] -- let hepmc_minor=[`echo "$hepmc_version" | cut -d. -f2 | sed -e 's/^0*//'`] -- let hepmc_third=[`echo "$hepmc_version" | cut -d. -f3 | sed -e 's/^0*//'`] -+ let hepmc_major=[`echo "$hepmc_version" | cut -d. -f1 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] -+ let hepmc_minor=[`echo "$hepmc_version" | cut -d. -f2 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] -+ let hepmc_third=[`echo "$hepmc_version" | cut -d. -f3 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] - fi - rm -f conftest conftest.cpp conftest.cc conftest.C - HEPMC_VERSION=$hepmc_major$hepmc_minor$hepmc_third -@@ -219,9 +219,9 @@ - AC_MSG_CHECKING([FastJet version using fastjet-config]) - fjversion=`$FJCONFIG --version` - AC_MSG_RESULT([$fjversion]) -- fjmajor=$(echo $fjversion | cut -f1 -d.) -- fjminor=$(echo $fjversion | cut -f2 -d.) -- fjmicro=$(echo $fjversion | cut -f3 -d.) -+ fjmajor=$(echo $fjversion | cut -f1 -d. | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/') -+ fjminor=$(echo $fjversion | cut -f2 -d. | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/') -+ fjmicro=$(echo $fjversion | cut -f3 -d. | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/') - if test "$fjmajor" -lt 3 -o "$fjminor" -lt 2 ; then #< only works for v3.x - AC_MSG_ERROR([FastJet version 3.2.0 or later is required]) - fi
