gentoo auto-resync : 24:09:2024 - 01:25:19

4 files changed, 137 insertions, 21 deletions

diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
index c014fee5e230..67a684f3b364 100644
--- a/sci-physics/rivet/Manifest
+++ b/sci-physics/rivet/Manifest
@@ -3,7 +3,9 @@ AUX rivet-3.1.6-binreloc.patch 626 BLAKE2B 2d3d14b334e3dd826534401ef2613643da030
 AUX rivet-3.1.9-pythontests.patch 508 BLAKE2B 76f758a47643efbe2b997b184c8af7d86055456d84e8bcbdcd67f0836d631f3e38d9b7c53c69133c17ff0f15ae212710e253fa68f794583a321b541baa58a331 SHA512 98fb734113b4639ead244ae044df2ddd85d62247a669f1e3e23ec35b63eb7db56e7999fb4d5144ac313eb6f5bd71e25ca31338f51c0256a4290af8e74cff9a78
 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.1.tar.gz 29061104 BLAKE2B 33bb4d003c817e44c2b5ecbf36f0c1d16954b52eb4883531f030af30608e5c499378fc3b3157a4608de63cc07617acbfa56cc124cdf61bbaf2a42841b28d478c SHA512 11704dd4f5c2d6981683f3e0f2d201c2554693dbc5a16c50a064cf9ff890b5dc7039ed2fb09720de21693fcd4ffaf10aba52a6240c65bbcb987a6f48512a0543
 EBUILD rivet-3.1.10.ebuild 2812 BLAKE2B 52ce856a54f65a804e08314cf951f89c7a4bc1e25114ab9cca55c31725c0805473ecf1c94c9eea8d6cf22dcf59e5578cef03da9ba84982191f2cd9bc955f829b SHA512 21ad5dc23d0d150f0e2fa33602b9ae703eeb08930687e1f233624a1cdefafcb0680462c431890c7c1ec888d3c18f5866a84817cb09cf81dda0b84a60cd89c78c
 EBUILD rivet-3.1.9.ebuild 2900 BLAKE2B a47c46505beff3595c236976923b74ce795dbb7ac7ff140d74f1c8f5d20978b5406be8ddea8b44983ee0ab9a2cfebb600b35632644b7cdc3dd82d3692631c5fd SHA512 3039bcaced8628e69d396d6bd9b59fd8fe345ce0abe12f173959f081d92aa9a400ff93b608a8b3ed5c65817fd7a797e28cb2c3bad0a4ee2f29a79838ec2fe7ad
-EBUILD rivet-9999.ebuild 2742 BLAKE2B eeb12ef46c8b9bd5a674bd6d0faaaff85888d6115cddad778f8bfb5fcc03a0975e4cb920fbdf222586738d58e0c03a87de6b086252e0a3ec867debf9340e782f SHA512 443202305dbd2825a9e874a568ed313ddd4ea64b7f0fef53d6bc12852f74381f456fe745bf278e48c63c1ad606ac3bb01f211879d3877fae837ebf880d9a4b1f
-MISC metadata.xml 1139 BLAKE2B 0a112878c1f9fed11832dd0fc7087aec215f598f81e124a978c35dd9dab9abef65cdb6125623498b04d0b92e4009425a1847d0823ae759011bb4f2a6c29be6eb SHA512 c2eece47abff9d2c8910fe315b6aa6a18cca5d94d8a9601513f1936c397d18b2cf6d0ed4dca6471641949198f39d6ce30e0763c59444932d553f679a9b858dcf
+EBUILD rivet-4.0.1.ebuild 2603 BLAKE2B 15fbf948fc75eb5fb3fe727b001b6f6daba19fc906136920f527498aa32e782e9da3fe3c46bc951dd4ef481d647d6976643090b11de441bd2efbf8a51f447743 SHA512 78f9fa5dfe764863f4bf3633081fe5d0db7564665753a4fe2a2fcdac158153c5ce38dfebe41ae5096ee4099ec42982a4925cb670d3a309172603e62a64fdfa58
+EBUILD rivet-9999.ebuild 2603 BLAKE2B 15fbf948fc75eb5fb3fe727b001b6f6daba19fc906136920f527498aa32e782e9da3fe3c46bc951dd4ef481d647d6976643090b11de441bd2efbf8a51f447743 SHA512 78f9fa5dfe764863f4bf3633081fe5d0db7564665753a4fe2a2fcdac158153c5ce38dfebe41ae5096ee4099ec42982a4925cb670d3a309172603e62a64fdfa58
+MISC metadata.xml 1199 BLAKE2B b9210bcdd53714c46011b09479110fe4a6a43b0b935e438dc6d003217184903bdc3f963ed60f62f1a0e232028c763bc0e97182a6f4747fa3c7d96fe40c2f4caf SHA512 4177092e5f5e69fdd7733cf21c46ee88db0c276ad4b4c6dc2b0dacbe38d0d3deceaa34042c1ba0b11e8602fbac4720cb078ca60f651271e4e4397ee9bb49b36d
diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml
index a004d00e7bbe..23bb49548be9 100644
--- a/sci-physics/rivet/metadata.xml
+++ b/sci-physics/rivet/metadata.xml
@@ -18,6 +18,7 @@
 		<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>
 	</use>
 	<upstream>
 		<remote-id type="gitlab">hepcedar/rivet</remote-id>
