Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2025-12-31 07:15:02 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2025-12-31 07:15:02 +0000
commit: 2d2e72fe708ba301d75df9d83bdb90f2341c889e (patch)
tree: 02777fcb985524c399fc022e7583efc1387a7ad9 /sci-physics
parent: 002e66b1f9281be5b24bad19c1064c4699aad7a7 (diff)
download: baldeagleos-repo-2d2e72fe708ba301d75df9d83bdb90f2341c889e.tar.gz
baldeagleos-repo-2d2e72fe708ba301d75df9d83bdb90f2341c889e.tar.xz
baldeagleos-repo-2d2e72fe708ba301d75df9d83bdb90f2341c889e.zip
30 files changed, 52 insertions, 2309 deletions
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 054bb7233f69..a05de4bdd2cd 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -5,15 +5,4 @@ DIST NNPDF23_nlo_as_0119_qed_mc.tar.gz 25223180 BLAKE2B 05dd8772d559e8f08e28dc16
 DIST NNPDF23_nnlo_as_0119_qed_mc.tar.gz 28940412 BLAKE2B 57c7c98bb863258f87e236fea2d0233ac61350012aec6ba5cced75de0b4b945a5633d7fd487b0913b822df1c3ef804de2aacf34b1319d6973d959dc02ebbc9b2 SHA512 5088c30acbd1da4e412ba9f6a997ceaa34f426f41c7ebacaf4d2e8aa49b8b45052913e8d873b293d9f140c01e82c05735b66dd527a9aa124b86f73bf5e4d8c53
 DIST cteq66.tar.gz 8647237 BLAKE2B 3ac47b6eee434f89ff329cfcb8268782af4ffa552ca4b412a59254e9b10410518f9fe9543b47f193d9cd31b06fc1101556df2be01c25ca17febcb9fb1855e5ca SHA512 25d0fa01dcdb59d71c7092367af8258471a2bc6dfd146766cc79f90ffb0feafa0f2011d0a37a7d75315c10ba7c7a6e3fa583d9c0a28119b072228ac800294e48
 DIST cteq6l1.tar.gz 317834 BLAKE2B eccad131853f9a760d0dfd43a3f8705f8edbac3ec7373de9ef9a8936f13ba06500ba5758cd04649dd1b85ac04fc778e9d96222877e74e9ff02263455b233fa41 SHA512 7177608e97077eaf45a292db4ea74eb9a28b4b500ab8be02098b4837a5583cd397828abc3bf43ead448926eaa75ae3968bd059ecde333d90ed6e4295cbe1873c
-DIST lutp0613man2.pdf 2902047 BLAKE2B c2f8e8f9031c843933cd927b32921813b580a1811733279d67ece7d1181a47225bc37e5a3de57b48ec353db46362fb313c986edde00efb5268f1fc86200e32f5 SHA512 a8439b3b150b6f3924d4d3671a4fad6a815c374b1f46060072ca6c1faa797a2f73f8727920aaa7ae885c4f6f135c8d8f94d43e518cfe25271bb95652112def58
-DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B ec655014d3904b66da4a1e748a37c366c2adf9e914b9abf8c38968dcbc09129badcccd2705bc9437c05e73ee4489807835383546f55fbc9cd65399fb507e704e SHA512 ba921379a6df4ca417b60ea5b78af506f13135cdf896fa6beeca9713428ad6f298c94c0fe65fca3e583f8f268dcf84ebe4f1f81b46fd865d5f641f7c1e9fa7e1
-DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
-DIST pythia6428-split.tgz 689807 BLAKE2B 5acb53a75db22509e3def7d0a2fa31672e50f8db6ce64052ba0b68869c706c44e810f288f08fbbba3ef5a0c78c937556a290651f172bdec4158702fc1a76a7ac SHA512 48c08f0212b8cd7847f19d381ff4412acc3eb72fc99ed3254bff770faec500f113367e8cb37740486bd18678d6862433653b549059d0545374d069d551d4b506
-DIST pythia8245.tgz 23605527 BLAKE2B 1007c2f8b50a115d29fe1b0363a187feca717cb2147ef759e999aeaf51ac457e9edbbdc78be47ed57d008e572b99fb327823249b31596241ee72ff587b81c8f1 SHA512 1cc579581475bfe2381059cc4789069041fa63649c86353f65cc2baa12c85142fb6c087e1607c2004b6284a21cada30a172da9853a71afa01c787272a7534574
-DIST pythia8309.tgz 28407620 BLAKE2B 0ef226e2e65829952d670b57c24bff2108d916ca547233041e97dabb81d9616be3e404da7225f9cb4a2c9773c0c22939d813eaed92560e01c6fbe37e4690c232 SHA512 c7d99a9a1f7bf1441532720667ab224283b866e7f3ea9e730c839ac62e3b8b9e5c01471fb94a4a48d481635544e4ed230796a710531650bfffde96f0f78590bf
-DIST pythia8311.tgz 28757044 BLAKE2B 93a7cc26682bc6418f85e41def94a8cdfe39e180fa9fec2a6e47e9237fc2d42800dca2b76f54e2d56cb1d3a2b9a0008baf7b77610aabac2a6505fe08b2b4ffe2 SHA512 e0ae6cb444f11f3e3cf84d738b8c135f07ceafb28911b855bb63e3c596c5b9fd312a1f4ff78a098b707bfbb8f517a46177c4dbc57b4882cf03b12b0be49e2885
-DIST pythia8312.tgz 30218597 BLAKE2B 71efca55572a241cf369e90186b033fbcd2326de82867f3f13057fbda372885632cab3d7b34ac5b444419bba4dd8d6c4bb90e12bf2424a43ae313c21268e8d89 SHA512 683ece1bd2cfd49d9cee742ce3fab693c5bf15017a6584d33e2a00bd0f0a67d1b84ff48da75f39cb4a4b564b9a35f997ab5187fe691f1f4b724cec5a4d717a23
-DIST pythia8313.tgz 29957501 BLAKE2B 2149cafba036d09a66b874c775f4a425d5bbdd65d37f23c851f9cd3f7026ae45581187542d11ae5bbc18b7280fbc14e4daabd684b71c4437b3d9d1a4429f254a SHA512 1753323aa021ec5d999056517dc021fd73b7331441ff4c841d559df884700cc997e6384043de7c15a054ec8a3b2d76f1cb9f5edc7c6141f08f70d49ca5f6fb84
-DIST pythia8314.tgz 30007148 BLAKE2B e953496c67e7678d6bb30660b83eba4928e7696e582924971ffb07aedc76baab5ab9103e720b49eac5d4f8014131926726df322e808e38416f395aa9f9f4776f SHA512 bd21f56a8a07f3f9198328cddaa5b6c7fb0f048e2ab17d2f4e9da17dc98039dbb0df3cb1022a0d1030bc9eeda59036bc0a7299a5df38d202ee3c58f484e1635e
-DIST pythia8315.tgz 30604140 BLAKE2B 0a9e799cde433cd0fac3645c4fed84404184f5d0a112bb19561b1d6d3b1bd5b1269cf07fb81f032ece07db683e8f919d0300a83997fe4fd6d39087ddee63d329 SHA512 37919544e5fe49194aae712ab34890c242e4da13a814e21b823d3835cc806d157e1cafff3fd93f27c0c30aab894b045e2b6e240e4dbd54bc4d6252698ff2356a
 DIST pythia8316.tgz 30428099 BLAKE2B d78bf0f9ae1978b46ae94322dbe63c010a05cd17deb441bbee4851af8d5920592b83386fd7c96dce0bcf47218b4360d56037ee52a6f9a8e29e01a85bc2f00419 SHA512 3c308b09e25856d079f1b5790e2560d28fc6e9ae23ece70f37efa53569360747e74ad7264604e8f2f99a75b3a18059196e71b375ad2321abfd2c5ceab1e0ec66
