gentoo auto-resync : 26:08:2022 - 14:52:16

21 files changed, 632 insertions, 36 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index f53c8669aabf..2dfd9f246187 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 84f0e1330c53..fb3be9917576 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -9,4 +9,4 @@ EBUILD bullet-3.08-r1.ebuild 1943 BLAKE2B 16c07ca3a3bfa16e2d1c99fceb4ea4f0386b7f
 EBUILD bullet-3.17-r1.ebuild 2050 BLAKE2B c1d92afbc4dcbbb8ab547f4e4f2d4ec897666ab7a717c71104658e845e041c5ab85a92f00245268a4a72049bee1667c3dc5ecc63cf72292fee4c24d4c6f36154 SHA512 339ac9eaa2fe976bcf7391a3f662dd8f2d5ed62cb7e8281cf58d66e8895a1105ba25f783e731e7572cd039ff661f5ec44d54b95bfba9e8755dae3f2227b4f29b
 EBUILD bullet-3.21.ebuild 2050 BLAKE2B 91036460e81531717543e48e05e8d08b5cf7857061b181eaff1e5d4237c8ea26b9e246158576b85f259b7a2485c3850880ebfd14063512f269171815b6923d6e SHA512 e1059e59ef9a47555bd99f0cc5d59e290745e746c094015329395e7519c4fae011ffce5b64b711966161c958c16cdff94ff1eccc51cfd3d9b9d07b1a3364de22
 EBUILD bullet-3.22b.ebuild 2052 BLAKE2B e595345cf8964a6c5868570f38468254ec16fdde8ec744567706cff97b90523f083fd69066ed5a3b58c9b5defcaf68e4aa54b4f800db124d3d2800f610780c29 SHA512 f00875c2cc797a464cc233cecd1972e00c3918c0029469dc80b7b9dc3fa3676e967557c1653d5b3921440c248c22c7590d0e18132984a46cf52eb9dfe6d31a46
-MISC metadata.xml 881 BLAKE2B b1b0a3bdbe22571e787038e190fe0f6e53d08cfccf864e83a35705ddd4d617a7f53641c9439b7b8562330e2e9553cf77d62593d4eb9b6137de032fa03fce6f2c SHA512 d5e532685450e44d2f1d42e2047c3d7d50ee67ccd45fcc3df1dfb5aad3fe63d1ccbdc31a09fd04ed17fd45a41d3f7a536c124d70d9f96bf7efd37e5d721ed527
+MISC metadata.xml 892 BLAKE2B 1e50de697cf962874f0fcbd7c35a9a10b0709ea673ced511eb6a0c1a684de583a2a10db66ad08ad3d3cfcd20f716d803d41f4f4b1671e74e45b691b9cd35ab3f SHA512 21be07316385e7825c471f3e2f6d0a025cffd520f3a758942c2365e2b30a3f4edd15a49c746f1792ba86c45a18812302d66bb44be128278d739112f95bb070fd
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index 9ab60278b74d..f6d1a3ecfebd 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -13,7 +13,7 @@
   <use>
     <flag restrict="&lt;=sci-physics/bullet-3.17" name="extras">Build the extras</flag>
     <flag name="double-precision">Build libraries in double precision</flag>
-    <flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
+    <flag name="tbb">Enable multithreading with the Intel Threads Building Block <pkg>dev-cpp/tbb</pkg></flag>
   </use>
   <upstream>
     <remote-id type="google-code">bullet</remote-id>
diff --git a/sci-physics/fastjet-contrib/Manifest b/sci-physics/fastjet-contrib/Manifest
index 65c5c57cf701..13c8b4a2325a 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,4 +1,5 @@
-AUX fastjet-contrib-1.049-soname.patch 772 BLAKE2B 88c50c5f425aba7d4eaf760def43baa145d15c550a3e857b70b3a98d0796e2a2f912e7ac652ae559fcf26ddb67013df392851398f92eb2b8362cbf84ebb8dae3 SHA512 715c269c80421baa682b2eda604ff60e21cf08a754ba8051dd684f9c846e444f57735f98102582ee81d975294b7f5873d265e4c8951dade91c5817f065970bef
+AUX fastjet-contrib-1.049-ar.patch 5345 BLAKE2B d372187f781da47b128c5cdde8909da4c5b1db7ffb3dede72248db9238efd7e399c292a6a2f7d93d879da1120b9ec860076ee3402ed02f6bf7b002e4c962f01a SHA512 12ba683b4f302b2563d036949161a55c3efd759e27519b757f257f5797d48b6a11c34084580b3669988d393c04574ab1f22af0e2ceb4b92d3499fc53831512e5
+AUX fastjet-contrib-1.049-soname.patch 667 BLAKE2B 14fd4ad56300414fc13b4ddd89e59ee064f1531e2217e0c5ca35e6a1567f9c18e88c8f06104dd0a3f28486fa86ecd3ebf495520f57d0fc12b0934e1004b4b2bb SHA512 5dd0999f6847f6bfdeabb0432bfe639f5f5d42171e21711959fe6155f73ec3e2dd6cdc2156345ba3cec2534f48c9977337372d15a04ab1e86697dbd7affb9fdd
 DIST fjcontrib-1.049.tar.gz 850931 BLAKE2B ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f SHA512 21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6
