gentoo auto-resync : 23:04:2024 - 23:59:26

10 files changed, 169 insertions, 22 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index c1885d75610b..41c99148248f 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index d0ed03cef35d..409f0f37723c 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -2,6 +2,6 @@ AUX geant-4.11.0.2-musl-avoid-execinfo.patch 2812 BLAKE2B 7bede49a061f174d2cd3ad
 AUX geant-4.11.2.1-find-soxt-noversion.patch 744 BLAKE2B 8cd3fa68d2ae631fe8cbf7a6a09e1679dfd205b68747286611886e6029f90041774df5108893a96cd5923cbe47d3a8139431b1f831b31223d4e24885338ce530 SHA512 bce5fe13aef48b7972bb0b2ed79b5d683791a503920dca9cd1bbcf0b6c16a08eef3d41514d62ca42fb1284d3e00e465785b1ecf37f8a6bb0c1574cc5c35a1087
 DIST geant4-v11.2.0.tar.gz 36652313 BLAKE2B 41b5138b778be1302776961c0e029efd6143ceed9f3e81b0b1aeb542e1999f746b85dfe66b02421ce38e9475fd95ac0b2513944e13e4689a2e5ec627fa5b9e45 SHA512 57b31fd4125d992754e7ce2770d7427355d204cb0b28708429f8c7983aeb0b41897aa3f5fd345489b343232f459eede6b153752fece96146a7ee59660363acf9
 DIST geant4-v11.2.1.tar.gz 36631774 BLAKE2B e7c8f97f9ceaa32b38954f4ae9b49e2236134a8f5b9cb720d207ece002e7e2f1eb993888b2c53a09aa5293709502a3ab2b13332083a4332c466adaa59110905e SHA512 bdbf4e6ecc4ba5119b5364707cc256e92ea1a245f1c14a434bb7ad748649b27b6b0e20fb1b0624cfe2c66b4267c8a3ff25069794a47d348242cd5664e72812ab
-EBUILD geant-4.11.2.0.ebuild 2906 BLAKE2B c327629c21cf7842961a8cd12fc327bddcc4ab955ab244349170b8a45b785b3bb55aae49ccc9d898fbcd7b06e3f760fb12783edbddcc94d37939c2178ca3b9be SHA512 958751b611f0f9d499c26e70164090d578636925fa72d1cb855e5b5ea1ba50ea60d9ae87106a24ed610b76615431c6a10b4e24c746edd7e5c89d4f5ae648f944
-EBUILD geant-4.11.2.1.ebuild 2963 BLAKE2B 737dd2c844ec528878e9ab8afe18bd1301e8a31ddcdbadd4f112430ed2c4053b6c72934a64c55a0383ed02fda8a7cdd5c2f29053f2d0a170ce07745c089c9f0d SHA512 e07d68fb27b0e0a06088d091984228c8ed865433ba4a2a3353a6c33f51d8d56a3933691212592e92b035f8b90794de3c7f286a0d85b9b6c8e0297056c71a0e55
+EBUILD geant-4.11.2.0-r1.ebuild 2908 BLAKE2B a6f64b6bd5c33cfe14e813ab4ced1e9683822b45c025d648b6a4e24c2a0406f6d10a74ccbb188c75af1236eca71b94e9c33b304303a5164ee27170119ffcfb9c SHA512 d20149015d544ceb95adb5f7ef5521142765357d051338e544c603f51bae6c828bf6afcc167d0667709f97cb32c08cdaad6ad2cbacb5f2a232cddb1f9cbcfa32
+EBUILD geant-4.11.2.1-r1.ebuild 2965 BLAKE2B 7e8eaa4b9666ab669f8766d7414f33bdea7a850780c31592ee1857c34cba52d4dd3e57d8c5c89b89dacba5256e7a7d61fa92e9ca7656ef14234836be0ca43318 SHA512 34ae1084af718ca58e6f913a69c005b65db57ad86abd86566fffa3658bf48e5c4d8a8d80921aae66e24ae24a67ab0303477361a3ceec99f71790aec4c6178a2e
 MISC metadata.xml 1527 BLAKE2B f077711907b2effb5aa79e7470db8397e36dddad753e494e2398c72992b6b5cc1f1ef6ed3fa35640ccd119a7a46448e0f3b205803e886b6a587ba5afe4a568b5 SHA512 db1ae57378e4f109283b14d8f27ef38e0426b39a33cdd6bdf2fd6683bbf6b1cca5e89e78ef6771afa3e770af3db872c7bfbbfae3177f516147e2527aae51b181
