9 files changed, 278 insertions, 10 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index e9fcdd222b70..ed66b88e57df 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index be2a11b7ad5b..c5f41050a9f5 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -3,8 +3,10 @@ AUX lhapdf-6.5.2-py.patch 391 BLAKE2B f5d904659a9163ec2e269e5c950c0610c9604dd936
 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
+DIST lhapdf-6.5.4.tar.gz 869707 BLAKE2B 9bd214f29ef0fb662095a045acf449bac60c2f12fb0e182c9c590ec51651f1c08d213a3f9280eda0711ec9a0d5cae620918f048c362838a9de8e69cc84f34798 SHA512 0e39f7f298e8c72eece9c3d19f471f48b3ee045cd54ecd318e0b2d60ada4f01a2151e6b2b5f27fccdf10c1043352a673492f8792be1964df7eafbe931282a83b
 EBUILD lhapdf-6.3.0-r2.ebuild 1615 BLAKE2B 0c294a84d4a59c43dc5e19c53afcf51c00d2631517ab05d0568c1b2a600a92e92da9f8c244ef5e4cee03a37ef9fa61d0a25755c62e767fadbeaa6cb0baddcecf SHA512 2631fa6871e55b9912493cfd27b8935e3f7635688f126364b4db5f90bc28746b3c5a47a29263098770687ff53cc9373e5b6ed6eb75db92ec4a202f5894d27739
 EBUILD lhapdf-6.5.3-r1.ebuild 1161 BLAKE2B aaa67027ed213ed83386023de26f200d022143048182fa3531fc1a2b564abc64f3d9d644f344f5803a0d2bc1d5fbe4934b5c65b6689dd147a8bb941b4573454e SHA512 1228c4d723d919928b50a07943143d1783876b996c5070c3717f649d0569985b4f794d331dc616625d2f42f5c21db0baec967f9e597cf61f19ce08d28eeecf7d
+EBUILD lhapdf-6.5.4-r1.ebuild 1582 BLAKE2B 800e9ef149de425e60f55effcd841b2ce7f5ab4539570d08ca0ae370b5f2560fc870c64f0741277222e4b99c613f856131fce38c6ec7d29a692fc663778101fc SHA512 57ac1c9628a83e1669def718c98f2e9a4374f467d7035790f54183c8b7100e922108739700673514e703355835184c006042c2b697d098c67f68103bc0d32029
 EBUILD lhapdf-6.5.4.ebuild 1220 BLAKE2B 1a36e08355bf6d77b5c3277b816a95f0b34876b112ac635ed07a90c6c56857fb251aba9ba1f6d1fb66e46babedb462c7d3e52d2cb4d87cbe260811686b43aeef SHA512 db958e101657c717cd127b05526abb1c6dd78da4064d1fe19a9584be8a870c6e2f382839f4c64b7410c90312c808322927fceddac163e28727a7345924f7fec2
-EBUILD lhapdf-9999.ebuild 1317 BLAKE2B d988647eeed4d92e9eaa0954339e3865cd57a8fd50b2ee3c5ff8d6945d94fb593201aa767f48faf48afd1b1eb8a6a8b3b4f26801016e1b11bc76a21e3ee78c3f SHA512 4fddbc87790e443cb832e10251026bca3509fda570be1663c8b4f4f7a7a34e41dc44c0340f5a900b0762ebfafff75e01a7b8bba447693b61510f369b2369445c
+EBUILD lhapdf-9999.ebuild 1528 BLAKE2B e16564e6b107acf1acf3bd8f7e7ae3d1b4dc29d73484583a88c27c964ca3bd11b57fa0259ed8b9f76a0770b584c406bc932fce8ff65f1c603a4112a61a7d716b SHA512 042708303d7bbd5bb5291d25785300e843e767badfc373c3dd867d529e43d404d1eab42d8235df7de016a273a8afe8db9f6f8090fee28c1dcd75aaed668d4f6e
 MISC metadata.xml 1234 BLAKE2B 059e7abca0dd0583b71bbc3b48c3125952c1642c4bad30d2776b2d6a5ea44eaee0ce6f1ac44e92a7c179b11d50bbe24ed2f947bf870ebee51c6c3d49a6a6b98e SHA512 2c94513c3e3287fe186b6212e48b9aa09fee0da5bee50887432a985b1466aa40b3d2086955ee0b9d03b70bdb615b72caa3e0c74ca1d0c32590f7ad1d31a45a0e