-EBUILD fastjet-contrib-1.049.ebuild 1072 BLAKE2B 181c61cc4da8f1435cb91b5fd442404af996fe8f994e3e113148ae770ed9e30664a6deaeaf325ca80998b272144f05c2b1f961f961a454440f24f55d367fc8cc SHA512 7f5a9064856de9f5c1177cbfa345dec171971d38a7d5dc88d23d77e50b072f27d7bff59df5cc2fd993f313d886c6289d4f3763bcb26fe1e60c4f835206398285
-MISC metadata.xml 540 BLAKE2B 8e945d39f95e0a19d18d7dcfc6fd8993bfa33b579dbbd95ec0b1edca68a0fd821c0bacb93a9d66133ed48447c2d740ab71b54cfadd856c2d34820e878fb4a527 SHA512 c5f54be55050cc9f675c32262363399d83dbe82f7b4b8f6c01d3f099b40dfee50cae56af5bf49bb8061d0711b9ae706f79f90776e07d37a91698c21990567144
+EBUILD fastjet-contrib-1.049-r1.ebuild 1140 BLAKE2B 92961a7f96b6160647aa950e9f42d1543e307a017308b5692c971e42f69fc781c8bb005f8dbae1dddac7dfb2478160e82356bd82bbe03fb01ae2f4df3ff35eaa SHA512 9ee911ed8c7acd3f33ca9997948bea8ae2446080b726d31cca83d9c2bb18a631cf80e5d3098dc0ce9053f1dd0a82eca91377bc05474d93283abd2bde09800f60
+MISC metadata.xml 702 BLAKE2B 14570ef3a3740d253725da436f3b496c479288aaa7c32c3e6fe16339f13b58d91b067a00e482b1ede080c5a1f735bdee9ce80ea3c234878caa5bc60a2cf65f03 SHA512 dc1e158453b8517eea9c2dc95f4caf5f6352498b6cbce29cd0d6f207548e877403a6a21471b69db48813a2cb327b172865e49c813ea3b6b0780f8ada6465a3c0
diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
index cf942ac11e58..5327d49c484d 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
@@ -22,12 +22,14 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-soname.patch
+	"${FILESDIR}"/${P}-ar.patch
 )
 
 src_configure() {
-	CXX=`tc-getCXX`
-	./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	tc-export CXX AR RANLIB
+	./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config RANLIB="${RANLIB}" AR="${AR}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
 }