diff --git a/sci-physics/geant/geant-4.11.2.0.ebuild b/sci-physics/geant/geant-4.11.2.0-r1.ebuild
index 64eea6cb2e9b..3cfc83638d74 100644
--- a/sci-physics/geant/geant-4.11.2.0.ebuild
+++ b/sci-physics/geant/geant-4.11.2.0-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	data? ( ~sci-physics/geant-data-4.11.2.0 )
 	doc? ( app-doc/geant-docs )
 	gdml? ( dev-libs/xerces-c )
-	hdf5? ( sci-libs/hdf5[threads?] )
+	hdf5? ( sci-libs/hdf5:=[threads?] )
 	inventor? ( media-libs/SoXt )
 	motif? ( x11-libs/motif:0 )
 	opengl? ( virtual/opengl )
diff --git a/sci-physics/geant/geant-4.11.2.1.ebuild b/sci-physics/geant/geant-4.11.2.1-r1.ebuild
index 798bd3585b77..22d1352ce552 100644
--- a/sci-physics/geant/geant-4.11.2.1.ebuild
+++ b/sci-physics/geant/geant-4.11.2.1-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	data? ( ~sci-physics/geant-data-4.11.2.0 )
 	doc? ( app-doc/geant-docs )
 	gdml? ( dev-libs/xerces-c )
-	hdf5? ( sci-libs/hdf5[threads?] )
+	hdf5? ( sci-libs/hdf5:=[threads?] )
 	inventor? ( media-libs/SoXt )
 	motif? ( x11-libs/motif:0 )
 	opengl? ( virtual/opengl )
diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 359937947fcc..6417e5a074fa 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -1,11 +1,14 @@
 AUX thepeg-1.8.3-java.patch 922 BLAKE2B 6ecd71735f8fd13c3a8220290ee0eb7b78e66ae4712296b2621dea639952d886181290ecf0bb3f4efa0a61e0485b6afc2824b7372568dcceba0eeaf8ebfc5099 SHA512 2c2bd711e6a96e3e8ab12b313929b7e4814b69bd7f7631e137c233ec2478d4538299113c035ed94b8e58aa1195b0c8cdc21d23996fbecbb0319815b162556699
 AUX thepeg-2.0.4-gcc6.patch 252 BLAKE2B 4503804e2d5f25fdc81e05bbc960e873c9f7d70d25ed6fdf1425658b2fadbf39e7d537afedf365ec1659ad268d450f5a36649726ec692fd0bb8c8cecf36f5ffb SHA512 741dc3a52fdd040b2fc0ba21c778b4e2427abd55977f3858ef8f8acedc2c3a4007a38fe0903cf89eb1c305ebbc31f527f04d52da794ac85563864c53d50c4363
+AUX thepeg-2.3.0-rivet.patch 962 BLAKE2B 36688e2459755c94285d80ad0e350665479572c4abe8cf6969fb78b35fbe1133b4c5179a66bf5cea2ab158076194e3ac7d0a84e2548208df9ca04bfac4f264a7 SHA512 cbf74e54557c26d8e3725f9cc57f923c8548f0a73ec3345bffba5bbb0bbd827d6c8a0ee4907b335e8d6a527f23aa40c13209854af8388dd4ab86468d2fa6615a
 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
 DIST cteq6ll.LHpdf 1461 BLAKE2B 66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640 SHA512 b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728