diff --git a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
deleted file mode 100644
index 45cbe3ea57d6..000000000000
--- a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/766306
---- a/pythia6_common_address.c
-+++ b/pythia6_common_address.c
-@@ -48,28 +48,28 @@
- # define pybins PYBINS
- #endif
- 
--int pyjets[2+5*4000+2*2*5*4000];
--int pydat1[200+2*200+200+2*200];
--int pydat2[4*500+2*4*500+2*2000+2*4*4];
--int pydat3[3*500+2*8000+2*8000+5*8000];  /* KNDCAY=8000 */
--char pydat4[2*500*16];
--int pydatr[6+2*100];
--int pysubs[2+500+81*2+2*200];
--int pypars[200+2*200+200+2*200];
--int pyint1[400+2*400];
--int pyint2[500+2*500+2*20*500+2*4*40];
--int pyint3[2*81*2+3*1000+2*1000];
--int pyint4[500+2*5*500];
--int pyint5[1+3*501+2*3*501];
--char pyint6[501*28];
--int pyint7[2*6*7*7];
--int pyint8[2*5*13];
--int pyint9[2*4*13];
--int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */
--int pymssm[100+2*100];
--int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
--int pyints[2*20];
--int pybins[4+1000+2*20000];
-+static int pyjets[2+5*4000+2*2*5*4000];
-+static int pydat1[200+2*200+200+2*200];
-+static int pydat2[4*500+2*4*500+2*2000+2*4*4];
-+static int pydat3[3*500+2*8000+2*8000+5*8000];  /* KNDCAY=8000 */
-+static char pydat4[2*500*16];
-+static int pydatr[6+2*100];
-+static int pysubs[2+500+81*2+2*200];
-+static int pypars[200+2*200+200+2*200];
-+static int pyint1[400+2*400];
-+static int pyint2[500+2*500+2*20*500+2*4*40];
-+static int pyint3[2*81*2+3*1000+2*1000];
-+static int pyint4[500+2*5*500];
-+static int pyint5[1+3*501+2*3*501];
-+static char pyint6[501*28];
-+static int pyint7[2*6*7*7];
-+static int pyint8[2*5*13];
-+static int pyint9[2*4*13];
-+static int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */
-+static int pymssm[100+2*100];
-+static int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
-+static int pyints[2*20];
-+static int pybins[4+1000+2*20000];
- 
- void *pythia6_common_address(const char* name) {
-    if      (!strcmp(name,"PYJETS")) return pyjets;
diff --git a/sci-physics/pythia/files/pythia8209-root-noninteractive.patch b/sci-physics/pythia/files/pythia8209-root-noninteractive.patch
deleted file mode 100644
index 4581eaea389b..000000000000
--- a/sci-physics/pythia/files/pythia8209-root-noninteractive.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- pythia8209/examples/main91.cc.orig	2015-06-05 07:44:27.000000000 +0300
-+++ pythia8209/examples/main91.cc	2015-06-05 08:17:22.477228166 +0300
-@@ -62,13 +62,9 @@
-   // Statistics on event generation.
-   pythia.stat();
- 
--  // Show histogram. Possibility to close it.
--  mult->Draw();
--  std::cout << "\nDouble click on the histogram window to quit.\n";
--  gPad->WaitPrimitive();
--
-   // Save histogram on file and close file.
-   mult->Write();
-+  outFile->Close();
-   delete outFile;
- 
-   // Done.
diff --git a/sci-physics/pythia/metadata.xml b/sci-physics/pythia/metadata.xml
index 83c4269ba5fd..8ee0b2d18479 100644
--- a/sci-physics/pythia/metadata.xml
+++ b/sci-physics/pythia/metadata.xml
@@ -23,8 +23,6 @@
  
  <use>
   <flag name="fastjet">Build jets using the <pkg>sci-physics/fastjet</pkg> package</flag>
-  <flag name="hepmc">Adds support for High Energy Physics Monte Carlo Generators <pkg>sci-physics/hepmc</pkg></flag>
-  <flag name="hepmc2">Adds support for High Energy Physics Monte Carlo Generators 2 <pkg>sci-physics/hepmc</pkg></flag>
   <flag name="hepmc3">Adds support for High Energy Physics Monte Carlo Generators 3 <pkg>sci-physics/hepmc</pkg></flag>
   <flag name="lhapdf">Support the use of external PDF sets via <pkg>sci-physics/lhapdf</pkg></flag>
   <flag name="root">Use <pkg>sci-physics/root</pkg> trees and histograms (in examples only)</flag>
diff --git a/sci-physics/pythia/pythia-6.4.28-r2.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
deleted file mode 100644
index ba5c26c40b9b..000000000000
--- a/sci-physics/pythia/pythia-6.4.28-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic fortran-2
-
-MV=$(ver_cut 1)
-MY_PN=${PN}${MV}
-DOC_PV=0613
-EX_PV=6.4.18
-MY_PV=${PV//./}
-PYR_P=pythia6-20160413
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia6.hepforge.org/"
-
-# pythia6 from root is needed for some files to interface pythia6 with root.
-# To produce a split version, replace the 6.4.x by the current version:
-# svn export http://svn.hepforge.org/pythia6/tags/v_6_4_x/ pythia-6.4.x
-# tar cJf pythia-6.4.x.tar.xz
-
-SRC_URI="
-	https://pythia.org/download/pythia6/pythia${MY_PV}-split.tgz
-	https://root.cern.ch/download/pythia6.tar.gz -> ${PYR_P}.tar.gz
-	doc? ( https://pythia.org/download/pythia6/lutp${DOC_PV}man2.pdf )
-	examples? ( mirror://gentoo/${PN}-${EX_PV}-examples.tar.bz2 )"
-
-SLOT="6"
-LICENSE="public-domain"
-KEYWORDS="amd64 ~x86"
-IUSE="doc examples"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-# workaround to official pythia-split not having a pythia subdir
-src_unpack() {
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	unpack pythia${MY_PV}-split.tgz
-	cd "${WORKDIR}" || die
-	default
-}
-
-src_prepare() {
-	cp ../pythia6/tpythia6_called_from_cc.F .
-	cp ../pythia6/pythia6_common_address.c .
-	default
-
-	cat > configure.ac <<-EOF || die
-		AC_INIT(${PN},${PV})
-		AM_INIT_AUTOMAKE
-		AC_PROG_F77
-		LT_INIT
-		AC_CHECK_LIB(m,sqrt)
-		AC_CONFIG_FILES(Makefile)
-		AC_OUTPUT
-	EOF
-	echo >> Makefile.am "lib_LTLIBRARIES = libpythia6.la" || die
-	echo >> Makefile.am "libpythia6_la_SOURCES = \ " || die
-	# replace wildcard from makefile to ls in shell
-	local f
-	for f in py*.f struct*.f up*.f fh*.f; do
-		echo  >> Makefile.am "  ${f} \\" || die
-	done
-	echo  >> Makefile.am "  ssmssm.f sugra.f visaje.f pdfset.f \\" || die
-	echo  >> Makefile.am "  tpythia6_called_from_cc.F pythia6_common_address.c" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/927728
-	#
-	# Fixed in SLOT 8, so no point in reporting it upstream or trying to fix
-	# it. The 6.x series is explicitly unsupported but graciously hosted "for
-	# reproduction of historic results".
-	#
-	# Anyway, the actual error is fortran related. The big feature of 8.x was
-	# porting to C++.
-	filter-lto
-
-	econf --disable-static
-}
-
-src_install() {
-	default
-	dodoc update_notes.txt
-	use doc && dodoc "${DISTDIR}"/lutp${DOC_PV}man2.pdf
-	if use examples; then
-		dodoc -r "${WORKDIR}"/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-physics/pythia/pythia-8.2.45-r2.ebuild b/sci-physics/pythia/pythia-8.2.45-r2.ebuild
deleted file mode 100644
index 453e094a15e0..000000000000
--- a/sci-physics/pythia/pythia-8.2.45-r2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MV=$(ver_cut 1)$(ver_cut 2)
-MY_P="${PN}${PV//./}"
-LHA_VER="6.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="https://pythia.org/"
-SRC_URI="https://pythia.org/download/${PN}${MV}/${MY_P}.tgz
-	test? ( lhapdf? (
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/CT10.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/MRST2007lomod.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/cteq66.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/cteq6l1.tar.gz
-		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/unvalidated/MRST2004qed.tar.gz
-	) )"
-
-SLOT="8"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples fastjet +hepmc lhapdf root test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	fastjet? ( sci-physics/fastjet )
-	hepmc? ( sci-physics/hepmc:2= )
-	lhapdf? ( sci-physics/lhapdf:= )
-	zlib? ( virtual/zlib:= )"
-# ROOT is used only when building related tests
-DEPEND="${RDEPEND}
-	test? (
-		root? ( sci-physics/root:= )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}8209-root-noninteractive.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use root && ! use test; then
-		ewarn "ROOT support will only affect examples code build during test stage."
-		ewarn "Since you have tests disabled, this is a no-op."
-	fi
-}
-
-src_prepare() {
-	PYTHIADIR="/usr/share/pythia8"
-	EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
-
-	default
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s|../share/Pythia8/xmldoc|${EPYTHIADIR}/xmldoc|" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|-O2|${CXXFLAGS}|g" \
-		-e "s|Cint|Core|g" \
-		configure || die
-	sed -i 's|$(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED)|$(CXX) $(LDFLAGS) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED)|g' \
-		Makefile || die
-	sed -i 's|$(CXX)|$(CXX) $(LDFLAGS)|' examples/Makefile || die
-	# we use lhapdf6 instead of lhapdf5
-	# some PDFs changed, use something similar
-	sed -i \
-		-e "s|LHAPDF5|LHAPDF6|g" \
-		-e "s|\.LHgrid||g" \
-		-e "s|\.LHpdf||g" \
-		-e "s|MRST2001lo|MRST2007lomod|g" \
-		-e "s|cteq6ll|cteq6l1|g" \
-		-e "s|cteq6m|cteq66|g" \
-		examples/*.{cc,cmnd} || die
-	# After lhapdf5->6 migration PDFs are identical within ~1/1000
-	# https|//www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
-	sed -i \
-		-e "s|1e-8|3e-1|g" \
-		-e "s|nlo_as_0119_qed|nlo_as_0119_qed_mc|g" \
-		-e "s|xmldoc|share/Pythia8/xmldoc|g" \
-		examples/main54.cc || die
-	# ask cflags from root
-	sed -i "s|root-config|root-config --cflags|g" examples/Makefile || die
-
-	sed -i \
-		-e '/TARGETS=$(LOCAL_LIB)\/libpythia8\.a/d' \
-		-e 's|libpythia8\.a$|libpythia8$(LIB_SUFFIX)|g' \
-		Makefile || die
-	sed -i 's|libpythia8\.a|libpythia8$(LIB_SUFFIX)|g' \
-		examples/Makefile || die
-}
-
-# TODO: the following optional packages are out of Gentoo tree:
-# - EvtGen http://atlas-computing.web.cern.ch/atlas-computing/links/externalDirectory/EvtGen/
-# - PowHEG http://powhegbox.mib.infn.it/
-# - ProMC  https://github.com/Argonne-National-Laboratory/ProMC/
-src_configure() {
-	# homemade configure script
-	./configure \
-		--arch=Linux \
-		--cxx="$(tc-getCXX)" \
-		--enable-shared \
-		--prefix="${EPREFIX}/usr" \
-		--prefix-lib="$(get_libdir)" \
-		--prefix-share="${EPYTHIADIR}" \
-		$(usex fastjet "--with-fastjet3" "") \
-		$(usex zlib "--with-gzip" "") \
-		$(usex hepmc "--with-hepmc2" "") \
-		$(usex lhapdf "--with-lhapdf6
-			--with-lhapdf6-plugin=LHAPDF6.h
-			--with-lhapdf6-lib=${EPREFIX}/usr/$(get_libdir)" "") \
-		$(usex root "--with-root
-			--with-root-include=${EPREFIX}/usr/include/root
-			--with-root-lib=${EPREFIX}/usr/$(get_libdir)/root" "") \
-		|| die
-
-	# fix pythia config script
-	sed -i \
-		-e 's|pythia8/examples/Makefile.inc|pythia8/Makefile.inc|' \
-		-e 's|LINE%=|LINE%%=|' \
-		bin/pythia8-config || die
-}
-
-src_test() {
-	cd examples || die
-
-	local tests="$(echo main{{01..32},37,38,61,62,73,80}.out)"
-	use hepmc && tests+=" $(echo main{41,42,85,86}.out)"
-	use hepmc && use lhapdf && tests+=" $(echo main{43,{87..89}}.out)"
-	use lhapdf && tests+=" $(echo main{51..54}.out)"
-	use fastjet && tests+=" $(echo main{71,72}.out)"
-	use fastjet && use hepmc && use lhapdf && tests+=" $(echo main{81..84}).out"
-	use root && tests+=" main91.out"
-	# Disabled tests:
-	# 33	needs PowHEG
-	# 46	needs ProMC
-	# 48	needs EvtGen
-	# 92	generated ROOT dictionary is badly broken
-
-	# use emake for parallel instead of long runmains
-	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-	PYTHIA8DATA="../share/Pythia8/xmldoc/" \
-	LHAPDF_DATA_PATH="${WORKDIR}" \
-	emake ${tests}
-	emake clean
-}
-
-src_install() {
-	# make install is too broken, much easier to install manually
-	dobin bin/pythia8-config
-	doheader -r include/*
-	dolib.so lib/libpythia8.so
-	use lhapdf && dolib.so lib/libpythia8lhapdf6.so
-	insinto "${PYTHIADIR}"
-	doins -r share/Pythia8/xmldoc examples/Makefile.inc
-
-	newenvd - 99pythia8 <<- _EOF_
-		PYTHIA8DATA=${EPYTHIADIR}/xmldoc
-	_EOF_
-
-	dodoc AUTHORS GUIDELINES README
-	if use doc; then
-		dodoc -r share/Pythia8/pdfdoc/.
-		dodoc -r share/Pythia8/htmldoc/.
-	fi
-	if use examples; then
-		# reuse system Makefile.inc
-		rm examples/Makefile.inc || die
-		sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
-			examples/Makefile || die
-
-		insinto /usr/share/${PN}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# cleanup
-	unset PYTHIADIR EPYTHIADIR
-}
diff --git a/sci-physics/pythia/pythia-8.3.09.ebuild b/sci-physics/pythia/pythia-8.3.09.ebuild
deleted file mode 100644
index 7c005eda4b0c..000000000000
--- a/sci-physics/pythia/pythia-8.3.09.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MV=$(ver_cut 1-2)
-MY_P="${PN}${PV//./}"
-LHA_VER="6.2.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="https://pythia.org/"
-SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
-	test? ( lhapdf? (
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/CT10.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/MRST2007lomod.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq66.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq6l1.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2004qed.tar.gz
-	) )"
-
-SLOT="8"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( hepmc3 hepmc2 )
-"
-
-RDEPEND="
-	fastjet? ( sci-physics/fastjet )
-	hepmc3? ( sci-physics/hepmc:3= )
-	hepmc2? ( sci-physics/hepmc:2= )
-	lhapdf? ( sci-physics/lhapdf:= )
-	zlib? ( virtual/zlib:= )"
-# ROOT is used only when building related tests
-DEPEND="${RDEPEND}
-	test? (
-		root? ( sci-physics/root:= )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}8209-root-noninteractive.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use root && ! use test; then
-		ewarn "ROOT support will only affect examples code build during test stage."
-		ewarn "Since you have tests disabled, this is a no-op."
-	fi
-}
-
-src_prepare() {
-	PYTHIADIR="/usr/share/Pythia8"
-	EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
-
-	default
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s|../share/Pythia8/xmldoc|${EPYTHIADIR}/xmldoc|" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|-O2|${CXXFLAGS}|g" \
-		-e "s|Cint|Core|g" \
-		configure || die
-	sed -i 's|$(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED)|$(CXX) $(LDFLAGS) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED)|g' \
-		Makefile || die
-	sed -i 's|$(CXX)|$(CXX) $(LDFLAGS)|' examples/Makefile || die
-	# we use lhapdf6 instead of lhapdf5
-	# some PDFs changed, use something similar
-	sed -i \
-		-e "s|LHAPDF5|LHAPDF6|g" \
-		-e "s|\.LHgrid||g" \
-		-e "s|\.LHpdf||g" \
-		-e "s|MRST2001lo|MRST2007lomod|g" \
-		-e "s|cteq6ll|cteq6l1|g" \
-		-e "s|cteq6m|cteq66|g" \
-		examples/*.{cc,cmnd} || die
-	# After lhapdf5->6 migration PDFs are identical within ~1/1000
-	# https|//www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
-	sed -i \
-		-e "s|1e-8|3e-1|g" \
-		-e "s|nlo_as_0119_qed|nlo_as_0119_qed_mc|g" \
-		-e "s|xmldoc|share/Pythia8/xmldoc|g" \
-		examples/main54.cc || die
-	# ask cflags from root
-	sed -i "s|root-config|root-config --cflags|g" examples/Makefile || die
-
-	sed -i 's|libpythia8\.a|libpythia8$(LIB_SUFFIX)|g' \
-		examples/Makefile || die
-}
-
-# TODO: the following optional packages are out of Gentoo tree:
-# - EvtGen http://atlas-computing.web.cern.ch/atlas-computing/links/externalDirectory/EvtGen/
-# - PowHEG http://powhegbox.mib.infn.it/
-# - ProMC  https://github.com/Argonne-National-Laboratory/ProMC/
-src_configure() {
-	# homemade configure script
-	./configure \
-		--arch=Linux \
-		--cxx="$(tc-getCXX)" \
-		--prefix="${EPREFIX}/usr" \
-		--prefix-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix-share="${EPYTHIADIR}" \
-		$(usex fastjet "--with-fastjet3" "") \
-		$(usex zlib "--with-gzip" "") \
-		$(use_with hepmc3) \
-		$(use_with hepmc2) \
-		$(usex lhapdf "--with-lhapdf6
-			--with-lhapdf6-plugin=LHAPDF6.h
-			--with-lhapdf6-lib=${EPREFIX}/usr/$(get_libdir)" "") \
-		$(usex root "--with-root
-			--with-root-include=${EPREFIX}/usr/include/root
-			--with-root-lib=${EPREFIX}/usr/$(get_libdir)/root" "") \
-		|| die
-
-	# fix pythia config script
-	sed -i \
-		-e 's|Pythia8/examples/Makefile.inc|Pythia8/Makefile.inc|' \
-		-e 's|LINE%=|LINE%%=|' \
-		bin/pythia8-config || die
-}
-
-src_test() {
-	cd examples || die
-
-	local tests="$(echo main{{01..32},37,38,61,62,73,80}.out)"
-	use hepmc3 && tests+=" $(echo main{41,42,85,86}.out)"
-	use hepmc3 && use lhapdf && tests+=" $(echo main{43,{87..89}}.out)"
-	use lhapdf && tests+=" $(echo main{51..54}.out)"
-	use fastjet && tests+=" $(echo main{71,72}.out)"
-	use fastjet && use hepmc3 && use lhapdf && tests+=" $(echo main{81..84}).out"
-	use root && tests+=" main91.out"
-	# Disabled tests:
-	# 33	needs PowHEG
-	# 46	needs ProMC
-	# 48	needs EvtGen
-	# 92	generated ROOT dictionary is badly broken
-
-	# use emake for parallel instead of long runmains
-	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-	PYTHIA8DATA="../share/Pythia8/xmldoc/" \
-	LHAPDF_DATA_PATH="${WORKDIR}" \
-	emake ${tests}
-	emake clean
-}
-
-src_install() {
-	# make install is too broken, much easier to install manually
-	dobin bin/pythia8-config
-	doheader -r include/*
-	dolib.so lib/libpythia8.so
-	use lhapdf && dolib.so lib/libpythia8lhapdf6.so
-	insinto "${PYTHIADIR}"
-	doins -r share/Pythia8/xmldoc share/Pythia8/pdfdata examples/Makefile.inc
-
-	newenvd - 99pythia8 <<- _EOF_
-		PYTHIA8DATA=${EPYTHIADIR}/xmldoc
-	_EOF_
-
-	dodoc AUTHORS GUIDELINES README
-	if use doc; then
-		dodoc -r share/Pythia8/pdfdoc/.
-		dodoc -r share/Pythia8/htmldoc/.
-	fi
-	if use examples; then
-		# reuse system Makefile.inc
-		rm examples/Makefile.inc || die
-		sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
-			examples/Makefile || die
-
-		insinto /usr/share/${PN}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# cleanup
-	unset PYTHIADIR EPYTHIADIR
-}
diff --git a/sci-physics/pythia/pythia-8.3.11.ebuild b/sci-physics/pythia/pythia-8.3.11.ebuild
deleted file mode 100644
index 06073c213fa5..000000000000
--- a/sci-physics/pythia/pythia-8.3.11.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MV=$(ver_cut 1-2)
-MY_P="${PN}${PV//./}"
-LHA_VER="6.2.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="https://pythia.org/"
-SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
-	test? ( lhapdf? (
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/CT10.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/MRST2007lomod.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq66.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq6l1.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2004qed.tar.gz
-	) )
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="8"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( hepmc3 hepmc2 )
-"
-
-RDEPEND="
-	fastjet? ( sci-physics/fastjet )
-	hepmc3? ( sci-physics/hepmc:3= )
-	hepmc2? ( sci-physics/hepmc:2= )
-	lhapdf? ( sci-physics/lhapdf:= )
-	zlib? ( virtual/zlib:= )"
-DEPEND="${RDEPEND}"
-# ROOT is used only when building related tests
-BDEPEND="
-	test? (
-		root? ( sci-physics/root:= )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}8209-root-noninteractive.patch
-)
-
-pkg_pretend() {
-	if use root && ! use test; then
-		ewarn "ROOT support will only affect examples code build during test stage."
-		ewarn "Since you have tests disabled, this is a no-op."
-	fi
-}
-
-src_prepare() {
-	PYTHIADIR="/usr/share/Pythia8"
-	EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
-
-	default
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s|../share/Pythia8/xmldoc|${EPYTHIADIR}/xmldoc|" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|-O2|${CXXFLAGS}|g" \
-		-e "s|Cint|Core|g" \
-		configure || die
-	# we use lhapdf6 instead of lhapdf5
-	# some PDFs changed, use something similar
-	sed -i \
-		-e "s|LHAPDF5|LHAPDF6|g" \
-		-e "s|\.LHgrid||g" \
-		-e "s|\.LHpdf||g" \
-		-e "s|MRST2001lo|MRST2007lomod|g" \
-		-e "s|cteq6ll|cteq6l1|g" \
-		-e "s|cteq6m|cteq66|g" \
-		examples/*.{cc,cmnd} || die
-	# After lhapdf5->6 migration PDFs are identical within ~1/1000
-	# https|//www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
-	sed -i \
-		-e "s|1e-8|3e-1|g" \
-		-e "s|nlo_as_0119_qed|nlo_as_0119_qed_mc|g" \
-		-e "s|xmldoc|share/Pythia8/xmldoc|g" \
-		examples/main54.cc || die
-	# ask cflags from root
-	sed -i "s|root-config|root-config --cflags|g" examples/Makefile || die
-
-	sed -i 's|libpythia8\.a|libpythia8$(LIB_SUFFIX)|g' \
-		examples/Makefile || die
-}
-
-# TODO: the following optional packages are out of Gentoo tree:
-# - EvtGen http://atlas-computing.web.cern.ch/atlas-computing/links/externalDirectory/EvtGen/
-# - PowHEG http://powhegbox.mib.infn.it/
-# - ProMC  https://github.com/Argonne-National-Laboratory/ProMC/
-src_configure() {
-	# homemade configure script
-	local -x CXX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
-	./configure \
-		--arch=Linux \
-		--prefix="${EPREFIX}/usr" \
-		--prefix-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix-share="${EPYTHIADIR}" \
-		$(usex fastjet "--with-fastjet3" "") \
-		$(usex zlib "--with-gzip" "") \
-		$(use_with hepmc3) \
-		$(use_with hepmc2) \
-		$(usex lhapdf "--with-lhapdf6
-			--with-lhapdf6-plugin=LHAPDF6.h
-			--with-lhapdf6-lib=${EPREFIX}/usr/$(get_libdir)" "") \
-		$(usex root "--with-root
-			--with-root-include=${EPREFIX}/usr/include/root
-			--with-root-lib=${EPREFIX}/usr/$(get_libdir)/root" "") \
-		|| die
-
-	# fix pythia config script
-	sed -i \
-		-e 's|Pythia8/examples/Makefile.inc|Pythia8/Makefile.inc|' \
-		-e "s|CFG_FILE=.*|CFG_FILE=${EPYTHIADIR}/Makefile.inc|" \
-		-e 's|LINE%=|LINE%%=|' \
-		bin/pythia8-config || die
-}
-
-src_test() {
-	cd examples || die
-
-	local tests="$(echo main{{01..32},37,38,61,62,73,80}.out)"
-	use hepmc3 && tests+=" $(echo main{41,42,85,86}.out)"
-	use hepmc3 && use lhapdf && tests+=" $(echo main{43,{87..89}}.out)"
-	use lhapdf && tests+=" $(echo main{51..54}.out)"
-	use fastjet && tests+=" $(echo main{71,72}.out)"
-	use fastjet && use hepmc3 && use lhapdf && tests+=" $(echo main{81..84}).out"
-	use root && tests+=" main91.out"
-	# Disabled tests:
-	# 33	needs PowHEG
-	# 46	needs ProMC
-	# 48	needs EvtGen
-	# 92	generated ROOT dictionary is badly broken
-
-	# use emake for parallel instead of long runmains
-	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-	PYTHIA8DATA="../share/Pythia8/xmldoc/" \
-	LHAPDF_DATA_PATH="${WORKDIR}" \
-	emake ${tests}
-	emake clean
-}
-
-src_install() {
-	# make install is too broken, much easier to install manually
-	dobin bin/pythia8-config
-	doheader -r include/*
-	dolib.so lib/libpythia8.so
-	use lhapdf && dolib.so lib/libpythia8lhapdf6.so
-	insinto "${PYTHIADIR}"
-	doins -r share/Pythia8/xmldoc share/Pythia8/pdfdata examples/Makefile.inc
-
-	newenvd - 99pythia8 <<- _EOF_
-		PYTHIA8DATA=${EPYTHIADIR}/xmldoc
-	_EOF_
-
-	dodoc AUTHORS GUIDELINES README
-	if use doc; then
-		dodoc -r share/Pythia8/pdfdoc/.
-		dodoc -r share/Pythia8/htmldoc/.
-	fi
-	if use examples; then
-		# reuse system Makefile.inc
-		rm examples/Makefile.inc || die
-		sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
-			examples/Makefile || die
-
-		insinto /usr/share/${PN}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# cleanup
-	unset PYTHIADIR EPYTHIADIR
-}
diff --git a/sci-physics/pythia/pythia-8.3.12.ebuild b/sci-physics/pythia/pythia-8.3.12.ebuild
deleted file mode 100644
index 452d38f40eae..000000000000
--- a/sci-physics/pythia/pythia-8.3.12.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-inherit toolchain-funcs python-single-r1
-
-MV=$(ver_cut 1-2)
-MY_P="${PN}${PV//./}"
-LHA_VER="6.2.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="https://pythia.org/"
-SRC_URI="test? ( lhapdf? (
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/CT10.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/MRST2007lomod.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq66.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq6l1.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2004qed.tar.gz
-	) )
-"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/Pythia8/releases"
-else
-	SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
-	${SRC_URI}"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="8"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python highfive mpich rivet" # evtgen mg5mes rivet powheg
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( hepmc3 hepmc2 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	fastjet? ( sci-physics/fastjet )
-	hepmc3? ( sci-physics/hepmc:3= )
-	hepmc2? ( sci-physics/hepmc:2= )
-	lhapdf? ( sci-physics/lhapdf:= )
-	zlib? ( virtual/zlib:= )
-	highfive? (
-		sci-libs/highfive
-		sci-libs/hdf5[cxx]
-	)
-	rivet? (
-		sci-physics/rivet:*
-	)
-	mpich? ( sys-cluster/mpich )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${RDEPEND}"
-# ROOT is used only when building related tests
-BDEPEND="
-	test? (
-		root? ( sci-physics/root:= )
-	)
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-pkg_pretend() {
-	if use root && ! use test; then
-		ewarn "ROOT support will only affect examples code build during test stage."
-		ewarn "Since you have tests disabled, this is a no-op."
-	fi
-}
-
-src_prepare() {
-	PYTHIADIR="/usr/share/Pythia8"
-	EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
-
-	default
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s|../share/Pythia8/xmldoc|${EPYTHIADIR}/xmldoc|" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|-O2|${CXXFLAGS}|g" \
-		-e "s|Cint|Core|g" \
-		configure || die
-	# we use lhapdf6 instead of lhapdf5
-	# some PDFs changed, use something similar
-	sed -i \
-		-e "s|LHAPDF5|LHAPDF6|g" \
-		-e "s|\.LHgrid||g" \
-		-e "s|\.LHpdf||g" \
-		-e "s|MRST2001lo|MRST2007lomod|g" \
-		-e "s|cteq6ll|cteq6l1|g" \
-		-e "s|cteq6m|cteq66|g" \
-		examples/*.{cc,cmnd} || die
-	# After lhapdf5->6 migration PDFs are identical within ~1/1000
-	# https|//www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
-	sed -i \
-		-e "s|1e-8|3e-1|g" \
-		-e "s|nlo_as_0119_qed|nlo_as_0119_qed_mc|g" \
-		-e "s|xmldoc|share/Pythia8/xmldoc|g" \
-		examples/main203.cc || die
-	# ask cflags from root
-	sed -i "s|root-config|root-config --cflags|g" examples/Makefile || die
-
-	sed -i 's|libpythia8\.a|libpythia8$(LIB_SUFFIX)|g' \
-		examples/Makefile || die
-}
-
-# TODO: the following optional packages are out of Gentoo tree:
-# - EvtGen http://atlas-computing.web.cern.ch/atlas-computing/links/externalDirectory/EvtGen/
-# - PowHEG http://powhegbox.mib.infn.it/
-# - ProMC  https://github.com/Argonne-National-Laboratory/ProMC/
-src_configure() {
-	# homemade configure script
-	local -x CXX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
-	./configure \
-		--arch=Linux \
-		--prefix="${EPREFIX}/usr" \
-		--prefix-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix-share="${EPYTHIADIR}" \
-		$(usex fastjet "--with-fastjet3" "") \
-		$(usex zlib "--with-gzip" "") \
-		$(use_with hepmc3) \
-		$(use_with highfive) \
-		$(usex highfive --with-hdf5 "") \
-		$(use_with python) \
-		$(use_with rivet) \
-		$(use_with mpich) \
-		$(use_with hepmc2) \
-		$(usex lhapdf "--with-lhapdf6
-			--with-lhapdf6-plugin=LHAPDF6.h
-			--with-lhapdf6-lib=${EPREFIX}/usr/$(get_libdir)" "") \
-		$(usex root "--with-root
-			--with-root-include=${EPREFIX}/usr/include/root
-			--with-root-lib=${EPREFIX}/usr/$(get_libdir)/root" "") \
-		|| die
-
-	# fix pythia config script
-	sed -i \
-		-e 's|Pythia8/examples/Makefile.inc|Pythia8/Makefile.inc|' \
-		-e "s|CFG_FILE=.*|CFG_FILE=${EPYTHIADIR}/Makefile.inc|" \
-		-e 's|LINE%=|LINE%%=|' \
-		bin/pythia8-config || die
-}
-
-src_test() {
-	cd examples || die
-
-	local tests="$(echo main{{101..103},{121..127}})"
-	use hepmc3 && tests+=" $(echo main{131..135})"
-	use hepmc3 && use mpich && use highfive && tests+=" $(echo main136)"
-	use lhapdf && tests+=" $(echo main{201..204})"
-	use fastjet && tests+=" $(echo main{211..216})"
-	use root && tests+=" main143"
-	use hepmc3 && use lhapdf && tests+=" $(echo main{133,162})"
-	use fastjet && use hepmc3 && use lhapdf && tests+=" $(echo main161)"
-	# Other tests disabled due to missing dependencies
-
-	# use emake for parallel instead of long runmains
-	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-	PYTHIA8DATA="../share/Pythia8/xmldoc/" \
-	LHAPDF_DATA_PATH="${WORKDIR}" \
-	emake ${tests}
-	emake clean
-}
-
-src_install() {
-	# make install is too broken, much easier to install manually
-	dobin bin/pythia8-config
-	doheader -r include/*
-	dolib.so lib/libpythia8.so
-	use lhapdf && dolib.so lib/libpythia8lhapdf6.so
-	insinto "${PYTHIADIR}"
-	doins -r share/Pythia8/xmldoc share/Pythia8/pdfdata examples/Makefile.inc
-
-	newenvd - 99pythia8 <<- _EOF_
-		PYTHIA8DATA=${EPYTHIADIR}/xmldoc
-	_EOF_
-
-	dodoc AUTHORS GUIDELINES README
-
-	if use doc; then
-		dodoc -r share/Pythia8/pdfdoc/.
-		dodoc -r share/Pythia8/htmldoc/.
-	fi
-	if use examples; then
-		# reuse system Makefile.inc
-		rm examples/Makefile.inc || die
-		sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
-			examples/Makefile || die
-
-		insinto /usr/share/${PN}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	if use python; then
-		local site_dir=$(python_get_sitedir)
-		insinto "${site_dir#${EPREFIX}}"
-		doins lib/pythia8.so
-	fi
-
-	# cleanup
-	unset PYTHIADIR EPYTHIADIR
-}
diff --git a/sci-physics/pythia/pythia-8.3.13-r1.ebuild b/sci-physics/pythia/pythia-8.3.13-r1.ebuild
deleted file mode 100644
index ee4bf3f8adee..000000000000
--- a/sci-physics/pythia/pythia-8.3.13-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-inherit toolchain-funcs python-single-r1
-
-MV=$(ver_cut 1-2)
-MY_P="${PN}${PV//./}"
-LHA_VER="6.2.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="https://pythia.org/"
-SRC_URI="test? ( lhapdf? (
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/CT10.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/MRST2007lomod.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq66.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq6l1.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2004qed.tar.gz
-	) )
-"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/Pythia8/releases"
-else
-	SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
-	${SRC_URI}"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="8"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python highfive mpich rivet" # evtgen mg5mes rivet powheg
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( hepmc3 hepmc2 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	fastjet? ( sci-physics/fastjet )
-	hepmc3? ( sci-physics/hepmc:3= )
-	hepmc2? ( sci-physics/hepmc:2= )
-	lhapdf? ( sci-physics/lhapdf:= )
-	zlib? ( virtual/zlib:= )
-	highfive? (
-		sci-libs/highfive
-		sci-libs/hdf5[cxx]
-	)
-	rivet? (
-		sci-physics/rivet:*
-	)
-	mpich? ( sys-cluster/mpich )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${RDEPEND}"
-# ROOT is used only when building related tests
-BDEPEND="
-	test? (
-		root? ( sci-physics/root:= )
-	)
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-pkg_pretend() {
-	if use root && ! use test; then
-		ewarn "ROOT support will only affect examples code build during test stage."
-		ewarn "Since you have tests disabled, this is a no-op."
-	fi
-}
-
-src_prepare() {
-	PYTHIADIR="/usr/share/Pythia8"
-	EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
-
-	default
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s|../share/Pythia8/xmldoc|${EPYTHIADIR}/xmldoc|" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|-O2|${CXXFLAGS}|g" \
-		-e "s|Cint|Core|g" \
-		configure || die
-	# we use lhapdf6 instead of lhapdf5
-	# some PDFs changed, use something similar
-	sed -i \
-		-e "s|LHAPDF5|LHAPDF6|g" \
-		-e "s|\.LHgrid||g" \
-		-e "s|\.LHpdf||g" \
-		-e "s|MRST2001lo|MRST2007lomod|g" \
-		-e "s|cteq6ll|cteq6l1|g" \
-		-e "s|cteq6m|cteq66|g" \
-		examples/*.{cc,cmnd} || die
-	# After lhapdf5->6 migration PDFs are identical within ~1/1000
-	# https|//www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
-	sed -i \
-		-e "s|1e-8|3e-1|g" \
-		-e "s|nlo_as_0119_qed|nlo_as_0119_qed_mc|g" \
-		-e "s|xmldoc|share/Pythia8/xmldoc|g" \
-		examples/main203.cc || die
-	# ask cflags from root
-	sed -i "s|root-config|root-config --cflags|g" examples/Makefile || die
-
-	sed -i 's|libpythia8\.a|libpythia8$(LIB_SUFFIX)|g' \
-		examples/Makefile || die
-}
-
-# TODO: the following optional packages are out of Gentoo tree:
-# - EvtGen http://atlas-computing.web.cern.ch/atlas-computing/links/externalDirectory/EvtGen/
-# - PowHEG http://powhegbox.mib.infn.it/
-# - ProMC  https://github.com/Argonne-National-Laboratory/ProMC/
-src_configure() {
-	# homemade configure script
-	local -x CXX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
-	./configure \
-		--arch=Linux \
-		--prefix="${EPREFIX}/usr" \
-		--prefix-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix-share="${EPYTHIADIR}" \
-		$(usex fastjet "--with-fastjet3" "") \
-		$(usex zlib "--with-gzip" "") \
-		$(use_with hepmc3) \
-		$(use_with highfive) \
-		$(usex highfive --with-hdf5 "") \
-		$(use_with python) \
-		$(use_with rivet) \
-		$(use_with mpich) \
-		$(use_with hepmc2) \
-		$(usex lhapdf "--with-lhapdf6
-			--with-lhapdf6-plugin=LHAPDF6.h
-			--with-lhapdf6-lib=${EPREFIX}/usr/$(get_libdir)" "") \
-		$(usex root "--with-root
-			--with-root-include=${EPREFIX}/usr/include/root
-			--with-root-lib=${EPREFIX}/usr/$(get_libdir)/root" "") \
-		|| die
-
-	# fix pythia config script
-	sed -i \
-		-e 's|Pythia8/examples/Makefile.inc|Pythia8/Makefile.inc|' \
-		-e "s|CFG_FILE=.*|CFG_FILE=${EPYTHIADIR}/Makefile.inc|" \
-		-e 's|LINE%=|LINE%%=|' \
-		bin/pythia8-config || die
-}
-
-src_test() {
-	cd examples || die
-
-	local tests="$(echo main{{101..103},{121..127}})"
-	use hepmc3 && tests+=" $(echo main{131..135})"
-	use hepmc3 && use mpich && use highfive && tests+=" $(echo main136)"
-	use lhapdf && tests+=" $(echo main{201..204})"
-	use fastjet && tests+=" $(echo main{{211..214},216})" # 215 fails...
-	use root && tests+=" main143"
-	use hepmc3 && use lhapdf && tests+=" $(echo main{133,162})"
-	use fastjet && use hepmc3 && use lhapdf && tests+=" $(echo main161)"
-	# Other tests disabled due to missing dependencies
-
-	# use emake for parallel instead of long runmains
-	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-	PYTHIA8DATA="../share/Pythia8/xmldoc/" \
-	LHAPDF_DATA_PATH="${WORKDIR}" \
-	emake ${tests}
-	emake clean
-}
-
-src_install() {
-	# make install is too broken, much easier to install manually
-	dobin bin/pythia8-config
-	doheader -r include/*
-	dolib.so lib/libpythia8.so
-	use lhapdf && dolib.so lib/libpythia8lhapdf6.so
-	insinto "${PYTHIADIR}"
-	doins -r share/Pythia8/tunes share/Pythia8/xmldoc share/Pythia8/pdfdata examples/Makefile.inc
-
-	newenvd - 99pythia8 <<- _EOF_
-		PYTHIA8DATA=${EPYTHIADIR}/xmldoc
-	_EOF_
-
-	dodoc AUTHORS GUIDELINES README
-
-	if use doc; then
-		dodoc -r share/Pythia8/pdfdoc/.
-		dodoc -r share/Pythia8/htmldoc/.
-	fi
-	if use examples; then
-		# reuse system Makefile.inc
-		rm examples/Makefile.inc || die
-		sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
-			examples/Makefile || die
-
-		insinto /usr/share/${PN}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	if use python; then
-		local site_dir=$(python_get_sitedir)
-		insinto "${site_dir#${EPREFIX}}"
-		doins lib/pythia8.so
-	fi
-
-	# cleanup
-	unset PYTHIADIR EPYTHIADIR
-}
diff --git a/sci-physics/pythia/pythia-8.3.14.ebuild b/sci-physics/pythia/pythia-8.3.14.ebuild
deleted file mode 100644
index 36270efc0ee0..000000000000
--- a/sci-physics/pythia/pythia-8.3.14.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-inherit toolchain-funcs python-single-r1 optfeature
-
-MV=$(ver_cut 1-2)
-MY_P="${PN}${PV//./}"
-LHA_VER="6.2.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="https://pythia.org/"
-SRC_URI="test? ( lhapdf? (
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/CT10.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/MRST2007lomod.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq66.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq6l1.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2004qed.tar.gz
-	) )
-"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/Pythia8/releases"
-else
-	SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
-	${SRC_URI}"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="8"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python highfive mpich rivet" # evtgen mg5mes rivet powheg
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( hepmc3 hepmc2 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	fastjet? ( sci-physics/fastjet )
-	hepmc3? ( sci-physics/hepmc:3= )
-	hepmc2? ( sci-physics/hepmc:2= )
-	lhapdf? ( sci-physics/lhapdf:= )
-	zlib? ( virtual/zlib:= )
-	highfive? (
-		sci-libs/highfive
-		sci-libs/hdf5[cxx]
-	)
-	rivet? (
-		sci-physics/rivet:*
-	)
-	mpich? ( sys-cluster/mpich )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${RDEPEND}"
-# ROOT is used only when building related tests
-BDEPEND="
-	test? (
-		root? ( sci-physics/root:= )
-	)
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-pkg_pretend() {
-	if use root && ! use test; then
-		ewarn "ROOT support will only affect examples code build during test stage."
-		ewarn "Since you have tests disabled, this is a no-op."
-	fi
-}
-
-src_prepare() {
-	PYTHIADIR="/usr/share/Pythia8"
-	EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
-
-	default
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s|../share/Pythia8/xmldoc|${EPYTHIADIR}/xmldoc|" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|-O2|${CXXFLAGS}|g" \
-		-e "s|Cint|Core|g" \
-		configure || die
-	# we use lhapdf6 instead of lhapdf5
-	# some PDFs changed, use something similar
-	sed -i \
-		-e "s|LHAPDF5|LHAPDF6|g" \
-		-e "s|\.LHgrid||g" \
-		-e "s|\.LHpdf||g" \
-		-e "s|MRST2001lo|MRST2007lomod|g" \
-		-e "s|cteq6ll|cteq6l1|g" \
-		-e "s|cteq6m|cteq66|g" \
-		examples/*.{cc,cmnd} || die
-	# After lhapdf5->6 migration PDFs are identical within ~1/1000
-	# https|//www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
-	sed -i \
-		-e "s|1e-8|3e-1|g" \
-		-e "s|nlo_as_0119_qed|nlo_as_0119_qed_mc|g" \
-		-e "s|xmldoc|share/Pythia8/xmldoc|g" \
-		examples/main203.cc || die
-	# ask cflags from root
-	sed -i "s|root-config|root-config --cflags|g" examples/Makefile || die
-
-	sed -i 's|libpythia8\.a|libpythia8$(LIB_SUFFIX)|g' \
-		examples/Makefile || die
-}
-
-# TODO: the following optional packages are out of Gentoo tree:
-# - EvtGen http://atlas-computing.web.cern.ch/atlas-computing/links/externalDirectory/EvtGen/
-# - PowHEG http://powhegbox.mib.infn.it/
-# - ProMC  https://github.com/Argonne-National-Laboratory/ProMC/
-src_configure() {
-	# homemade configure script
-	local -x CXX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
-	./configure \
-		--arch=Linux \
-		--prefix="${EPREFIX}/usr" \
-		--prefix-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix-share="${EPYTHIADIR}" \
-		$(usex fastjet "--with-fastjet3" "") \
-		$(usex zlib "--with-gzip" "") \
-		$(use_with hepmc3) \
-		$(use_with highfive) \
-		$(usex highfive --with-hdf5 "") \
-		$(use_with python) \
-		$(use_with rivet) \
-		$(use_with mpich) \
-		$(use_with hepmc2) \
-		$(usex lhapdf "--with-lhapdf6
-			--with-lhapdf6-plugin=LHAPDF6.h
-			--with-lhapdf6-lib=${EPREFIX}/usr/$(get_libdir)" "") \
-		$(usex root "--with-root
-			--with-root-include=${EPREFIX}/usr/include/root
-			--with-root-lib=${EPREFIX}/usr/$(get_libdir)/root" "") \
-		|| die
-
-	# fix pythia config script
-	sed -i \
-		-e 's|Pythia8/examples/Makefile.inc|Pythia8/Makefile.inc|' \
-		-e "s|CFG_FILE=.*|CFG_FILE=${EPYTHIADIR}/Makefile.inc|" \
-		-e 's|LINE%=|LINE%%=|' \
-		bin/pythia8-config || die
-}
-
-src_test() {
-	cd examples || die
-
-	local tests="$(echo main{{101..103},{121..127}})"
-	use hepmc3 && tests+=" $(echo main{131..135})"
-	use hepmc3 && use mpich && use highfive && tests+=" $(echo main136)"
-	use lhapdf && tests+=" $(echo main{201..204})"
-	use fastjet && tests+=" $(echo main{{211..214},216})" # 215 fails...
-	use root && tests+=" main143"
-	use hepmc3 && use lhapdf && tests+=" $(echo main{133,162})"
-	use fastjet && use hepmc3 && use lhapdf && tests+=" $(echo main161)"
-	# Other tests disabled due to missing dependencies
-
-	# use emake for parallel instead of long runmains
-	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-	PYTHIA8DATA="../share/Pythia8/xmldoc/" \
-	LHAPDF_DATA_PATH="${WORKDIR}" \
-	emake ${tests}
-	emake clean
-}
-
-src_install() {
-	# make install is too broken, much easier to install manually
-	dobin bin/pythia8-config
-	doheader -r include/*
-	dolib.so lib/libpythia8.so
-	use lhapdf && dolib.so lib/libpythia8lhapdf6.so
-	insinto "${PYTHIADIR}"
-	doins -r share/Pythia8/tunes share/Pythia8/xmldoc share/Pythia8/pdfdata examples/Makefile.inc
-
-	newenvd - 99pythia8 <<- _EOF_
-		PYTHIA8DATA=${EPYTHIADIR}/xmldoc
-	_EOF_
-
-	dodoc AUTHORS GUIDELINES README
-
-	if use doc; then
-		dodoc -r share/Pythia8/pdfdoc/.
-		dodoc -r share/Pythia8/htmldoc/.
-	fi
-	if use examples; then
-		# reuse system Makefile.inc
-		rm examples/Makefile.inc || die
-		sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
-			examples/Makefile || die
-
-		insinto /usr/share/${PN}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	if use python; then
-		local site_dir=$(python_get_sitedir)
-		insinto "${site_dir#${EPREFIX}}"
-		doins lib/pythia8.so
-	fi
-
-	# cleanup
-	unset PYTHIADIR EPYTHIADIR
-}
-
-pkg_postinstall() {
-	optfeature "python interface awkward array support" dev-python/awkward
-	optfeature "python interface vector support" dev-python/vector
-}
diff --git a/sci-physics/pythia/pythia-8.3.15.ebuild b/sci-physics/pythia/pythia-8.3.16-r1.ebuild
index b14ee62dd97f..6ecb10f43e31 100644
--- a/sci-physics/pythia/pythia-8.3.15.ebuild
+++ b/sci-physics/pythia/pythia-8.3.16-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..14} )
 inherit toolchain-funcs python-single-r1 optfeature
 
-MV=$(ver_cut 1-2)
+MY_PV=$(ver_cut 1-2)
 MY_P="${PN}${PV//./}"
 LHA_VER="6.2.1"
 
@@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/Pythia8/releases"
 else
-	SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
+	SRC_URI="https://pythia.org/download/${PN}${MY_PV//./}/${MY_P}.tgz
 	${SRC_URI}"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
@@ -34,29 +34,23 @@ fi
 
 LICENSE="GPL-2"
 SLOT="8"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg
+IUSE="doc examples fastjet +hepmc3 lhapdf root test zlib python highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg
 RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( hepmc3 hepmc2 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	fastjet? ( sci-physics/fastjet )
 	hepmc3? ( sci-physics/hepmc:3= )
-	hepmc2? ( sci-physics/hepmc:2= )
 	lhapdf? ( sci-physics/lhapdf:= )
 	zlib? ( virtual/zlib:= )
 	highfive? (
 		sci-libs/highfive
 		sci-libs/hdf5[cxx]
 	)
-	rivet? (
-		>=sci-physics/rivet-4:*
-	)
+	rivet? ( >=sci-physics/rivet-4:* )
 	mpich? ( sys-cluster/mpich )
 	python? ( ${PYTHON_DEPS} )
-	"
+"
 DEPEND="${RDEPEND}"
 # ROOT is used only when building related tests
 BDEPEND="
diff --git a/sci-physics/pythia/pythia-8.3.16.ebuild b/sci-physics/pythia/pythia-8.3.16.ebuild
deleted file mode 100644
index b14ee62dd97f..000000000000
--- a/sci-physics/pythia/pythia-8.3.16.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-inherit toolchain-funcs python-single-r1 optfeature
-
-MV=$(ver_cut 1-2)
-MY_P="${PN}${PV//./}"
-LHA_VER="6.2.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="https://pythia.org/"
-SRC_URI="test? ( lhapdf? (
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/CT10.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/MRST2007lomod.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq66.tar.gz
-		https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq6l1.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2004qed.tar.gz
-	) )
-"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/Pythia8/releases"
-else
-	SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
-	${SRC_URI}"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="8"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( hepmc3 hepmc2 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	fastjet? ( sci-physics/fastjet )
-	hepmc3? ( sci-physics/hepmc:3= )
-	hepmc2? ( sci-physics/hepmc:2= )
-	lhapdf? ( sci-physics/lhapdf:= )
-	zlib? ( virtual/zlib:= )
-	highfive? (
-		sci-libs/highfive
-		sci-libs/hdf5[cxx]
-	)
-	rivet? (
-		>=sci-physics/rivet-4:*
-	)
-	mpich? ( sys-cluster/mpich )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${RDEPEND}"
-# ROOT is used only when building related tests
-BDEPEND="
-	test? (
-		root? ( sci-physics/root:= )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.15-ar.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-pkg_pretend() {
-	if use root && ! use test; then
-		ewarn "ROOT support will only affect examples code build during test stage."
-		ewarn "Since you have tests disabled, this is a no-op."
-	fi
-}
-
-src_prepare() {
-	PYTHIADIR="/usr/share/Pythia8"
-	EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
-
-	default
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s|../share/Pythia8/xmldoc|${EPYTHIADIR}/xmldoc|" \
-		include/Pythia8/Pythia.h || die
-	# respect libdir, prefix, flags
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|-O2|${CXXFLAGS}|g" \
-		-e "s|Cint|Core|g" \
-		configure || die
-	# we use lhapdf6 instead of lhapdf5
-	# some PDFs changed, use something similar
-	sed -i \
-		-e "s|LHAPDF5|LHAPDF6|g" \
-		-e "s|\.LHgrid||g" \
-		-e "s|\.LHpdf||g" \
-		-e "s|MRST2001lo|MRST2007lomod|g" \
-		-e "s|cteq6ll|cteq6l1|g" \
-		-e "s|cteq6m|cteq66|g" \
-		examples/*.{cc,cmnd} || die
-	# After lhapdf5->6 migration PDFs are identical within ~1/1000
-	# https|//www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
-	sed -i \
-		-e "s|1e-8|3e-1|g" \
-		-e "s|nlo_as_0119_qed|nlo_as_0119_qed_mc|g" \
-		-e "s|xmldoc|share/Pythia8/xmldoc|g" \
-		examples/main203.cc || die
-	# ask cflags from root
-	sed -i "s|root-config|root-config --cflags|g" examples/Makefile || die
-
-	sed -i 's|libpythia8\.a|libpythia8$(LIB_SUFFIX)|g' \
-		examples/Makefile || die
-}
-
-# TODO: the following optional packages are out of Gentoo tree:
-# - EvtGen http://atlas-computing.web.cern.ch/atlas-computing/links/externalDirectory/EvtGen/
-# - PowHEG http://powhegbox.mib.infn.it/
-# - ProMC  https://github.com/Argonne-National-Laboratory/ProMC/
-src_configure() {
-	# homemade configure script
-	local -x CXX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
-	./configure \
-		--arch=Linux \
-		--prefix="${EPREFIX}/usr" \
-		--prefix-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix-share="${EPYTHIADIR}" \
-		$(usex fastjet "--with-fastjet3" "") \
-		$(usex zlib "--with-gzip" "") \
-		$(use_with hepmc3) \
-		$(use_with highfive) \
-		$(usex highfive --with-hdf5 "") \
-		$(use_with python) \
-		$(use_with rivet) \
-		$(use_with mpich) \
-		$(use_with hepmc2) \
-		$(usex lhapdf "--with-lhapdf6
-			--with-lhapdf6-plugin=LHAPDF6.h
-			--with-lhapdf6-lib=${EPREFIX}/usr/$(get_libdir)" "") \
-		$(usex root "--with-root
-			--with-root-include=${EPREFIX}/usr/include/root
-			--with-root-lib=${EPREFIX}/usr/$(get_libdir)/root" "") \
-		|| die
-
-	# fix pythia config script
-	sed -i \
-		-e 's|Pythia8/examples/Makefile.inc|Pythia8/Makefile.inc|' \
-		-e "s|CFG_FILE=.*|CFG_FILE=${EPYTHIADIR}/Makefile.inc|" \
-		-e 's|LINE%=|LINE%%=|' \
-		bin/pythia8-config || die
-}
-
-src_test() {
-	cd examples || die
-
-	local tests="$(echo main{{101..103},{121..127}})"
-	use hepmc3 && tests+=" $(echo main{131..135})"
-	use hepmc3 && use mpich && use highfive && tests+=" $(echo main136)"
-	use lhapdf && tests+=" $(echo main{201..204})"
-	use fastjet && tests+=" $(echo main{{211..214},216})" # 215 fails...
-	use root && tests+=" main143"
-	use hepmc3 && use lhapdf && tests+=" $(echo main{133,162})"
-	use fastjet && use hepmc3 && use lhapdf && tests+=" $(echo main161)"
-	# Other tests disabled due to missing dependencies
-
-	# use emake for parallel instead of long runmains
-	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-	PYTHIA8DATA="../share/Pythia8/xmldoc/" \
-	LHAPDF_DATA_PATH="${WORKDIR}" \
-	emake ${tests}
-	emake clean
-}
-
-src_install() {
-	# make install is too broken, much easier to install manually
-	dobin bin/pythia8-config
-	doheader -r include/*
-	dolib.so lib/libpythia8.so
-	use static-libs && dolib.a lib/libpythia8.a
-	use lhapdf && dolib.so lib/libpythia8lhapdf6.so
-	insinto "${PYTHIADIR}"
-	doins -r share/Pythia8/tunes share/Pythia8/xmldoc share/Pythia8/pdfdata examples/Makefile.inc
-	dosym Pythia8 /usr/share/${PN}
-
-	newenvd - 99pythia8 <<- _EOF_
-		PYTHIA8DATA=${EPYTHIADIR}/xmldoc
-	_EOF_
-
-	dodoc AUTHORS GUIDELINES README
-
-	if use doc; then
-		dodoc -r share/Pythia8/pdfdoc/.
-		dodoc -r share/Pythia8/htmldoc/.
-	fi
-	if use examples; then
-		sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
-			examples/Makefile || die
-
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	if use python; then
-		local site_dir=$(python_get_sitedir)
-		insinto "${site_dir#${EPREFIX}}"
-		doins lib/pythia8.so
-	fi
-
-	# cleanup
-	unset PYTHIADIR EPYTHIADIR
-}
-
-pkg_postinstall() {
-	optfeature "python interface awkward array support" dev-python/awkward
-	optfeature "python interface vector support" dev-python/vector
-}
diff --git a/sci-physics/pythia/pythia-9999.ebuild b/sci-physics/pythia/pythia-9999.ebuild
index 2fe68d2815fd..8a91ca08476d 100644
--- a/sci-physics/pythia/pythia-9999.ebuild
+++ b/sci-physics/pythia/pythia-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..14} )
 inherit toolchain-funcs python-single-r1 optfeature
 
-MV=$(ver_cut 1-2)
+MY_PV=$(ver_cut 1-2)
 MY_P="${PN}${PV//./}"
 LHA_VER="6.2.1"
 
@@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/Pythia8/releases"
 else
-	SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
+	SRC_URI="https://pythia.org/download/${PN}${MY_PV//./}/${MY_P}.tgz
 	${SRC_URI}"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
@@ -34,29 +34,23 @@ fi
 
 LICENSE="GPL-2"
 SLOT="8"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg
+IUSE="doc examples fastjet +hepmc3 lhapdf root test zlib python highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg
 RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( hepmc3 hepmc2 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	fastjet? ( sci-physics/fastjet )
 	hepmc3? ( sci-physics/hepmc:3= )
-	hepmc2? ( sci-physics/hepmc:2= )
 	lhapdf? ( sci-physics/lhapdf:= )
 	zlib? ( virtual/zlib:= )
 	highfive? (
 		sci-libs/highfive
 		sci-libs/hdf5[cxx]
 	)
-	rivet? (
-		>=sci-physics/rivet-4:*
-	)
+	rivet? ( >=sci-physics/rivet-4:* )
 	mpich? ( sys-cluster/mpich )
 	python? ( ${PYTHON_DEPS} )
-	"
+"
 DEPEND="${RDEPEND}"
 # ROOT is used only when building related tests
 BDEPEND="
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? (
diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 96864cdd051c..6861fb9f0afe 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -1,6 +1,5 @@
 DIST GRV98nlo.LHgrid 221908 BLAKE2B 01af851928bbcfae110f3f5bc2b7599f86c25adb54e979c19625cf44ce7b633639f4ab99e068f8ae5ce3d9e72289265101ec40882e4af4b4a62abb152644890d SHA512 fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6
 DIST MRST2001nlo.LHgrid 719692 BLAKE2B 67a58bcf19857a5cee3eeac29bd2aa236f63c96acbf69b944ed14a94422a986e1579549172a2444b109f5bcfe6fd2fea4acc148c78e2e4f7258a836891ba0648 SHA512 126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
-DIST ThePEG-2.2.2.tar.bz2 1930050 BLAKE2B a10e966ed090f148b991a6434a2d527353014c25f5a91c92c2ce5302e1c51030fe56c2387f409ea3fb804a8efd7f0039424bd98471f0accb22c3092714df0c31 SHA512 70fa179dc1712b27549d1949c6f144cb899c372ec46606ab6b7dbcbf348961562a0a3ed769bdd8f8b8d62c07859a67c5e646ab357a9cbdd0644e557670fe3a3e
 DIST ThePEG-2.2.3.tar.bz2 1940925 BLAKE2B f233a637df0018e35e95f1cfaa0f354ac0df594e259bc177108723991697699d25c66721c23d82e03c3d768a108e37c2abf8c2f9817e74c78c7470b37e263cf8 SHA512 143f9a4974e5aa44c8957edd1ac8c621ce298cec8d1aaef39bb7061448e730a90cdb453c9fbf43caa2cf8e5757910584d91a908520bb540ff8e4a67a22455bb4
 DIST ThePEG-2.3.0.tar.bz2 1950464 BLAKE2B ab35bfe6b520c64ce2d65deb1cc79262090256734f42152bdc4ae3e08bb1b2ab686a310d6959a47ad9e0c48fd382d760ccc257fd7e55d99ed06208feea0c8f75 SHA512 5792ea3533ce1aaead96eb8de79827d6e3a3314e4ace7e5dc9392f98ec1160bf5bf7e69e1fbd77040887f09517afdf3e6f0ef9472cf766c70e9f135253b22cdc
 DIST cteq5l.LHgrid 134797 BLAKE2B 1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32 SHA512 1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
diff --git a/sci-physics/thepeg/files/thepeg-1.8.3-java.patch b/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
deleted file mode 100644
index 0d9eb8601842..000000000000
--- a/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-
-We are changing the javac -soure value from 1.4 to 1.8 which is supported by all
-Java versions presently available in ::gentoo.
-
-TODO: configure.ac
-Replace '1.8' with a variable to be set with $(java-pkg_get-source) in the ebuild.
-
-TODO java/Makefile.am
-Replace fixed values in
-	$(JAVAC) -source 1.8 -target 1.8 `for file in $(JAVASOURCES); do echo ThePEG/$$file; done`
-with values from java-pkg_get-source and java-pkg_get-target
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,7 +123,7 @@ AC_ARG_WITH(javagui,
-             [  --with-javagui          Compile and install the java-based GUI.])
- 
- if test "x$with_javagui" != "xno"; then
--  THEPEG_HAS_JAVA([1.4], [], [with_javagui=no; AC_MSG_NOTICE([Java GUI disabled])])
-+  THEPEG_HAS_JAVA([1.8], [], [with_javagui=no; AC_MSG_NOTICE([Java GUI disabled])])
- fi
- 
- AM_CONDITIONAL([JAVAGUI], [test "x$with_javagui" != "xno"])
---- a/java/Makefile.am
-+++ b/java/Makefile.am
-@@ -11,8 +12,7 @@ JAVASOURCES = SetupThePEG.java ObjectFrame.java \
- 
- CLEANFILES = ThePEG.jar thepeg.sh
- 
--jardir = $(pkglibdir)
--nodist_jar_DATA = ThePEG.jar
-+noinst_DATA = ThePEG.jar
- 
- dist_noinst_DATA = $(JAVASOURCES) jar-manifest
- 
-@@ -27,14 +27,14 @@ clean-local:
- ThePEG:
- 	mkdir -p ThePEG
- 	for file in $(JAVASOURCES) jar-manifest; do \
--           cd ThePEG; $(LN_S) ../$(srcdir)/$$file $$file; cd ..; done
-+           cd ThePEG; cp ../$(srcdir)/$$file $$file; cd ..; done
- 
- ThePEG.jar: ThePEG $(JAVASOURCES)
--	$(JAVAC) `for file in $(JAVASOURCES); do echo ThePEG/$$file; done`
-+	$(JAVAC) -source 1.8 -target 1.8 `for file in $(JAVASOURCES); do echo ThePEG/$$file; done`
- 	$(JAR) cmf ThePEG/jar-manifest ThePEG.jar ThePEG/*.class
- 
- thepeg.sh: thepeg.install Makefile
--	sed -e s:@pkglibdir[@]:$(pkglibdir):g \
-+	sed -e s:@datadir[@]:$(datadir):g \
-             -e s:@bindir[@]:$(bindir):g \
-             -e s:@java[@]:$(JAVA):g $(srcdir)/thepeg.install > thepeg.sh
- 	chmod +x thepeg.sh
---- a/java/thepeg.install
-+++ b/java/thepeg.install
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--pkglibdir=@pkglibdir@
-+source @datadir@/thepeg/package.env
- bindir=@bindir@
- 
- ThePEG_CMD="${bindir}/setupThePEG"
-@@ -19,4 +19,4 @@
- 
- 
- 
--exec @java@ ${HEADLESS} -jar ${pkglibdir}/ThePEG.jar ${ThePEG_CMD} "$@"
-+exec @java@ ${HEADLESS} -jar ${CLASSPATH} ${ThePEG_CMD} "$@"
diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index 5f99fb69d9fb..a15c6271c3f8 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -21,7 +21,6 @@
  </upstream>
  <use>
   <flag name="fastjet">Adds support for <pkg>sci-physics/fastjet</pkg></flag>
-  <flag name="hepmc">Adds support for High Energy Physics Monte Carlo Generators<pkg>sci-physics/hepmc</pkg></flag>
   <flag name="hepmc3">Adds support for High Energy Physics Monte Carlo Generators 3<pkg>sci-physics/hepmc</pkg></flag>
   <flag name="lhapdf">Adds support for <pkg>sci-physics/lhapdf</pkg></flag>
   <flag name="rivet">Adds support for <pkg>sci-physics/rivet</pkg></flag>
diff --git a/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild b/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild
deleted file mode 100644
index 1e9284df07a2..000000000000
--- a/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common java-pkg-opt-2
-
-MY_P=ThePEG-${PV}
-
-DESCRIPTION="Toolkit for High Energy Physics Event Generation"
-HOMEPAGE="https://thepeg.hepforge.org/"
-
-TEST_URI="https://www.hepforge.org/downloads/lhapdf/pdfsets/current"
-SRC_URI="https://www.hepforge.org/downloads/thepeg/${MY_P}.tar.bz2
-	test? ( hepmc? (
-		${TEST_URI}/cteq6ll.LHpdf
-		${TEST_URI}/cteq5l.LHgrid
-		${TEST_URI}/GRV98nlo.LHgrid
-		${TEST_URI}/MRST2001nlo.LHgrid ) )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs fastjet hepmc lhapdf static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sci-libs/gsl:0=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fastjet? ( sci-physics/fastjet:0= )
-	hepmc? ( sci-physics/hepmc:2= )
-	lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
-	zlib? ( virtual/zlib:= )"
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.8:*[-headless-awt] )
-	test? ( sys-process/time )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.3-java.patch # there are todo items in the patch
-	"${FILESDIR}"/${PN}-2.0.4-gcc6.patch
-)
-
-src_prepare() {
-	find -name 'Makefile.am' -exec \
-		sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
-	# trick to force c++ linking
-	sed -i \
-		-e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
-		-e '/dist_pkgdata_DATA = ThePEG.el/d' \
-		lib/Makefile.am || die
-	default
-	java-pkg-opt-2_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	if use java; then
-		local -x JAVAC="$(java-pkg_get-javac)"
-		local -x JAVA="$(java-config -J)"
-		local -x JAR="$(java-config -j)"
-		local -x JAVAC_SOURCE="$(java-pkg_get-source)"
-		local -x JAVAC_TARGET="$(java-pkg_get-target)"
-	fi
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with fastjet fastjet "${EPREFIX}"/usr) \
-		$(use_with hepmc hepmc "${EPREFIX}"/usr) \
-		$(use_with hepmc hepmcversion 2) \
-		$(use_with java javagui) \
-		$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
-		--without-rivet \
-		$(use_with zlib zlib "${EPREFIX}"/usr)
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile lib/ThePEG.el
-}
-
-src_test() {
-	emake LHAPATH="${DISTDIR}" check
-}
-
-src_install() {
-	default
-	use emacs && elisp-install ${PN} lib/ThePEG.el{,c}
-	use java && java-pkg_newjar java/ThePEG.jar
-
-	cat <<-EOF > "${T}"/50${PN}
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
-	EOF
-	doenvd "${T}"/50${PN}
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-physics/thepeg/thepeg-2.3.0-r3.ebuild b/sci-physics/thepeg/thepeg-2.3.0-r4.ebuild
index f43aa9b7ea3a..3681ed7b920d 100644
--- a/sci-physics/thepeg/thepeg-2.3.0-r3.ebuild
+++ b/sci-physics/thepeg/thepeg-2.3.0-r4.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=8
 
-inherit autotools elisp-common java-pkg-opt-2
-
 MY_P=ThePEG-${PV}
+inherit autotools elisp-common java-pkg-opt-2
 
 DESCRIPTION="Toolkit for High Energy Physics Event Generation"
 HOMEPAGE="https://thepeg.hepforge.org/"
@@ -24,25 +23,30 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-3"
 SLOT="0/30"
 KEYWORDS="~amd64"
-IUSE="emacs fastjet +hepmc3 lhapdf static-libs test zlib rivet"
+IUSE="emacs fastjet +hepmc3 lhapdf rivet static-libs test zlib"
 RESTRICT="!test? ( test )"
 
-CDEPEND="
+COMMON_DEPEND="
 	sci-libs/gsl:0=
 	emacs? ( >=app-editors/emacs-23.1:* )
 	fastjet? ( sci-physics/fastjet:0= )
-	rivet? ( <sci-physics/rivet-4:=[hepmc3] )
+	rivet? (
+		>=sci-physics/rivet-3.1.11-r1:=[hepmc3(+)]
+		<sci-physics/rivet-4:=
+	)
 	hepmc3? ( sci-physics/hepmc:3= )
 	lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
-	zlib? ( virtual/zlib:= )"
-DEPEND="${CDEPEND}
+	zlib? ( virtual/zlib:= )
+"
+DEPEND="${COMMON_DEPEND}
 	sci-libs/gsl:=
 	java? ( >=virtual/jdk-1.8:*[-headless-awt] )
 	test? (
 		sys-process/time
 		dev-libs/boost
-	)"
-RDEPEND="${CDEPEND}
+	)
+"
+RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.8:* )
 "
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2025-12-31 07:15:02 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2025-12-31 07:15:02 +0000
commit	2d2e72fe708ba301d75df9d83bdb90f2341c889e (patch)
tree	02777fcb985524c399fc022e7583efc1387a7ad9 /sci-physics
parent	002e66b1f9281be5b24bad19c1064c4699aad7a7 (diff)
download	baldeagleos-repo-2d2e72fe708ba301d75df9d83bdb90f2341c889e.tar.gz baldeagleos-repo-2d2e72fe708ba301d75df9d83bdb90f2341c889e.tar.xz baldeagleos-repo-2d2e72fe708ba301d75df9d83bdb90f2341c889e.zip