+
 src_compile() {
 	emake
 	emake fragile-shared
diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch
new file mode 100644
index 000000000000..b7578bd76738
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch
@@ -0,0 +1,247 @@
+--- a/Centauro/Makefile
++++ b/Centauro/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ClusteringVetoPlugin/Makefile
++++ b/ClusteringVetoPlugin/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ConstituentSubtractor/Makefile
++++ b/ConstituentSubtractor/Makefile
+@@ -41,8 +41,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/EnergyCorrelator/Makefile
++++ b/EnergyCorrelator/Makefile
+@@ -40,8 +40,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS)
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/FlavorCone/Makefile	
++++ b/FlavorCone/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/GenericSubtractor/Makefile
++++ b/GenericSubtractor/Makefile
+@@ -38,8 +38,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/JetCleanser/Makefile
++++ b/JetCleanser/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/JetFFMoments/Makefile
++++ b/JetFFMoments/Makefile
+@@ -34,8 +34,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ examples: example
+ 
+--- a/JetsWithoutJets/Makefile
++++ b/JetsWithoutJets/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/LundPlane/Makefile
++++ b/LundPlane/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/Nsubjettiness/Makefile
++++ b/Nsubjettiness/Makefile
+@@ -40,8 +40,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS)
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES) $(EXAMPLES2)
+--- a/QCDAwarePlugin/Makefile	
++++ b/QCDAwarePlugin/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/RecursiveTools/Makefile
++++ b/RecursiveTools/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ScJet/Makefile
++++ b/ScJet/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/scripts/internal/Template/Makefile
++++ b/scripts/internal/Template/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/SoftKiller/Makefile
++++ b/SoftKiller/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/SubjetCounting/Makefile
++++ b/SubjetCounting/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ValenciaPlugin/Makefile
++++ b/ValenciaPlugin/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/VariableR/Makefile
++++ b/VariableR/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-	ar cru lib$(NAME).a $(OBJS)
+-	ranlib lib$(NAME).a
++	$(AR) cru lib$(NAME).a $(OBJS)
++	$(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
index 5f69900cdc30..fe3794d5e0f5 100644
--- a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
@@ -1,5 +1,5 @@
---- fjcontrib-1.046.orig/Makefile.in	2022-03-10 13:44:33.963887464 +0100
-+++ fjcontrib-1.046/Makefile.in	2022-03-10 13:45:02.573890763 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -54,7 +54,7 @@
  
  fragile_SHARED_SRC_LIST=@FRAGILE_SHARED_SRC_LIST@
diff --git a/sci-physics/fastjet-contrib/metadata.xml b/sci-physics/fastjet-contrib/metadata.xml
index 1a470bb15f7b..ae55524d0200 100644
--- a/sci-physics/fastjet-contrib/metadata.xml
+++ b/sci-physics/fastjet-contrib/metadata.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
+	<maintainer type="person" proxied="yes">
+		<email>alexander@neuwirth-informatik.de</email>
+		<name>Alexander Puck Neuwirth</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>sci-physics@gentoo.org</email>
 		<name>Gentoo Physics Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription lang="en">
 	The fastjet-contrib space is intended to provide a common location for access to 3rd party extensions of FastJet.
 	</longdescription>
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 0636a12ca8e4..cdf525eea372 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -4,4 +4,4 @@ DIST geant4.10.07.p03.tar.gz 35756099 BLAKE2B 9e510d17173d280a24d2540d0e0f25f733
 EBUILD geant-4.10.7.3.ebuild 2977 BLAKE2B 9cc044c0122abe4817069e694dd2e5d9a097047a7953243b6f3a5c4fc42fdc02c1d744b273df7763bee6c9751825c0e99fe89f932359902acf8d6a69fd72ee76 SHA512 ebe32fedd0fb593ec393861ea277bf77a9f49d50fa432b2e3191a35ce213108ec2bd2105a5aa9fb2add7c6dbf01dc2c048e8515676d3aef031970afe1978f6eb
 EBUILD geant-4.11.0.1.ebuild 3412 BLAKE2B c2cc06d5f90c4ab3442f341901dd88ba4bdf4c6905bf524e7b1067d255011861abac8b00642b56c911e1647132332568f6e2a58eb6364eb25634d81a88939633 SHA512 ebc0912da59b5803b37647dace006d7e38b9df56d58551ae8a94ed52e00909754baf0440a7c5a25d023c218767ea75dec3d1e91934bd496ffdd48047af65fc23
 EBUILD geant-4.11.0.2.ebuild 3413 BLAKE2B bdb0dfbda23694d1d8e1736d49c98860f05ca532589b27226273a0befca64f0b9564ff7e12f8f6191d2439948881dc4db82936a5fbe520eef62d8c9dba9d1189 SHA512 04bbd424a2377f954a174d0590aea5ea3b554b51fac50d5716d6590c339fcce2915355c1b31e819d7421ff02ac67d46bf826e5e85282ac29e65a887bd81671fb
-MISC metadata.xml 1765 BLAKE2B 70ee66225468abedfaebb6faec123c5d0c1748088080a483c9378654e93190d9436abc0c781e4a5909283fb63541c3ae4450e5bb43fa720dfcfb928023079064 SHA512 5ccca521e3249cdf0d1f9d0dabae8fea73ac03a564be7d7c5f19a85fafb16f4078ea39bf7b55d7c45e4b5575e0b809fd251cc18e28d2e5bba993f71f5056fd4d
+MISC metadata.xml 1776 BLAKE2B 74ebef8d1d7ef17c516b71eeb1a901b9a1692633ba876c15c72163128f20a14b9c2fad760a21676ea81322b281d8f67de9b8b67ffccda6a1a6872f47b7022aec SHA512 1bf55d45afb8cead41c8984e029019beaba353483491c770b16f5f6f9e0b600950222104e7c157348ac11cacd098da886dc9d3053a04748cf237a45dc23326a1
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index 434d3de14115..17bcbefa802f 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -28,6 +28,6 @@
     <flag name="raytracerx">Enable raytracing for physics events</flag>
     <flag name="tbb">Enable support for <pkg>dev-cpp/tbb</pkg></flag>
     <flag name="vrml">Enable output of geant4 in vrml formats</flag>
-    <flag name="vtk">Use sci-libs/vtk for visualization (experimental)</flag>
+    <flag name="vtk">Use <pkg>sci-libs/vtk</pkg> for visualization (experimental)</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-physics/hepmc/Manifest b/sci-physics/hepmc/Manifest
index 417240d0fbdb..7a8f07ce96c8 100644
--- a/sci-physics/hepmc/Manifest
+++ b/sci-physics/hepmc/Manifest
@@ -1,3 +1,7 @@
 DIST HepMC-2.06.09.tar.gz 4612637 BLAKE2B 6bbf1a6a8410b6717ddff29fc3643247582f7a61a05fd9e52a0b09f78bf75de587c1c55525f6a1367b306a26a4687ce55b64908c049d91bdb2db3d40467af62b SHA512 1030f31ad9d19d8ae184145a693c4a3092131f485e2ed89598b7172992a825ad9aa46fb44a9199a00c4a6bd7e163daead9452e9bc4fe32cb3b97351cf22906c4
+DIST HepMC3-3.2.5.tar.gz 9217649 BLAKE2B 520e4621cdfa277376e94b87a070f23e6479867bbf696dc972e7496c54504c7da921932fbeaf7713cbaab18c72101ad3fa79396fe8ee1737180946696dcd1fbd SHA512 de60aaa686f6499c62112c265438b9ba41a7ed312b767ddc3409178b6e908e4fffd6a1153bd9f2929cf479074b14bcbec33d377f51a11cfcd4c67e45fc9bb2b9
+DIST hepmc2.06.11.tgz 4893958 BLAKE2B ac8eef250cb330a167c9e0f4bd1aaf8df82e0ffec3557ab5cdaf8bc5b0b7333d6a45f73710ce63abab52d2c5758d5663c15c2a7c940a09504b3ef2fd4517aa0b SHA512 81c100d4931e0e4de62c8ffd18cc06e7996a642fecc092892988bdc0dd0dc3c0f5b336e85f09ceb8f5e0e09456775ae5928d37daf28d82923476089bc0e910f2
 EBUILD hepmc-2.06.09-r2.ebuild 1944 BLAKE2B 9c768aae3cb4bcc0d4c6953e7577e0bff407ec61ef1efb9ec34b60944ac8880e832a196c04cb1adcf1539488807af3729db35282cc71383ae560f22473dfca70 SHA512 0c45e436498dea65ea1b801a44b8b4c6e232305dbb7d002656a0f11feb4fb2a0d23cf6a63f0bfd7c711bff6fba60f69367ca7f173a6af0bac54c664bbd0b2cb6
-MISC metadata.xml 1387 BLAKE2B fea7ce2a6373cb4c3dcc91f5cc9f7ddee03e12ae9f35769d949115e8d21e70bca4f2304cb6384d708b447e0e4a5b4bb5713d0abad011e10bacab84b601648b12 SHA512 c82cab58777d4e1ca0fe563e5625cba2cb99edfe27f477c191f5ef0afba40ff62f5d1834e8472294958e6c36f17af10b8da0c91fcb3b147bb3bd8dfda37a79fe
+EBUILD hepmc-2.06.11.ebuild 2002 BLAKE2B 3c3fcf14703a96074b0fad4e411beffb3e6cdac9d6b6035c4ae29397c291b880702e0926f2f893f7a0febe88b7c2512c29760e9dc17df6ae26eeae1b44f4adbb SHA512 f3070fdd37b9bd6212687acc0d46d1a64223cfec128db524ae35e2e39745b3ae9abcaaec982352df295d9ada4e23bf5d87b3994b4b7dd078e507664d96767652
+EBUILD hepmc-3.2.5.ebuild 1185 BLAKE2B 95cc8506ea333973f101e2103e8f8a77677d909a53461cdd1498a963f22446e46835aedb693088abf805a4044c38231f25408595dfcd0dd96ac71dba13c33609 SHA512 6191380a1519cf5e696f6b3834d2a00afe19fd0134debc051ea5d18cbccc5d6d4f2aae8c67c088b37c1834a06a2f793eaf422289dde12358e41ce1810059e071
+MISC metadata.xml 1600 BLAKE2B 10b28e9bbb93689a55d60e8af6ca44ea7764b8b309c4dfba81bb11d0ca2cd3aa30ee1df5b9a4a02bd649f64d7624885f10259f4d62c1bdb89b36fa7bb1da8baf SHA512 52c562ae75774076c652072aa1bfbefbbb3fcace04856fea14ce7265e6116bce7bc0fafa24e092cb848cdda980c489ade647ac056a6cd6cc8f077f26994454ae
diff --git a/sci-physics/hepmc/hepmc-2.06.11.ebuild b/sci-physics/hepmc/hepmc-2.06.11.ebuild
new file mode 100644
index 000000000000..f75ed0d07cf6
--- /dev/null
+++ b/sci-physics/hepmc/hepmc-2.06.11.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MYP=HepMC-${PV}
+
+DESCRIPTION="Event Record for Monte Carlo Generators"
+HOMEPAGE="https://hepmc.web.cern.ch/hepmc/"
+SRC_URI="https://hepmc.web.cern.ch/hepmc/releases/hepmc${PV}.tgz"
+S="${WORKDIR}/${MYP}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cm doc examples gev test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-latexrecommended
+	)"
+
+# Block against old slot 0
+RDEPEND="!sci-physics/hepmc:0"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e '/add_subdirectory(doc)/d' CMakeLists.txt || die
+	# CMake doc building broken
+	# gentoo doc directory
+	#sed -i \
+	#	-e "s:share/HepMC/doc:share/doc/${PF}:" \
+	#	doc/CMakeLists.txt || die
+
+	# gentoo examples directory
+	sed -i \
+		-e "s:share/HepMC:share/doc/${PF}:" \
+		$(find examples -name CMakeLists.txt) || die
+
+	# respect user's flags
+	sed -i \
+		-e "s/-O -ansi -pedantic -Wall//g" \
+		cmake/Modules/HepMCVariables.cmake || die
+
+	# gentoo libdir love
+	sed -i \
+		-e '/DESTINATION/s/lib/lib${LIB_SUFFIX}/g' \
+		{src,fio}/CMakeLists.txt || die
+
+	# remove targets if use flags not set
+	if ! use examples; then
+		sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt || die
+	fi
+	if ! use test; then
+		sed -i -e '/add_subdirectory(test)/d' CMakeLists.txt || die
+	fi
+
+	# remove static libs
+	sed -i \
+		-e '/(HepMC\(fio\|\)S/d' \
+		-e '/TARGETS/s/HepMC\(fio\|\)S//' \
+		{src,fio}/CMakeLists.txt || die
+}
+
+src_configure() {
+	# use MeV over GeV and mm over cm
+	local mycmakeargs=(
+		-Dlength=$(usex cm CM MM)
+		-Dmomentum=$(usex gev GEV MEV)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cd doc || die
+		./buildDoc.sh || die
+		./buildDoxygen.sh || die
+		HTML_DOCS=( doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc doc/*.pdf
+}
diff --git a/sci-physics/hepmc/hepmc-3.2.5.ebuild b/sci-physics/hepmc/hepmc-3.2.5.ebuild
new file mode 100644
index 000000000000..6a91e322f3ec
--- /dev/null
+++ b/sci-physics/hepmc/hepmc-3.2.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# python3_11 fails
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-single-r1
+
+MYP=HepMC3-${PV}
+
+DESCRIPTION="Event Record for Monte Carlo Generators"
+HOMEPAGE="https://hepmc.web.cern.ch/hepmc/"
+SRC_URI="https://hepmc.web.cern.ch/hepmc/releases/${MYP}.tar.gz"
+S="${WORKDIR}/${MYP}"
+
+LICENSE="GPL-3+"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE="doc test examples python root"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	root? ( sci-physics/root:= )
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-latexrecommended
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHEPMC3_ENABLE_ROOTIO=$(usex root ON OFF)
+		-DHEPMC3_ENABLE_PYTHON=$(usex python ON OFF)
+		-DHEPMC3_ENABLE_TEST=$(usex test ON OFF)
+		-DHEPMC3_BUILD_DOCS=$(usex doc ON OFF)
+		-DHEPMC3_BUILD_EXAMPLES=$(usex examples ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+	python_optimize
+}
diff --git a/sci-physics/hepmc/metadata.xml b/sci-physics/hepmc/metadata.xml
index 568fd23f5361..3e4d21be3b79 100644
--- a/sci-physics/hepmc/metadata.xml
+++ b/sci-physics/hepmc/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+<maintainer type="person" proxied="yes">
+  <email>alexander@neuwirth-informatik.de</email>
+  <name>Alexander Puck Neuwirth</name>
+</maintainer>
+<maintainer type="project" proxied="proxy">
   <email>sci-physics@gentoo.org</email>
   <name>Gentoo Physics Project</name>
 </maintainer>
@@ -24,5 +28,6 @@
 <use>
   <flag name="gev">Build with GeV instead of default MeV for momentum units</flag>
   <flag name="cm">Build with cm instead of default mm for length units</flag>
+  <flag name="root">Build with ROOTIO enabled</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index d97c39500236..0476a9aa41af 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -12,6 +12,8 @@ DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B ec655014d3904b66da4a1e748a37c3
 DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b980554046a57979cc72c80067be96f00b5056dee29fc7f0039ddae074560823427c3a0e24e59f69662f08524fbdcd4 SHA512 f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
 DIST pythia8245.tgz 23737440 BLAKE2B 74fd060229a342a32ddd33cd1911708c03e23ee0656a23ed91663fa08b35bb015f75bedba2e6ef13cfc9524affde8e8b65653596eb34f1f080781e655b85af5b SHA512 25107eb98474217ac697476143e879c62fcf5653994a2daf61cfca892f91fbaea3c274019fb4469e9ef547e87d69b8842ee28db5fdac6433965a62eeb16ef95a
+DIST pythia8307.tgz 26016414 BLAKE2B 0253309d71ca4e46183de80396c3a226d072ea2e8aeaf87da33994b3303017a6ca567f6731902aba43c20fec2c0aeace0728f2ce725f9221f161a70055fa6043 SHA512 63e7a3e76f8bfe0cd7b34ef523d8bbcfa50ee780c8437384ef7eb208f0f682481b0166673647db98468baeb6df855fdbf0cbb1509dcc5eda39c90f3f3461fd2a
 EBUILD pythia-6.4.28-r2.ebuild 2015 BLAKE2B 8e26f38ac4ed140dbd49d9149a9bf56388d9809a26beb27bcd87f2f09503f9bdac7e28ea96413f0f849bfb1cf32c71f32efc2d8c1ca68a8d287168fb35ec5ddc SHA512 9d8527a168976ec0da2aff8ff220a294df566d9581913cb4561ef738eb33a6ec28b77e162fc5b6977cb06359d2264e198821833f5801293ab56a50d20431aaa8
-EBUILD pythia-8.2.45.ebuild 5698 BLAKE2B 91294516ac108a3b386c97d51e35a672346d03e57d897df2c1d10ee219e1c0cd81e114ea347e33d7a634f96eb89455202a53deba92532d78ad3c80efc126cb72 SHA512 405cc027347fffa6796b4f07e629309cdb06ddcf5304a39ce0327975c636c992446f6191b7ff80bc84057d5f70b5741b8eb0c77ad0e065c035856da367ef948e
+EBUILD pythia-8.2.45-r1.ebuild 5698 BLAKE2B d7276589d2859b6077a9331705192cbae807e08e02f07b68e6773bcc48c81c02a2bd2a3dbfca8d531a317f3178f2a5ccd5dd66b3be16257f6e3dd4772bcee195 SHA512 20889a20d0f8718c52c9327e10c5c9d9d6f35b8a579384074534fa643475b0da19855cf1fc7af47f06fe9ed3caf152fb8293960f67c6879b7dda57ab9670b275
+EBUILD pythia-8.3.07.ebuild 5595 BLAKE2B 34cf8d352effa0c777c2aedde8b1c77db969fbda5d6279a09eeaf68ac03f462c79f47de3867c63bbbd4b9d650b7dedda858e9c58fa358bbdea3e63a6fec998f4 SHA512 113a012ecc9c32ecfc2e3bebfd883f7e3bff4030460c45bb7dbe64e629d7ceeeaffaab844e968070a3c32c8e97d0ff124fb638809ab429007764120b40dd12de
 MISC metadata.xml 1299 BLAKE2B 8e721b54a36722872211040e099fc4e284563d5c41640a3d83e38849a64e79a277e1d34e790619b277d4deebb125d758d48def0b119f1f91b592a52e3c2be511 SHA512 875b5383e20b3ac9970012bcbdc762c01fc326d66977f6c53b0c62e4b88baa50a6c54e63e63d2086042b8fefbade45e80ec790c786c6d2a281272d5a5f565386
diff --git a/sci-physics/pythia/pythia-8.2.45.ebuild b/sci-physics/pythia/pythia-8.2.45-r1.ebuild
index b46fed8fb5df..7826f78f0c0d 100644
--- a/sci-physics/pythia/pythia-8.2.45.ebuild
+++ b/sci-physics/pythia/pythia-8.2.45-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -30,7 +30,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	fastjet? ( sci-physics/fastjet )
-	hepmc? ( sci-physics/hepmc:0= )
+	hepmc? ( sci-physics/hepmc:2= )
 	lhapdf? ( sci-physics/lhapdf:= )
 	zlib? ( sys-libs/zlib )"
 # ROOT is used only when building related tests
diff --git a/sci-physics/pythia/pythia-8.3.07.ebuild b/sci-physics/pythia/pythia-8.3.07.ebuild
new file mode 100644
index 000000000000..08fe8482f92e
--- /dev/null
+++ b/sci-physics/pythia/pythia-8.3.07.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 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://pythia8.hepforge.org/"
+SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
+	test? ( lhapdf? (
+		https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/CT10.tar.gz
+		https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2007lomod.tar.gz
+		https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
+		https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
+		https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq66.tar.gz
+		https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq6l1.tar.gz
+		https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/unvalidated/MRST2004qed.tar.gz
+	) )"
+
+SLOT="8"
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="doc examples fastjet +hepmc lhapdf root test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	fastjet? ( sci-physics/fastjet )
+	hepmc? ( sci-physics/hepmc:3= )
+	lhapdf? ( sci-physics/lhapdf:= )
+	zlib? ( sys-libs/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="$(get_libdir)" \
+		--prefix-share="${EPYTHIADIR}" \
+		$(usex fastjet "--with-fastjet3" "") \
+		$(usex zlib "--with-gzip" "") \
+		$(usex hepmc "--with-hepmc3" "") \
+		$(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
+	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/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 67131c30a752..0f31feb8174d 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -2,10 +2,10 @@ AUX thepeg-1.8.3-java.patch 922 BLAKE2B 6ecd71735f8fd13c3a8220290ee0eb7b78e66ae4
 AUX thepeg-2.0.4-gcc6.patch 252 BLAKE2B 4503804e2d5f25fdc81e05bbc960e873c9f7d70d25ed6fdf1425658b2fadbf39e7d537afedf365ec1659ad268d450f5a36649726ec692fd0bb8c8cecf36f5ffb SHA512 741dc3a52fdd040b2fc0ba21c778b4e2427abd55977f3858ef8f8acedc2c3a4007a38fe0903cf89eb1c305ebbc31f527f04d52da794ac85563864c53d50c4363
 DIST GRV98nlo.LHgrid 221908 BLAKE2B 01af851928bbcfae110f3f5bc2b7599f86c25adb54e979c19625cf44ce7b633639f4ab99e068f8ae5ce3d9e72289265101ec40882e4af4b4a62abb152644890d SHA512 fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6
 DIST MRST2001nlo.LHgrid 719692 BLAKE2B 67a58bcf19857a5cee3eeac29bd2aa236f63c96acbf69b944ed14a94422a986e1579549172a2444b109f5bcfe6fd2fea4acc148c78e2e4f7258a836891ba0648 SHA512 126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
-DIST ThePEG-2.0.4.tar.bz2 1921082 BLAKE2B f27dd81b51c28eac547351a7c732969d79abd6c1885a2e52319b6e5807bb4c1824e35e303e3d23b80b7da07a3c7c9e9f5470d538728362a4398bb66e42a00325 SHA512 5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c
 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 cteq5l.LHgrid 134797 BLAKE2B 1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32 SHA512 1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 DIST cteq6ll.LHpdf 1461 BLAKE2B 66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640 SHA512 b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728
-EBUILD thepeg-2.0.4-r1.ebuild 2277 BLAKE2B 5f6b5adc56148878322688984e19af70bd7b5923944b4c3b9417da883bece85eb4dad084994a4e0b3d86300aa34e4de8cb84c09f6e20e93e378a8c5e3f2a0a77 SHA512 4a6612ccbd63574f6d434c80498be5dfbdc590cdfd1d0aa624fc06628597f6a24dd7f90ae302fa7154faba1ab48640a6c5272be714e1b201142abe4cd47d798a
-EBUILD thepeg-2.2.2.ebuild 2238 BLAKE2B aefac72259423ba469b77c63d950b6013f9ff5196ccdb1c0aee580f0c84fbc3f46bdee349e953213c1eddb58379a5708b945b131d866959b258fad61ac07dbda SHA512 ac0f77ee76a4fd6e98ecc7be71d7fa422792eb5cc376614242325e108d048e57ba0c6faea728541d6b1c3356f9b3fdc8cb096f667c6fc53a3d54c08938e95b7a
-MISC metadata.xml 993 BLAKE2B 86edcd8402e8b6610c88515de2a3181dc8419de86d3470175f1b6baa3f721097d24c812f9b964d3878ca70b7ca148179fc387fa51e72794c98191a3ea30cd3c4 SHA512 1b688a87ff2ea6fb0160c50ae4391f8b5c1d1927de4ec270cd52025ce933988d2ae16c33d0b71daa422df94e1bf1698ad3478d49806d066561475826e1aab700
+EBUILD thepeg-2.2.2-r1.ebuild 2318 BLAKE2B 198a099e8897c1683e81f569b3971aa64056edbb6862fe5d0c10a99c8be1e627877c195dcd6b95e1382537c4fe9220896a43f83716bea946c2d50ff8209aa33f SHA512 29710ea880cd8431a88cabe37ae7368b6869b0c3d7348ef57cdfc685200a1b28699bd46d593ba4d5d5959c4d227c7be531009f170ddeeefa5873060c9c0094e3
+EBUILD thepeg-2.2.3.ebuild 2289 BLAKE2B 6d4d00218e1bb93292fcaea32935326388d607af21380598c78bd0f93ac8dda88f920ed0c297568e9b808ded9c9c20c62254354716abc39e5c3e19f85ec7888a SHA512 2074218dd8f9b38397216696f37034f1237366bd238a85dd7f807f37f955586870c5b03efb123323910b4cd888edae1c1b631418b50bdfe04273b74b170c68ff
+MISC metadata.xml 878 BLAKE2B 6200c891f074de407c7af4ce318a9e045f2e2e6e3677e841b9b084c1e3c336bc017af5b7e10f19849168482c42e4d24e71aa59f9b026c51cdeb5ed4a5b4e32b1 SHA512 700df3c90c7627cb383ee800e9714db203daeb5057d8340b4929447e291dc5a614c5e632277c1c9c921466956ec35b3a2e9b360698aa6e341a96de3f1156baa4
diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index c591073f15ca..cacb2f090dd4 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -13,8 +13,6 @@
 	of the toolkit and which can be used by any event generator model.
 	</longdescription>
 	<use>
-		<flag name="c++11">Build ThePEG using the C++11 standard.
-		Experimental feature, not for production use.</flag>
 		<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>
diff --git a/sci-physics/thepeg/thepeg-2.2.2.ebuild b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
index 750ea66b2e33..dac77266dd4f 100644
--- a/sci-physics/thepeg/thepeg-2.2.2.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common java-pkg-opt-2
 
@@ -28,7 +28,7 @@ CDEPEND="
 	sci-libs/gsl:0=
 	emacs? ( >=app-editors/emacs-23.1:* )
 	fastjet? ( sci-physics/fastjet:0= )
-	hepmc? ( sci-physics/hepmc:0= )
+	hepmc? ( sci-physics/hepmc:2= )
 	lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${CDEPEND}
@@ -62,6 +62,7 @@ src_configure() {
 		$(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 \
@@ -86,6 +87,8 @@ src_install() {
 	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
 	EOF
 	doenvd "${T}"/50${PN}
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sci-physics/thepeg/thepeg-2.0.4-r1.ebuild b/sci-physics/thepeg/thepeg-2.2.3.ebuild
index 30b441b5a8e2..9cfcb5e1f40a 100644
--- a/sci-physics/thepeg/thepeg-2.0.4-r1.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common java-pkg-opt-2
 
@@ -19,16 +19,16 @@ SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
 		${TEST_URI}/MRST2001nlo.LHgrid ) )"
 
 LICENSE="GPL-2"
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
+SLOT="0/30"
+KEYWORDS="~amd64"
+IUSE="emacs fastjet hepmc java 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:0= )
+	hepmc? ( sci-physics/hepmc:3= )
 	lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${CDEPEND}
@@ -60,9 +60,9 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		$(use_enable c++11 stdcxx11) \
 		$(use_with fastjet fastjet "${EPREFIX}"/usr) \
 		$(use_with hepmc hepmc "${EPREFIX}"/usr) \
+		$(use_with hepmc hepmcversion 3) \
 		$(use_with java javagui) \
 		$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
 		--without-rivet \
@@ -87,6 +87,8 @@ src_install() {
 	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
 	EOF
 	doenvd "${T}"/50${PN}
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {