Adding metadata

11 files changed, 27 insertions, 484 deletions

diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
index 55e1858cfc6c..1550a0041d62 100644
--- a/sci-physics/rivet/Manifest
+++ b/sci-physics/rivet/Manifest
@@ -1,5 +1,2 @@
 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
 DIST rivet-4.1.2.tar.gz 42105420 BLAKE2B 2bef7aaf8f4b72c35e0ab221027eb465a9bba2005ae6dbd7662677814ddcabc3d1b2bbb8f9f0d5e31b3ad9ca78065dc818ca2cef0b1eefa502e6156ccf5536de SHA512 de603b27cc09689952ed39a0c9afe54322c82ffbc736e37e1640818671db70e0946d8e47a9dc43a9b169a75482e0646c183ec3f6f63d5c97054d0702f7996ce3
diff --git a/sci-physics/rivet/files/rivet-4.1.0-lib64.patch b/sci-physics/rivet/files/rivet-4.1.0-lib64.patch
deleted file mode 100644
index ef929985df34..000000000000
--- a/sci-physics/rivet/files/rivet-4.1.0-lib64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 793570550199..000000000000
--- a/sci-physics/rivet/files/rivet-4.1.0-testanalysis.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index ce4f98b6ea3c..000000000000
--- a/sci-physics/rivet/files/rivet-4.1.0-testsyoda.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 788497deaf6e..b4d09bf305ae 100644
--- a/sci-physics/rivet/metadata.xml
+++ b/sci-physics/rivet/metadata.xml
@@ -16,8 +16,6 @@
  
  <use>
   <flag name="zlib">Build with <pkg>virtual/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>
  <origin>gentoo-staging</origin>
diff --git a/sci-physics/rivet/rivet-3.1.11.ebuild b/sci-physics/rivet/rivet-3.1.11-r1.ebuild
index 08542373c038..973bbe7dc350 100644
--- a/sci-physics/rivet/rivet-3.1.11.ebuild
+++ b/sci-physics/rivet/rivet-3.1.11-r1.ebuild
@@ -3,14 +3,11 @@
 
 EAPI=8
 
+MY_P=Rivet-${PV}
 PYTHON_COMPAT=( python3_{10..14} )
-
 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)"
+DESCRIPTION="Robust Independent Validation of Experiment and Theory toolkit"
 HOMEPAGE="
 	https://rivet.hepforge.org/
 	https://gitlab.com/hepcedar/rivet
@@ -19,25 +16,20 @@ 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}
+	SRC_URI="https://www.hepforge.org/archive/rivet/${MY_P}.tar.gz -> ${P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
 	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3+"
 SLOT="4/${PV}"
-IUSE="+hepmc3 hepmc2 +zlib +python"
-REQUIRED_USE="
-	^^ ( hepmc3 hepmc2 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+IUSE="+zlib +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
+DEPEND="
 	>=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-physics/hepmc-3.3.0:3=[-cm(-),gev(+)]
 	sci-libs/gsl
 	zlib? ( virtual/zlib:= )
 	python? (
@@ -52,9 +44,10 @@ RDEPEND="
 		>=sci-physics/yoda-1.9.8
 		<sci-physics/yoda-2
 	)
+"
+RDEPEND="${DEPEND}
 	!sci-physics/rivet:3
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
 	app-shells/bash
 	python? (
@@ -85,8 +78,7 @@ 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" \
 		--with-yoda="${ESYSROOT}/usr" \
 		--with-fastjet="${ESYSROOT}/usr" \
 		$(use_enable python pyext) \
diff --git a/sci-physics/rivet/rivet-4.0.2.ebuild b/sci-physics/rivet/rivet-4.0.2.ebuild
deleted file mode 100644
index 6315030a5160..000000000000
--- a/sci-physics/rivet/rivet-4.0.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-
-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? ( virtual/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
-	)
-	!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}-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-4.1.0.ebuild b/sci-physics/rivet/rivet-4.1.0.ebuild
deleted file mode 100644
index 443f14c84866..000000000000
--- a/sci-physics/rivet/rivet-4.1.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-
-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? ( virtual/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-4.1.1.ebuild b/sci-physics/rivet/rivet-4.1.1.ebuild
deleted file mode 100644
index 0f540ee48a29..000000000000
--- a/sci-physics/rivet/rivet-4.1.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-
-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/${PV}"
-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? ( virtual/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}]
-		')
-	)
-"
-
-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-4.1.2.ebuild b/sci-physics/rivet/rivet-4.1.2.ebuild
index 0f540ee48a29..62fe13f30cef 100644
--- a/sci-physics/rivet/rivet-4.1.2.ebuild
+++ b/sci-physics/rivet/rivet-4.1.2.ebuild
@@ -3,14 +3,11 @@
 
 EAPI=8
 
+MY_P=Rivet-${PV}
 PYTHON_COMPAT=( python3_{10..14} )
-
 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)"
+DESCRIPTION="Robust Independent Validation of Experiment and Theory toolkit"
 HOMEPAGE="
 	https://rivet.hepforge.org/
 	https://gitlab.com/hepcedar/rivet
@@ -20,19 +17,17 @@ if [[ ${PV} == 9999 ]]; then
 	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}
+	SRC_URI="https://www.hepforge.org/archive/rivet/${MY_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
 	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3+"
 SLOT="4/${PV}"
 IUSE="+zlib +python +highfive"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
+DEPEND="
 	dev-cpp/yaml-cpp
 	>=sci-physics/fastjet-3.4.0[plugins]
 	>=sci-physics/fastjet-contrib-1.048
@@ -52,9 +47,10 @@ RDEPEND="
 		>=sci-physics/yoda-2.1[${PYTHON_SINGLE_USEDEP}]
 	)
 	>=sci-physics/yoda-2.1:=[highfive(-)?]
+"
+RDEPEND="${DEPEND}
 	!sci-physics/rivet:3
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
 	app-shells/bash
 	python? (
diff --git a/sci-physics/rivet/rivet-9999.ebuild b/sci-physics/rivet/rivet-9999.ebuild
index 40fb8b3f6f8c..c36638a9bc16 100644
--- a/sci-physics/rivet/rivet-9999.ebuild
+++ b/sci-physics/rivet/rivet-9999.ebuild
@@ -3,14 +3,11 @@
 
 EAPI=8
 
+MY_P=Rivet-${PV}
 PYTHON_COMPAT=( python3_{10..14} )
-
 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)"
+DESCRIPTION="Robust Independent Validation of Experiment and Theory toolkit"
 HOMEPAGE="
 	https://rivet.hepforge.org/
 	https://gitlab.com/hepcedar/rivet
@@ -20,19 +17,17 @@ if [[ ${PV} == 9999 ]]; then
 	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}
+	SRC_URI="https://www.hepforge.org/archive/rivet/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
 	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3+"
 SLOT="4/${PV}"
 IUSE="+zlib +python +highfive"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
+DEPEND="
 	dev-cpp/yaml-cpp
 	>=sci-physics/fastjet-3.4.0[plugins]
 	>=sci-physics/fastjet-contrib-1.048
@@ -52,9 +47,10 @@ RDEPEND="
 		sci-physics/yoda[${PYTHON_SINGLE_USEDEP}]
 	)
 	>=sci-physics/yoda-2.1:=
+"
+RDEPEND="${DEPEND}
 	!sci-physics/rivet:3
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
 	app-shells/bash
 	python? (