gentoo auto-resync : 01:04:2025 - 01:33:27

8 files changed, 227 insertions, 15 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index c264a9067f56..2193b9087131 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
index 6dde0e039ca5..12f51c4740b5 100644
--- a/sci-physics/rivet/Manifest
+++ b/sci-physics/rivet/Manifest
@@ -2,11 +2,16 @@ AUX rivet-3.1.10-ref_cin.patch 1050 BLAKE2B 81c4d7628977d5a9ea22b4ce65bc5dc26db3
 AUX rivet-3.1.10-versions.patch 3868 BLAKE2B 673d94a64e20104c9605a127a7c53483f43479960783b784eaccedd9a297006f9bcbd6ff2fbec6f8cd963648e06a77409722b9d54b769231398191cbcf27b0c9 SHA512 afb45897acc503ecc410616c5237f1b9b171863a34d57c854f43176bbd14c5a0c03be55eea75730fa76a7b27ece5818be6743e0679ee1e9e5c97a77d6d65cdeb
 AUX rivet-3.1.6-binreloc.patch 626 BLAKE2B 2d3d14b334e3dd826534401ef2613643da0302f2e29148173aba08f46454169956c4f5d53ad6fff9e29f35bed97ba9a697ddc8fd34a22677cab3c30632e48175 SHA512 699bc0209e01120266436421d5f4f5dd97c81da7f107394654a4a42dd141545de63e9143de96da2d4d668e1ae1d3165d290eec48d567a872553d494694aa0229
 AUX rivet-3.1.9-pythontests.patch 508 BLAKE2B 76f758a47643efbe2b997b184c8af7d86055456d84e8bcbdcd67f0836d631f3e38d9b7c53c69133c17ff0f15ae212710e253fa68f794583a321b541baa58a331 SHA512 98fb734113b4639ead244ae044df2ddd85d62247a669f1e3e23ec35b63eb7db56e7999fb4d5144ac313eb6f5bd71e25ca31338f51c0256a4290af8e74cff9a78
+AUX rivet-4.1.0-lib64.patch 925 BLAKE2B 9b79b486b29202a00b7dcf3130453f028710de7dc07bfdd288a3f6a2774c206cbcf4f4e6ca7eb24865e6e884c7b2e0cc0e5b3c0b1083339d69943bfcf6816e5a SHA512 989425b8e2322108d4ea3f39f62972f9f36d8a2f30c9dffac3aeff8381511ffc3bb8685f3b351be72a98c6e87e6ae5a0a93b353160ec3ef061dd41b8272059a0
+AUX rivet-4.1.0-testanalysis.patch 911 BLAKE2B 64313d23ae52ef4e41df073dcf72b9b327e162c35fdc792299465b3a644738fe9bf42ba3478a6e9e850d2fc8b953ff3e8e8a463e4102c9426a9c6bffd85e3df6 SHA512 1511d45670b773df5a941ce30f2bf82a071f253055f328b9ae08e1e4ecca7ba54d0f1515a6d6c255cc64a0a054d167fda5a7fd75f95cb60161ea496e2c46ae69
+AUX rivet-4.1.0-testsyoda.patch 988 BLAKE2B 7a4c90dfb767f093d8b1dfe48530a5bb12899cb8dad16f2bf939e1217ae25061854f85961fe28c3085b944cf5994303a8c0ff32b83e839f649aabb65a050c056 SHA512 aa62698c3796e640d0a2be39c8a391a52a25304cda9bbd3498e8afed1a27c345ab2b6d8e334f02aec8394ca2d72c047ec9dcfcf7a82a39006986f91b3d156718
 DIST rivet-3.1.10.tar.gz 36327949 BLAKE2B 76d8ed8b3ee0eda2f7f03b4e423c46f49d39006a4ab0b66622ab2b2a7817f91f1f7bc648ecfb2e9d2d73da1619069c25fe9078c9b04a54cce8e1a71c33dc6b1a SHA512 9a0a3516686b82c7cf667bab230229553e9e49e5656d763046a86baa1f2d3fdb3167e53540533ebe5da532e71f15140ab8dd16de4075fd76e634e0c6919155e4
 DIST rivet-3.1.9.tar.gz 37599489 BLAKE2B a470254b8d4303f5738ca9c4ff0061a000d06e37ee805d909dfc709f14e5ebc8958739912f9b9bbf80bb38e79f4b8df057d7ac59c6924fddd56918102243aeed SHA512 21c1ca6eda7ac7d0394875cd8b972d3e65df1bf0e773d2094bab1997c6fab67381d6202aef8024eaa363c03b2345bae95d54dca1ce38c2499ddc24a7e7f93bdc
 DIST rivet-4.0.2.tar.gz 39847467 BLAKE2B b7c1c03ea9503a6da536ca15a0ff961768e3d7d4140bb1ba19c20ba75b55592609bf2c99aece37436c1f4bdf443bd69ab5b59f86fec972ae5b8275359747b9e4 SHA512 0e383e015c425a9e8d734a9ef624222b8c025cd48cb174075b60f7f5a818213ea9f4352445c36bdc574f80722cf4ae3dbe083af89a1f9083fa3632bdf94b860a