-EBUILD thepeg-2.2.2-r1.ebuild 2318 BLAKE2B 198a099e8897c1683e81f569b3971aa64056edbb6862fe5d0c10a99c8be1e627877c195dcd6b95e1382537c4fe9220896a43f83716bea946c2d50ff8209aa33f SHA512 29710ea880cd8431a88cabe37ae7368b6869b0c3d7348ef57cdfc685200a1b28699bd46d593ba4d5d5959c4d227c7be531009f170ddeeefa5873060c9c0094e3
-EBUILD thepeg-2.2.3.ebuild 2358 BLAKE2B ef033cd6079cc9016f3283ac2925af5e012d3c3d92d0e73387032cac5d781d69f9cb7eb51088a3e4a604ea7fc0a137c5d5796c1f5c3f48c63d90625148813502 SHA512 dbcf6d330d833f5413997b7b322de85b738e02772b0d2577373d1465a1c72a797b8bfd4125876723e77cc72247fcbd26a846a801bf799ec3c52de20770bb1921
-MISC metadata.xml 878 BLAKE2B 6200c891f074de407c7af4ce318a9e045f2e2e6e3677e841b9b084c1e3c336bc017af5b7e10f19849168482c42e4d24e71aa59f9b026c51cdeb5ed4a5b4e32b1 SHA512 700df3c90c7627cb383ee800e9714db203daeb5057d8340b4929447e291dc5a614c5e632277c1c9c921466956ec35b3a2e9b360698aa6e341a96de3f1156baa4
+EBUILD thepeg-2.2.2-r1.ebuild 2317 BLAKE2B fe1919848084dfcaa429ce9e380ce0d081278258c45fae03e1d4312394da1bd43fe71e665f14d436350b421fefba26ed577db50de5fdb5deb2729897b051cdcb SHA512 dd6a52ffc8be6a19b3d24289a6adafc95b71667214e4615ae776a7a7c8486044a5a5b3f9d99de045fa58938e3b734cbd9875fb279e95a951a238c5bdcfb897e6
+EBUILD thepeg-2.2.3-r1.ebuild 2363 BLAKE2B e174254dc806de8ee70272066eacb847eef015d2271f25a0959fb1b2aab5f0d3edf542a69cf58306463cfea8d14168a9b02329fc836f7f463f266b07c3576c17 SHA512 dfa80a7019a684ea0ade71cdc4b26fcf25a9777b6cfbf48b66856395e56dc40ee02e8bf550021ca409df421b12519a3693aee2fbf5aeca99db7b61d27724c04d
+EBUILD thepeg-2.3.0.ebuild 2646 BLAKE2B f138f84a0be868718c892e3f2cb9ccc8df98c905b68d5bfd9239fbb372f29f95ef98bbc883c24dda18b8f2bb7e7ba1abe602b2d3d5118a38ac46f7f2e9116a8d SHA512 8b07b72cd2151639b9a73d45a2d906d8ed1b4a6b7344db26ffa504d0e161e858b9717f36c366b85da09de33c8dfaa3f4701b018bd617091086ed2f261d98f482
+MISC metadata.xml 1289 BLAKE2B 671ecee27bfb52b222ce0c657d197fc27f1c75e4bd73f1b12dc99b4db0f984d990655ccaaec0670a263e0b8a837ece7d8e15c4fc1642feac6223c946941c9cb0 SHA512 0ba9d4e56ad1dd403d2412c70a71fa26bedc9580326dc5f7db63793853bbe0a2963280e817e5240a0f5c562a8125b274bddba9fed557cb0fe838ee2f84f1d6af
diff --git a/sci-physics/thepeg/files/thepeg-2.3.0-rivet.patch b/sci-physics/thepeg/files/thepeg-2.3.0-rivet.patch
new file mode 100644
index 000000000000..1770b4451534
--- /dev/null
+++ b/sci-physics/thepeg/files/thepeg-2.3.0-rivet.patch
@@ -0,0 +1,25 @@
+--- a/Analysis/RivetAnalysis.cc	2024-01-30 23:57:34.065788628 +0100
++++ b/Analysis/RivetAnalysis.cc	2024-01-31 00:00:54.544781058 +0100
+@@ -31,7 +31,22 @@
+   AnalysisHandler::analyze(event, ieve, loop, state);
+   // Rotate to CMS, extract final state particles and call analyze(particles).
+   // convert to hepmc
++#ifdef HAVE_HEPMC3
++    std::shared_ptr<HepMC3::GenRunInfo> ri = std::make_shared<HepMC3::GenRunInfo>();
++    std::vector<std::string>  w_names;
++    w_names.push_back("Default");
++    for ( map<string,double>::const_iterator w = event->optionalWeights().begin();
++     w != event->optionalWeights().end(); ++w ) {
++     w_names.push_back(w->first);
++    }
++    ri->set_weight_names(w_names);
++#endif
++
+   HepMC::GenEvent * hepmc = ThePEG::HepMCConverter<HepMC::GenEvent>::convert(*event);
++#ifdef HAVE_HEPMC3
++  hepmc->set_run_info(ri);
++#endif
++
+   // analyse the event
+   if(_nevent>1) CurrentGenerator::Redirect stdout(cout);
+   if ( _rivet ){
diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index cacb2f090dd4..50328a988ae2 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>alexander@neuwirth-informatik.de</email>
+		<name>Alexander Puck Neuwirth</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sci-physics@gentoo.org</email>
 		<name>Gentoo Physics Project</name>
@@ -14,8 +18,12 @@
 	</longdescription>
 	<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="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>
 	</use>
+	<upstream>
+		<doc>https://thepeg.hepforge.org/doxygen/</doc>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
index dac77266dd4f..d01ade252d4f 100644
--- a/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,8 +17,9 @@ SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
 		${TEST_URI}/cteq5l.LHgrid
 		${TEST_URI}/GRV98nlo.LHgrid
 		${TEST_URI}/MRST2001nlo.LHgrid ) )"