diff --git a/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild b/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild
new file mode 100644
index 000000000000..7a306b01aeeb
--- /dev/null
+++ b/sci-physics/lhapdf/lhapdf-6.5.4-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
+inherit python-single-r1 docs autotools
+
+MY_PV=$(ver_cut 1-3)
+MY_PF=LHAPDF-${MY_PV}
+
+DESCRIPTION="Les Houches Parton Density Function unified library"
+HOMEPAGE="https://lhapdf.hepforge.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/hepcedar/lhapdf"
+else
+	SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PF}"
+	KEYWORDS="amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.19[${PYTHON_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# Let cython reproduce this for more recent python versions
+	rm wrappers/python/lhapdf.cpp || die
+	eautoreconf
+}
+
+src_configure() {
+	CONFIG_SHELL="${EPREFIX}/bin/bash" \
+	econf \
+		--disable-static \
+		$(use_enable python)
+}
+
+src_compile() {
+	emake all $(use doc && echo doxy)
+}
+
+src_test() {
+	emake -C tests
+}
+
+src_install() {
+	default
+	use doc && dodoc -r doc/doxygen/.
+	use examples && dodoc examples/*.cc
+
+	use python && python_optimize
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-physics/lhapdf/lhapdf-9999.ebuild b/sci-physics/lhapdf/lhapdf-9999.ebuild
index d6db5a753ed2..492a8fed8602 100644
--- a/sci-physics/lhapdf/lhapdf-9999.ebuild
+++ b/sci-physics/lhapdf/lhapdf-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="
 	dev-texlive/texlive-bibtexextra
@@ -24,18 +24,27 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/hepcedar/lhapdf"
 else
-	SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz"
+	SRC_URI="https://www.hepforge.org/downloads/lhapdf/${MY_PF}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PF}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="examples +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="${PYTHON_DEPS}"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.19[${PYTHON_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
 
 src_prepare() {
 	default
@@ -47,7 +56,7 @@ src_configure() {
 	CONFIG_SHELL="${EPREFIX}/bin/bash" \
 	econf \
 		--disable-static \
-		--enable-python
+		$(use_enable python)
 }
 
 src_compile() {
@@ -63,7 +72,7 @@ src_install() {
 	use doc && dodoc -r doc/doxygen/.
 	use examples && dodoc examples/*.cc
 
-	python_optimize
+	use python && python_optimize
 
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
new file mode 100644
index 000000000000..6fc0c9a39167
--- /dev/null
+++ b/sci-physics/rivet/Manifest
@@ -0,0 +1,5 @@
+AUX rivet-3.1.6-binreloc.patch 626 BLAKE2B 2d3d14b334e3dd826534401ef2613643da0302f2e29148173aba08f46454169956c4f5d53ad6fff9e29f35bed97ba9a697ddc8fd34a22677cab3c30632e48175 SHA512 699bc0209e01120266436421d5f4f5dd97c81da7f107394654a4a42dd141545de63e9143de96da2d4d668e1ae1d3165d290eec48d567a872553d494694aa0229
+AUX rivet-3.1.9-pythontests.patch 508 BLAKE2B 76f758a47643efbe2b997b184c8af7d86055456d84e8bcbdcd67f0836d631f3e38d9b7c53c69133c17ff0f15ae212710e253fa68f794583a321b541baa58a331 SHA512 98fb734113b4639ead244ae044df2ddd85d62247a669f1e3e23ec35b63eb7db56e7999fb4d5144ac313eb6f5bd71e25ca31338f51c0256a4290af8e74cff9a78
+DIST rivet-3.1.10.tar.gz 36327949 BLAKE2B 76d8ed8b3ee0eda2f7f03b4e423c46f49d39006a4ab0b66622ab2b2a7817f91f1f7bc648ecfb2e9d2d73da1619069c25fe9078c9b04a54cce8e1a71c33dc6b1a SHA512 9a0a3516686b82c7cf667bab230229553e9e49e5656d763046a86baa1f2d3fdb3167e53540533ebe5da532e71f15140ab8dd16de4075fd76e634e0c6919155e4
+EBUILD rivet-3.1.10.ebuild 2730 BLAKE2B 9fe7474da50e03b16852411eeacf4dadaab188420d9de7c3c67400561c03511f5acee656f4d2bc13dbdd38011f8aee5c871ba6f32ff1033ef2a79444d3cc73c8 SHA512 c19677d5b22f1931e43b0102721a345515e80c9dc9507f6b068479e280fcfe1f895f929a346646cadf1f249e9c5ddece2669f4118e25cc970635497552c4db21
+MISC metadata.xml 1139 BLAKE2B 0a112878c1f9fed11832dd0fc7087aec215f598f81e124a978c35dd9dab9abef65cdb6125623498b04d0b92e4009425a1847d0823ae759011bb4f2a6c29be6eb SHA512 c2eece47abff9d2c8910fe315b6aa6a18cca5d94d8a9601513f1936c397d18b2cf6d0ed4dca6471641949198f39d6ce30e0763c59444932d553f679a9b858dcf
diff --git a/sci-physics/rivet/files/rivet-3.1.6-binreloc.patch b/sci-physics/rivet/files/rivet-3.1.6-binreloc.patch
new file mode 100644
index 000000000000..e16691b88b47
--- /dev/null
+++ b/sci-physics/rivet/files/rivet-3.1.6-binreloc.patch
@@ -0,0 +1,12 @@
+diff -Naru Rivet-3.1.6.orig/src/Tools/binreloc.c Rivet-3.1.6/src/Tools/binreloc.c
+--- a/src/Tools/binreloc.c	2022-06-26 23:23:44.359890803 +0200
++++ b/src/Tools/binreloc.c	2022-06-26 23:24:36.962045655 +0200
+@@ -215,7 +215,7 @@
+ 			break;
+ 
+ 		/* Sanity check. */
+-		if (strchr (line, '/') == NULL)
++		if (strstr (line, " r-xp ") == NULL || strchr (line, '/') == NULL)
+ 		/* With binutils > 2.30 (const void *) "" is placed in "r--p" area of memory
+          In general, for the mechanism of detection it doesn't really matter where your symbol is,
+          therefore, check for strstr (line, " r-xp ") == NULL is removed */
diff --git a/sci-physics/rivet/files/rivet-3.1.9-pythontests.patch b/sci-physics/rivet/files/rivet-3.1.9-pythontests.patch
new file mode 100644
index 000000000000..ad08ab63db5d
--- /dev/null
+++ b/sci-physics/rivet/files/rivet-3.1.9-pythontests.patch
@@ -0,0 +1,21 @@
+--- a/test/Makefile.am	2024-03-18 22:15:31.296275378 +0100
++++ b/test/Makefile.am	2024-03-18 22:15:57.499969373 +0100
+@@ -35,14 +35,16 @@
+   RIVET_TESTS_SRC=$(srcdir)
+ 
+ TESTS = \
+-testMath testMatVec testCmp testApi.sh testNaN.sh testBeams \
+-testImport.sh
++testMath testMatVec testCmp testApi.sh testNaN.sh testBeams
++if ENABLE_PYEXT
++TESTS += testImport.sh
+ 
+ if ENABLE_ANALYSES
+ 
+ TESTS += testCmdLine.sh
+ 
+ endif
++endif
+ 
+ EXTRA_DIST = testApi.hepmc testCmdLine.sh testImport.sh testApi.sh testNaN.sh
+ 
diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml
new file mode 100644
index 000000000000..a004d00e7bbe
--- /dev/null
+++ b/sci-physics/rivet/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexander@neuwirth-informatik.de</email>
+		<name>Alexander Puck Neuwirth</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-physics@gentoo.org</email>
+		<name>Gentoo Physics Project</name>
+	</maintainer>
+
+	<longdescription lang="en">
+	Rivet is a system for preservation of particle-collider analysis logic, analysis reinterpretation via MC simulations, and the validation and improvement of Monte Carlo event generator codes. 
+	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>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">hepcedar/rivet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-physics/rivet/rivet-3.1.10.ebuild b/sci-physics/rivet/rivet-3.1.10.ebuild
new file mode 100644
index 000000000000..e1f11ef57f95
--- /dev/null
+++ b/sci-physics/rivet/rivet-3.1.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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"
+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="3"
+IUSE="+hepmc3 hepmc2 +zlib +python"
+REQUIRED_USE="
+	^^ ( hepmc3 hepmc2 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=sci-physics/fastjet-3.4.0[plugins]
+	>=sci-physics/fastjet-contrib-1.048
+	hepmc2? ( sci-physics/hepmc:2=[-cm(-),gev(+)] )
+	hepmc3? ( sci-physics/hepmc:3=[-cm(-),gev(+)] )
+
+	sci-libs/gsl
+	zlib? ( sys-libs/zlib )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+		')
+		>=sci-physics/yoda-1.9.8[${PYTHON_SINGLE_USEDEP}]
+		<sci-physics/yoda-2[${PYTHON_SINGLE_USEDEP}]
+	)
+	!python? (
+		>=sci-physics/yoda-1.9.8
+		<sci-physics/yoda-2
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/fortran
+	app-shells/bash
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.6-binreloc.patch
+	"${FILESDIR}"/${PN}-3.1.9-pythontests.patch
+)
+
+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") \
+		$(usex hepmc2 "--with-hepmc=${ESYSROOT}/usr" "") \
+		$(usex hepmc3 "--with-hepmc3=${ESYSROOT}/usr" "") \
+		--with-yoda="${ESYSROOT}/usr" \
+		--with-fastjet="${ESYSROOT}/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}-buildplugin \
+			${PN}-cmphistos \
+			make-plots \
+			${PN}-mkhtml \
+			${PN}-mkhtml-mpl
+		rm "${ED}"/etc/bash_completion.d/${PN}-completion || die
+	fi
+}
+
+pkg_postinstall() {
+	optfeature "plotting support" virtual/latex-base media-gfx/imagemagick app-text/ghostscript-gpl
+}