gentoo auto-resync : 29:03:2024 - 13:13:23

5 files changed, 234 insertions, 2 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index ead719b038c7..59d7d7dcc239 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
index 6fc0c9a39167..28ee1c23f001 100644
--- a/sci-physics/rivet/Manifest
+++ b/sci-physics/rivet/Manifest
@@ -1,5 +1,8 @@
 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
+DIST rivet-3.1.9.tar.gz 37599489 BLAKE2B a470254b8d4303f5738ca9c4ff0061a000d06e37ee805d909dfc709f14e5ebc8958739912f9b9bbf80bb38e79f4b8df057d7ac59c6924fddd56918102243aeed SHA512 21c1ca6eda7ac7d0394875cd8b972d3e65df1bf0e773d2094bab1997c6fab67381d6202aef8024eaa363c03b2345bae95d54dca1ce38c2499ddc24a7e7f93bdc
+EBUILD rivet-3.1.10.ebuild 2713 BLAKE2B 90985f3086933210476870cc4ef3f2e78dd390eb4ff2f9f26298afae9aea79e084ab5124cb3322354a43334c57012a9e436caa9a686298b4381265b1121db0db SHA512 8efbd6806706900b03e2df081bf1bddfd7726383b7ef731ab7d0f17ac0c1b40b1d73efa51080717ac94f49dc519627cb86766df668a43ae3662d955528861178
+EBUILD rivet-3.1.9.ebuild 2801 BLAKE2B 8402519ef9f90bf28b79974d47edca21775b3a995b936aba0f96eb3a1a8021ff9d08b1306b2390ca7cf35ae7e774f177d8f4be68d62c8c4d2067bb1841bcadbf SHA512 678fe2d09533b9c6c8fa9d4a23d1b155aceff347ecf26eb39c899684cede00426c15996b2632d0ddd8d0c33bf6c138ac53b2940566a4827beafd01da7598e5c7
+EBUILD rivet-9999.ebuild 2742 BLAKE2B eeb12ef46c8b9bd5a674bd6d0faaaff85888d6115cddad778f8bfb5fcc03a0975e4cb920fbdf222586738d58e0c03a87de6b086252e0a3ec867debf9340e782f SHA512 443202305dbd2825a9e874a568ed313ddd4ea64b7f0fef53d6bc12852f74381f456fe745bf278e48c63c1ad606ac3bb01f211879d3877fae837ebf880d9a4b1f
 MISC metadata.xml 1139 BLAKE2B 0a112878c1f9fed11832dd0fc7087aec215f598f81e124a978c35dd9dab9abef65cdb6125623498b04d0b92e4009425a1847d0823ae759011bb4f2a6c29be6eb SHA512 c2eece47abff9d2c8910fe315b6aa6a18cca5d94d8a9601513f1936c397d18b2cf6d0ed4dca6471641949198f39d6ce30e0763c59444932d553f679a9b858dcf
diff --git a/sci-physics/rivet/rivet-3.1.10.ebuild b/sci-physics/rivet/rivet-3.1.10.ebuild
index e1f11ef57f95..6d95335c815a 100644
--- a/sci-physics/rivet/rivet-3.1.10.ebuild
+++ b/sci-physics/rivet/rivet-3.1.10.ebuild
@@ -55,7 +55,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	virtual/fortran
 	app-shells/bash
 	python? (
 		$(python_gen_cond_dep '
diff --git a/sci-physics/rivet/rivet-3.1.9.ebuild b/sci-physics/rivet/rivet-3.1.9.ebuild
new file mode 100644
index 000000000000..207734faa1c8
--- /dev/null
+++ b/sci-physics/rivet/rivet-3.1.9.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} )
+"
+
+# <sci-physics/hepmc-3.2.7 due to https://gitlab.com/hepcedar/rivet/-/issues/414
+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.2.7: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="
+	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
+}
diff --git a/sci-physics/rivet/rivet-9999.ebuild b/sci-physics/rivet/rivet-9999.ebuild
new file mode 100644
index 000000000000..ab878070845d
--- /dev/null
+++ b/sci-physics/rivet/rivet-9999.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"
+	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}
+	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="
+	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
+}