From c154fb81f263b8d07fbf3c7813bdc244b094c847 Mon Sep 17 00:00:00 2001
From: Alexander Puck Neuwirth <apn-pucky@gentoo.org>
Date: Tue, 16 Sep 2025 16:38:27 +0200
Subject: [PATCH] sci-physics/rivet: add 3.1.11, drop 3.1.9, 3.1.10-r1,
 3.1.10-r2

Now all rivets are in slot 4.
Also adds a subslot for live ebuild.
In the future the block !sci-physics/rivet:3 can be removed.

Part-of: https://github.com/gentoo/gentoo/pull/43811
Closes: https://github.com/gentoo/gentoo/pull/43811
Signed-off-by: Alexander Puck Neuwirth <apn-pucky@gentoo.org>
---
 sci-physics/rivet/Manifest                    |   3 +-
 sci-physics/rivet/rivet-3.1.10-r2.ebuild      | 120 ------------------
 ...t-3.1.10-r1.ebuild => rivet-3.1.11.ebuild} |   9 +-
 sci-physics/rivet/rivet-3.1.9.ebuild          | 116 -----------------
 sci-physics/rivet/rivet-9999.ebuild           |   4 +-
 5 files changed, 7 insertions(+), 245 deletions(-)
 delete mode 100644 sci-physics/rivet/rivet-3.1.10-r2.ebuild
 rename sci-physics/rivet/{rivet-3.1.10-r1.ebuild => rivet-3.1.11.ebuild} (90%)
 delete mode 100644 sci-physics/rivet/rivet-3.1.9.ebuild

diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
index 7629e0d0ea520..2818eac348452 100644
--- a/sci-physics/rivet/Manifest
+++ b/sci-physics/rivet/Manifest
@@ -1,5 +1,4 @@
-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-3.1.11.tar.gz 39616907 BLAKE2B 7b0d17732505a01787deb34a3dafefb17999a1b9b55d1f3a39e57f45ee1dd11c7acc8a4ed168693c486c81c40f6fabb5274aad7116e3029dc89cb2fe11aec612 SHA512 92852ddf77e22b9e85a23a1f91b7dfde6d40b7d6985b9afd16942edbe25b9f25e5435eec93ddc6249406bfd14d24fc10b5d77f81af4db2c5b7aacb4fa5c5936c
 DIST rivet-4.0.2.tar.gz 39847467 BLAKE2B b7c1c03ea9503a6da536ca15a0ff961768e3d7d4140bb1ba19c20ba75b55592609bf2c99aece37436c1f4bdf443bd69ab5b59f86fec972ae5b8275359747b9e4 SHA512 0e383e015c425a9e8d734a9ef624222b8c025cd48cb174075b60f7f5a818213ea9f4352445c36bdc574f80722cf4ae3dbe083af89a1f9083fa3632bdf94b860a
 DIST rivet-4.1.0.tar.gz 40969269 BLAKE2B 6f5b4a4f9ee902e4564822179e8926831b3308259615f33ceeec3a78e6a6cce2eb851de11a58a3192fce11504ef5b34d42d2f127a71722051121e35f2281d332 SHA512 07c30283e102b618c0abc5006a8099ce1ecea99f594d2a5837d3c0c6e4e2353ac788607a31a2a76e9f91f14c5f94f2c7fbf070d881f65b90410e2e13f566ed15
 DIST rivet-4.1.1.tar.gz 41996107 BLAKE2B 154d32bda131563305cc7dcc95a4d2288c8b66e0f7cb8539f8e87c2e9b15ac2a9dfa78842a75e697ffcac64a49142a15a5a30ee11f90220df74e16049e901df2 SHA512 bace3c346c2b0adf0689ac829b42d86d60923342ce3dd065bb8519cd64da7670327e8cc8414794ae41d2d031d586f8787682c62efb9423e6e62089910074dc2a
diff --git a/sci-physics/rivet/rivet-3.1.10-r2.ebuild b/sci-physics/rivet/rivet-3.1.10-r2.ebuild
deleted file mode 100644
index 5699ab77d9d00..0000000000000
--- a/sci-physics/rivet/rivet-3.1.10-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..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"
-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.3.0: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
-	# https://gitlab.com/hepcedar/rivet/-/merge_requests/844
-	"${FILESDIR}"/${PN}-3.1.10-ref_cin.patch
-	# https://gitlab.com/hepcedar/rivet/-/merge_requests/979
-	"${FILESDIR}"/${PN}-3.1.10-versions.patch
-	# https://gitlab.com/hepcedar/rivet/-/merge_requests/985
-	"${FILESDIR}"/${PN}-3.1.10-uint16.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-3.1.10-r1.ebuild b/sci-physics/rivet/rivet-3.1.11.ebuild
similarity index 90%
rename from sci-physics/rivet/rivet-3.1.10-r1.ebuild
rename to sci-physics/rivet/rivet-3.1.11.ebuild
index b3594c3ce6209..2b72e5b3d362c 100644
--- a/sci-physics/rivet/rivet-3.1.10-r1.ebuild
+++ b/sci-physics/rivet/rivet-3.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit python-single-r1 flag-o-matic autotools optfeature bash-completion-r1
 
@@ -25,7 +25,7 @@ else
 fi
 
 LICENSE="GPL-3+"
-SLOT="3"
+SLOT="4/${PV}"
 IUSE="+hepmc3 hepmc2 +zlib +python"
 REQUIRED_USE="
 	^^ ( hepmc3 hepmc2 )
@@ -52,6 +52,7 @@ RDEPEND="
 		>=sci-physics/yoda-1.9.8
 		<sci-physics/yoda-2
 	)
+	!sci-physics/rivet:3
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -66,8 +67,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.6-binreloc.patch
 	"${FILESDIR}"/${PN}-3.1.9-pythontests.patch
-	"${FILESDIR}"/${PN}-3.1.10-ref_cin.patch # https://gitlab.com/hepcedar/rivet/-/merge_requests/844
-	"${FILESDIR}"/${PN}-3.1.10-versions.patch # https://gitlab.com/hepcedar/rivet/-/merge_requests/979
 )
 
 pkg_setup() {
diff --git a/sci-physics/rivet/rivet-3.1.9.ebuild b/sci-physics/rivet/rivet-3.1.9.ebuild
deleted file mode 100644
index 23eb58b650434..0000000000000
--- a/sci-physics/rivet/rivet-3.1.9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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
-	"${FILESDIR}"/${PN}-3.1.10-ref_cin.patch # https://gitlab.com/hepcedar/rivet/-/merge_requests/844
-)
-
-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
index 6361bf997d1a5..3ad9c5f78cb93 100644
--- a/sci-physics/rivet/rivet-9999.ebuild
+++ b/sci-physics/rivet/rivet-9999.ebuild
@@ -26,7 +26,7 @@ else
 fi
 
 LICENSE="GPL-3+"
-SLOT="4"
+SLOT="4/${PV}"
 IUSE="+zlib +python +highfive"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -51,7 +51,7 @@ RDEPEND="
 		')
 		>=sci-physics/yoda-2.1[${PYTHON_SINGLE_USEDEP}]
 	)
-	>=sci-physics/yoda-2.1[highfive(-)?]
+	>=sci-physics/yoda-2.1:=[highfive(-)?]
 	!sci-physics/rivet:3
 "
 DEPEND="${RDEPEND}"