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

3 files changed, 187 insertions, 3 deletions

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
+}