+DIST rivet-4.1.0.tar.gz 40969269 BLAKE2B 6f5b4a4f9ee902e4564822179e8926831b3308259615f33ceeec3a78e6a6cce2eb851de11a58a3192fce11504ef5b34d42d2f127a71722051121e35f2281d332 SHA512 07c30283e102b618c0abc5006a8099ce1ecea99f594d2a5837d3c0c6e4e2353ac788607a31a2a76e9f91f14c5f94f2c7fbf070d881f65b90410e2e13f566ed15
 EBUILD rivet-3.1.10-r1.ebuild 2919 BLAKE2B 8f8f261ac09fb6fd6bb843abbbfc4bb01a270b75e837784eb15b24fc4dd18dcae91f8be93ba7ff4ba8f68fac92ccda32decb2f3447981b987b5dc9f67432c5d1 SHA512 e70fd47eb53180aed25d8dc7dfc2698630e1bbf6177d7ca91d19052ad0607ecee7a2b6ceb29b271ae8b49f9e179e76c22629f65aaf02e5045a6d01887eb5bbe7
 EBUILD rivet-3.1.9.ebuild 2900 BLAKE2B a47c46505beff3595c236976923b74ce795dbb7ac7ff140d74f1c8f5d20978b5406be8ddea8b44983ee0ab9a2cfebb600b35632644b7cdc3dd82d3692631c5fd SHA512 3039bcaced8628e69d396d6bd9b59fd8fe345ce0abe12f173959f081d92aa9a400ff93b608a8b3ed5c65817fd7a797e28cb2c3bad0a4ee2f29a79838ec2fe7ad
 EBUILD rivet-4.0.2.ebuild 2625 BLAKE2B 4bcf555145ad132bb6336b38ae181632534a242d3574ac162c5e4d587a2e08a212813a44bd9d611ce44f1272ff8169a97ba4be3994c67f605ce18302927d2ea7 SHA512 670373f2aceb66a01745d840fe73ea2ee55a286f1b90cfd2547b6c887472d2f62f834ed4c5da1e05213d4f000c062305b48e35226294e349e762ca8f0a353b46