+S="${WORKDIR}/${MY_P}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0/20"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="emacs fastjet hepmc java lhapdf static-libs test zlib"
@@ -37,8 +38,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	java? ( virtual/jre:1.8 )"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.3-java.patch
 	"${FILESDIR}"/${PN}-2.0.4-gcc6.patch
diff --git a/sci-physics/thepeg/thepeg-2.2.3.ebuild b/sci-physics/thepeg/thepeg-2.2.3-r1.ebuild
index e7cb0fa42ad8..c84a2d6c96e3 100644
--- a/sci-physics/thepeg/thepeg-2.2.3.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,23 +12,24 @@ HOMEPAGE="http://home.thep.lu.se/ThePEG/"
 
 TEST_URI="https://www.hepforge.org/archive/lhapdf/pdfsets/current"
 SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
-	test? ( hepmc? (
+	test? ( hepmc3? (
 		${TEST_URI}/cteq6ll.LHpdf
 		${TEST_URI}/cteq5l.LHgrid
 		${TEST_URI}/GRV98nlo.LHgrid
 		${TEST_URI}/MRST2001nlo.LHgrid ) )"
+S="${WORKDIR}/${MY_P}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0/30"
 KEYWORDS="~amd64 ~x86"
-IUSE="emacs fastjet hepmc java lhapdf static-libs test zlib"
+IUSE="emacs fastjet +hepmc3 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:3= )
+	hepmc3? ( sci-physics/hepmc:3= )
 	lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${CDEPEND}
@@ -40,8 +41,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	java? ( virtual/jre:1.8 )"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.3-java.patch
 	"${FILESDIR}"/${PN}-2.0.4-gcc6.patch
@@ -64,8 +63,8 @@ src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with fastjet fastjet "${EPREFIX}"/usr) \
-		$(use_with hepmc hepmc "${EPREFIX}"/usr) \
-		$(use_with hepmc hepmcversion 3) \
+		$(use_with hepmc3 hepmc "${EPREFIX}"/usr) \
+		$(use_with hepmc3 hepmcversion 3) \
 		$(use_with java javagui) \
 		$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
 		$(use_with test boost "${EPREFIX}"/usr) \
diff --git a/sci-physics/thepeg/thepeg-2.3.0.ebuild b/sci-physics/thepeg/thepeg-2.3.0.ebuild
new file mode 100644
index 000000000000..f378565e51ca
--- /dev/null
+++ b/sci-physics/thepeg/thepeg-2.3.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 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="
+	http://home.thep.lu.se/ThePEG/
+	https://thepeg.hepforge.org/
+"
+
+TEST_URI="https://www.hepforge.org/archive/lhapdf/pdfsets/current"
+SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
+	test? (
+		hepmc3? (
+			${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/30"
+KEYWORDS="~amd64"
+IUSE="emacs fastjet +hepmc3 lhapdf static-libs test zlib rivet"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sci-libs/gsl:0=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fastjet? ( sci-physics/fastjet:0= )
+	rivet? ( sci-physics/rivet:3=[hepmc3] )
+	hepmc3? ( sci-physics/hepmc:3= )
+	lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${CDEPEND}
+	sci-libs/gsl:=
+	java? ( virtual/jdk:1.8 )
+	test? (
+		sys-process/time
+		dev-libs/boost
+	)"
+RDEPEND="${CDEPEND}
+	java? ( virtual/jre:1.8 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.3-java.patch
+	"${FILESDIR}"/${PN}-2.0.4-gcc6.patch
+	"${FILESDIR}"/${PN}-2.3.0-rivet.patch # properly support rivet/yoda weights in thepeg, reported to upstream by mail.
+)
+
+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() {
+	local -x CONFIG_SHELL=/bin/bash
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with fastjet fastjet "${ESYSROOT}"/usr) \
+		$(use_with hepmc3 hepmc "${ESYSROOT}"/usr) \
+		$(use_with hepmc3 hepmcversion 3) \
+		$(use_with java javagui) \
+		$(use_with lhapdf lhapdf "${ESYSROOT}"/usr) \
+		$(use_with test boost "${ESYSROOT}"/usr) \
+		$(use_with rivet rivet "${ESYSROOT}"/usr) \
+		$(use_with zlib zlib "${ESYSROOT}"/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} || die
+	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
+}