diff --git a/sci-physics/rivet/rivet-4.0.1.ebuild b/sci-physics/rivet/rivet-4.0.1.ebuild
new file mode 100644
index 000000000000..6c8d466288de
--- /dev/null
+++ b/sci-physics/rivet/rivet-4.0.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..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="4"
+IUSE="+zlib +python +highfive"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=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[${PYTHON_SINGLE_USEDEP}]
+	)
+	!python? (
+		>=sci-physics/yoda-2
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-shells/bash
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.6-binreloc.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") \
+		--with-hepmc3="${ESYSROOT}/usr" \
+		$(usex highfive "--with-highfive=${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}-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 ab878070845d..6c8d466288de 100644
--- a/sci-physics/rivet/rivet-9999.ebuild
+++ b/sci-physics/rivet/rivet-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 
 inherit python-single-r1 flag-o-matic autotools optfeature bash-completion-r1
 
@@ -18,7 +18,6 @@ HOMEPAGE="
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/hepcedar/rivet"
-	EGIT_BRANCH="release-3-1-x"
 else
 	SRC_URI="https://www.hepforge.org/archive/rivet/${MY_PF}.tar.gz -> ${P}.tar.gz"
 	S=${WORKDIR}/${MY_PF}
@@ -26,18 +25,20 @@ else
 fi
 
 LICENSE="GPL-3+"
-SLOT="3"
-IUSE="+hepmc3 hepmc2 +zlib +python"
+SLOT="4"
+IUSE="+zlib +python +highfive"
 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-physics/hepmc-3.1.1:3=[-cm(-),gev(+)]
+	highfive? (
+		sci-libs/HighFive
+		sci-libs/hdf5[cxx]
+	)
 
 	sci-libs/gsl
 	zlib? ( sys-libs/zlib )
@@ -46,12 +47,10 @@ RDEPEND="
 		$(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}]
+		>=sci-physics/yoda-2[${PYTHON_SINGLE_USEDEP}]
 	)
 	!python? (
-		>=sci-physics/yoda-1.9.8
-		<sci-physics/yoda-2
+		>=sci-physics/yoda-2
 	)
 "
 DEPEND="${RDEPEND}"
@@ -66,7 +65,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.6-binreloc.patch
-	"${FILESDIR}"/${PN}-3.1.9-pythontests.patch
 )
 
 pkg_setup() {
@@ -85,8 +83,8 @@ src_configure() {
 	# 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-hepmc3="${ESYSROOT}/usr" \
+		$(usex highfive "--with-highfive=${ESYSROOT}/usr" "") \
 		--with-yoda="${ESYSROOT}/usr" \
 		--with-fastjet="${ESYSROOT}/usr" \
 		$(use_enable python pyext) \
@@ -99,17 +97,18 @@ src_install() {
 	find "${ED}" -name '*.la' -delete || die
 	if use python ; then
 		newbashcomp "${ED}"/etc/bash_completion.d/${PN}-completion ${PN}
-		bashcomp_alias ${PN} ${PN}-config \
+		bashcomp_alias ${PN} \
+			${PN}-config \
 			${PN}-build \
-			${PN}-buildplugin \
 			${PN}-cmphistos \
 			make-plots \
-			${PN}-mkhtml \
-			${PN}-mkhtml-mpl
+			${PN}-mkhtml-tex \
+			${PN}-mkhtml
 		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
+	optfeature "latex plotting support" virtual/latex-base media-gfx/imagemagick app-text/ghostscript-gpl
+	optfeature "python plotting support" dev-python/matplotlib
 }