-EBUILD rivet-9999.ebuild 2603 BLAKE2B 246db2aad29a60f4ebfdfb48db0186b8993879c08ce56bb43cc2e47cfcd049038ed9efa6fd97999a56d19d8cb7e066fc43d5f0638f5487c08c1790c3e5b43eeb SHA512 ac741c9de66e5097d37a29010eb1230d1228894f7df4f819a0e9a14a0a17cb2c48d8ef94dc838a4cc5bea517bcdd17440528ca72863985f6491d91a20e7fe606
-MISC metadata.xml 1352 BLAKE2B 7e65bb3541d6cb8169f973d266a621f4b0779d72d2c477e8f0d93db0abd83431d45d005460d7dc5bcb2b86fef37323d5fccc5a7d6c0df8ff3594ba47562f5900 SHA512 88576f26d29c4166347553078da720464c3734eafbc0cdc3ea27f639e6fe7096efc915b4e24829dda923528318353798f4147792789a080cfe552e80575a8693
+EBUILD rivet-4.1.0.ebuild 2925 BLAKE2B a9cd86d2e57c2a1fe0d2e47407e30c2f0b7f9d1253d8f35ef1267c74768aac1ba70898c162354475c50205a534c0a153f710eaed16313474419a64252d94dd62 SHA512 f1ad6cc2604d3bfb8db3902327efaf374541ad5abca1c7cc3196032c34e695ad5d1e8561297176bc7ec5c61a14c3a69ef262d659dbb21c885b1d3816cf0d92a9
+EBUILD rivet-9999.ebuild 2619 BLAKE2B 7415d743efef39b4751d9bb7d12c83469b5110ec11232220cce8c15e001750b39c801b579ff408620ad5a559d9fc33cb08185eb5e2caf98cecc6a5675f1f372c SHA512 efc4b5b337529e6ec30a434b2f0ddb5f2466328902ff85fc1f76330c8a67ca517ebf405396c578279cbb1751cf6a9bd9580acc5ed1d66e7d3392432361d2ec9f
+MISC metadata.xml 1476 BLAKE2B 587314a9813d12353ad46c03a698aec194c48fe6d2440632d8108c328b2bb20587a6dd20279c986670a7f5504e5a7f6b8500a173732de6c8735d1d719495b23f SHA512 2d6acaf622c39157fc0ca474610d9fafef34322a9b0bbc68eeeb2a32f0968d2322adb4059d24be08b0ca7959b0cd160a4f7f78a8ad873e49b1f866fd9252600c
diff --git a/sci-physics/rivet/files/rivet-4.1.0-lib64.patch b/sci-physics/rivet/files/rivet-4.1.0-lib64.patch
new file mode 100644
index 000000000000..ef929985df34
--- /dev/null
+++ b/sci-physics/rivet/files/rivet-4.1.0-lib64.patch
@@ -0,0 +1,34 @@
+diff --git c/src/Tools/binreloc.c w/src/Tools/binreloc.c
+index 0e11d570e..937e0d250 100644
+--- c/src/Tools/binreloc.c
++++ w/src/Tools/binreloc.c
+@@ -28,7 +28,19 @@
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-
++const char *br_get_lib_suffix(const char *libdir) {
++    size_t len = strlen(libdir);
++    
++    // reverse skip trailing slashes
++    while (len > 0 && libdir[len - 1] == '/') {
++        len--;
++    }
++    // reverse skip over last dir (i.e. lib or lib64)
++    while ( len > 0 && libdir[len - 1] != '/' ) {
++	len--;
++    }
++    return strstr(libdir + len, "lib64") ? "lib64" : "lib";
++}
+ 
+ /** @internal
+  * Find the canonical filename of the executable. Returns the filename
+@@ -603,7 +615,7 @@ br_find_lib_dir (const char *default_lib_dir)
+ 			return (char *) NULL;
+ 	}
+ 
+-	dir = br_build_path (prefix, "lib");
++	dir = br_build_path (prefix, br_get_lib_suffix(default_lib_dir));
+ 	free (prefix);
+ 	return dir;
+ }
diff --git a/sci-physics/rivet/files/rivet-4.1.0-testanalysis.patch b/sci-physics/rivet/files/rivet-4.1.0-testanalysis.patch
new file mode 100644
index 000000000000..793570550199
--- /dev/null
+++ b/sci-physics/rivet/files/rivet-4.1.0-testanalysis.patch
@@ -0,0 +1,29 @@
+--- a/test/Makefile.am	2025-03-26 18:24:24.354179839 +0100
++++ b/test/Makefile.am	2025-03-26 18:24:54.830822289 +0100
+@@ -1,7 +1,7 @@
+ check_PROGRAMS = \
+ testMath testMatVec testCmp \
+ testAPI testYODA testHistoGroup \
+-testAnalysis testNaN testBeams testMerging
++testNaN testBeams testMerging
+ 
+ AM_LDFLAGS = -L$(top_srcdir)/src $(YAMLCPP_LDFLAGS) -L$(YODALIBPATH)
+ if WITH_OSX
+@@ -23,8 +23,6 @@
+ testYODA_LDADD = $(TEST_LDADD)
+ testHistoGroup_SOURCES = testHistoGroup.cc
+ testHistoGroup_LDADD = $(TEST_LDADD)
+-testAnalysis_SOURCES = testAnalysis.cc
+-testAnalysis_LDADD = $(TEST_LDADD)
+ testNaN_SOURCES = testNaN.cc
+ testNaN_LDADD = $(TEST_LDADD)
+ testBeams_SOURCES = testBeams.cc
+@@ -48,7 +46,7 @@
+ TESTS = \
+ testMath testMatVec testCmp \
+ testAPI.sh testYODA testHistoGroup \
+-testAnalysis testNaN.sh testBeams testMerging.sh
++testNaN.sh testBeams testMerging.sh
+ 
+ if ENABLE_PYEXT
+ TESTS += testImport.sh
diff --git a/sci-physics/rivet/files/rivet-4.1.0-testsyoda.patch b/sci-physics/rivet/files/rivet-4.1.0-testsyoda.patch
new file mode 100644
index 000000000000..ce4f98b6ea3c
--- /dev/null
+++ b/sci-physics/rivet/files/rivet-4.1.0-testsyoda.patch
@@ -0,0 +1,28 @@
+From ec04d1dc7bb45b789b343b1c3250c8945554adc2 Mon Sep 17 00:00:00 2001
+From: Christian Gutschow <chris.g@cern.ch>
+Date: Tue, 18 Mar 2025 14:22:32 +0000
+Subject: [PATCH] use YODALIBS from yoda-config script
+
+---
+ test/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index b139128e39..7ff14605a6 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -7,9 +7,9 @@ AM_LDFLAGS = -L$(top_srcdir)/src $(YAMLCPP_LDFLAGS) -L$(YODALIBPATH)
+ if WITH_OSX
+ AM_LDFLAGS += -Wl,-rpath,${HEPMC3LIBPATH}
+ endif
+-LIBS = -lm -lYODA
++LIBS = -lm
+ 
+-TEST_LDADD = $(top_builddir)/src/libRivet.la $(HEPMCLDFLAGS) $(HEPMC3LDFLAGS) $(YODALDFLAGS) $(HEPMCLDLIBS) $(HEPMC3LDLIBS) $(YODALDLIBS) $(FASTJETLIBADD)
++TEST_LDADD = $(top_builddir)/src/libRivet.la $(HEPMCLDFLAGS) $(HEPMC3LDFLAGS) $(YODALDFLAGS) $(HEPMCLDLIBS) $(HEPMC3LDLIBS) $(YODALIBS) $(FASTJETLIBADD)
+ 
+ testMath_SOURCES = testMath.cc
+ testMath_LDADD = $(TEST_LDADD)
+-- 
+GitLab
+
diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml
index f3199abf1e65..16ceaa1c10b8 100644
--- a/sci-physics/rivet/metadata.xml
+++ b/sci-physics/rivet/metadata.xml
@@ -19,10 +19,10 @@
 	It covers all aspects of collider physics, from unfolded precision measurements to reconstruction-level searches, and physics from the Standard Model to BSM theories, and from perturbative jet, boson and top-quarks to hadron decays, inclusive QCD, and Heavy Ion physics.
 	</longdescription>
 	<use>
-		<flag name="zlib">Build with zlib</flag>
-		<flag name="hepmc3">Build with HepMC3</flag>
-		<flag name="hepmc2">Build with HepMC2</flag>
-		<flag name="highfive">Build with hdf5 and highfive</flag>
+		<flag name="zlib">Build with <pkg>sys-libs/zlib</pkg></flag>
+		<flag name="hepmc3">Build with <pkg>sci-physics/hepmc</pkg> version 3</flag>
+		<flag name="hepmc2">Build with <pkg>sci-physics/hepmc</pkg> version 2</flag>
+		<flag name="highfive">Build with <pkg>sci-libs/HighFive</pkg> and <pkg>sci-libs/hdf5</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="gitlab">hepcedar/rivet</remote-id>
diff --git a/sci-physics/rivet/rivet-4.1.0.ebuild b/sci-physics/rivet/rivet-4.1.0.ebuild
new file mode 100644
index 000000000000..e9e00e9393c5
--- /dev/null
+++ b/sci-physics/rivet/rivet-4.1.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit python-single-r1 flag-o-matic autotools optfeature bash-completion-r1
+
+MY_PN="Rivet"
+MY_PF=${MY_PN}-${PV}
+
+DESCRIPTION="Rivet toolkit (Robust Independent Validation of Experiment and Theory)"
+HOMEPAGE="
+	https://rivet.hepforge.org/
+	https://gitlab.com/hepcedar/rivet
+"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/hepcedar/rivet"
+	EGIT_BRANCH="main"
+else
+	SRC_URI="https://www.hepforge.org/archive/rivet/${MY_PF}.tar.gz -> ${P}.tar.gz"
+	S=${WORKDIR}/${MY_PF}
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="4"
+IUSE="+zlib +python +highfive"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-cpp/yaml-cpp
+	>=sci-physics/fastjet-3.4.0[plugins]
+	>=sci-physics/fastjet-contrib-1.048
+	>=sci-physics/hepmc-3.1.1:3=[-cm(-),gev(+)]
+	highfive? (
+		sci-libs/HighFive
+		sci-libs/hdf5[cxx]
+	)
+
+	sci-libs/gsl
+	zlib? ( sys-libs/zlib )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+		')
+		>=sci-physics/yoda-2.1[${PYTHON_SINGLE_USEDEP}]
+	)
+	>=sci-physics/yoda-2.1[highfive(-)?]
+	!sci-physics/rivet:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-shells/bash
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0-lib64.patch # https://gitlab.com/hepcedar/rivet/-/merge_requests/1065
+	"${FILESDIR}"/${PN}-4.1.0-testsyoda.patch # https://gitlab.com/hepcedar/rivet/-/merge_requests/1056
+	"${FILESDIR}"/${PN}-4.1.0-testanalysis.patch # https://gitlab.com/hepcedar/rivet/-/issues/532
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Eigen complains about alignment (see https://gitlab.com/libeigen/eigen/-/issues/2523).
+	# does this affect more cpus?
+	replace-cpu-flags znver1 x86-64
+	# not posix compatible, only bash
+	CONFIG_SHELL=${ESYSROOT}/bin/bash econf \
+		$(use_with zlib zlib "${ESYSROOT}/usr") \
+		--with-hepmc3="${ESYSROOT}/usr" \
+		$(use_enable highfive h5) \
+		--with-yoda="${ESYSROOT}/usr" \
+		--with-fastjet="${ESYSROOT}/usr" \
+		--with-yaml-cpp="${EPREFIX}/usr" \
+		$(use_enable python pyext) \
+		$(usex python CYTHON="${ESYSROOT}/usr/bin/cython")
+}
+
+src_install() {
+	default
+	use python && python_optimize
+	find "${ED}" -name '*.la' -delete || die
+	if use python ; then
+		newbashcomp "${ED}"/etc/bash_completion.d/${PN}-completion ${PN}
+		bashcomp_alias ${PN} \
+			${PN}-config \
+			${PN}-build \
+			${PN}-cmphistos \
+			make-plots \
+			${PN}-mkhtml-tex \
+			${PN}-mkhtml
+		rm "${ED}"/etc/bash_completion.d/${PN}-completion || die
+	fi
+}
+
+pkg_postinstall() {
+	optfeature "latex plotting support" virtual/latex-base media-gfx/imagemagick app-text/ghostscript-gpl
+	optfeature "python plotting support" dev-python/matplotlib
+}
diff --git a/sci-physics/rivet/rivet-9999.ebuild b/sci-physics/rivet/rivet-9999.ebuild
index 85247e5c239b..6361bf997d1a 100644
--- a/sci-physics/rivet/rivet-9999.ebuild
+++ b/sci-physics/rivet/rivet-9999.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/hepcedar/rivet"
+	EGIT_BRANCH="main"
 else
 	SRC_URI="https://www.hepforge.org/archive/rivet/${MY_PF}.tar.gz -> ${P}.tar.gz"
 	S=${WORKDIR}/${MY_PF}
@@ -32,6 +33,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+	dev-cpp/yaml-cpp
 	>=sci-physics/fastjet-3.4.0[plugins]
 	>=sci-physics/fastjet-contrib-1.048
 	>=sci-physics/hepmc-3.1.1:3=[-cm(-),gev(+)]
@@ -47,11 +49,10 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/matplotlib[${PYTHON_USEDEP}]
 		')
-		>=sci-physics/yoda-2[${PYTHON_SINGLE_USEDEP}]
-	)
-	!python? (
-		>=sci-physics/yoda-2
+		>=sci-physics/yoda-2.1[${PYTHON_SINGLE_USEDEP}]
 	)
+	>=sci-physics/yoda-2.1[highfive(-)?]
+	!sci-physics/rivet:3
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -63,10 +64,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.6-binreloc.patch
-)
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -84,9 +81,10 @@ src_configure() {
 	CONFIG_SHELL=${ESYSROOT}/bin/bash econf \
 		$(use_with zlib zlib "${ESYSROOT}/usr") \
 		--with-hepmc3="${ESYSROOT}/usr" \
-		$(usex highfive "--with-highfive=${ESYSROOT}/usr" "") \
+		$(use_enable highfive h5) \
 		--with-yoda="${ESYSROOT}/usr" \
 		--with-fastjet="${ESYSROOT}/usr" \
+		--with-yaml-cpp="${EPREFIX}/usr" \
 		$(use_enable python pyext) \
 		$(usex python CYTHON="${ESYSROOT}/usr/bin/cython")
 }