[gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2016-04-13 13:55 Guilherme Amadio
  0 siblings, 0 replies; 20+ messages in thread
From: Guilherme Amadio @ 2016-04-13 13:55 UTC (permalink / raw
  To: gentoo-commits

commit:     b4d92ccc2cd035ae996dd1bb3a98c69f5f8891cf
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 13:53:19 2016 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 13:55:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d92ccc

sci-physics/pythia-6.4.28: Fix SRC_URI for upstream change

Gentoo-Bug: 579738

Package-Manager: portage-2.2.28

 sci-physics/pythia/pythia-6.4.28.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/pythia/pythia-6.4.28.ebuild b/sci-physics/pythia/pythia-6.4.28.ebuild
index 663c836..edb0391 100644
--- a/sci-physics/pythia/pythia-6.4.28.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://pythia6.hepforge.org/"
 # tar cJf pythia-6.4.x.tar.xz
 SRC_URI="
 	https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.xz
-	ftp://root.cern.ch/root/pythia6.tar.gz
+	https://root.cern.ch/download/pythia6.tar.gz
 	doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp${DOC_PV}man2.pdf )
 	examples? ( mirror://gentoo/${PN}-${EX_PV}-examples.tar.bz2 )"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2016-04-14  0:30 Andrew Savchenko
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Savchenko @ 2016-04-14  0:30 UTC (permalink / raw
  To: gentoo-commits

commit:     87d0cb1b5fefef7744476c7e774a2ac4f47c8807
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 00:28:33 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 00:29:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d0cb1b

sci-physics/pythia: revision bump due to upstream tarball change

See bug 579738.

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 sci-physics/pythia/Manifest                |  1 +
 sci-physics/pythia/pythia-6.4.28-r1.ebuild | 69 ++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 3276573..b3c074b 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -8,6 +8,7 @@ DIST cteq6l1.tar.gz 317834 SHA256 57c9c99d7b83c8ed1ca70480a0ec7bf2183bfa1bd9276a
 DIST lutp0613man2.pdf 2902047 SHA256 03d637310ea80f0d7aea761492bd38452c602890d8cf913a1ec9edacd79fa43d SHA512 a8439b3b150b6f3924d4d3671a4fad6a815c374b1f46060072ca6c1faa797a2f73f8727920aaa7ae885c4f6f135c8d8f94d43e518cfe25271bb95652112def58 WHIRLPOOL dd74046a145264653efdc1f96c330a0aa1e71b72578f32b114d9041c6a50e6e03aa5b3e028ab737afa01d9f3fc9928fa3589238ff4c232e90c8362201792ef99
 DIST pythia-6.4.18-examples.tar.bz2 36366 SHA256 17b1809fb0cffba20115c2bc1032c24d8efece25bd3f1f632f88265ade4dd084 SHA512 ba921379a6df4ca417b60ea5b78af506f13135cdf896fa6beeca9713428ad6f298c94c0fe65fca3e583f8f268dcf84ebe4f1f81b46fd865d5f641f7c1e9fa7e1 WHIRLPOOL 5b53f523d0819400da791d471c207c4d0d6cfd43cbb9423900b593015aa4db68632d97615ffd213493ff0b0306ce7b8c4851e58672e1188df1a61352e1af0d17
 DIST pythia-6.4.28.tar.xz 490248 SHA256 6ca6acc172314cf7b56e2a8e18321d28ce57a511e34210a6c64ebbfd5e06d5f4 SHA512 f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc WHIRLPOOL d6ab42af092348b1ae5c5078c34ef17042b46f728d6c4068cd0930999ccbfefae9b55be05499188525c9fc6499c8cb8c490fe6a37f04bf9b45048f7cf8026cdb
+DIST pythia6-20160413.tar.gz 567976 SHA256 d613dcb27c905710e2f13a934913cc5545e3e5d0e477e580107385d9ef260056 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3 WHIRLPOOL ab69aeb8d3591b3b0adcc22ed249047bac99f05daf74801c6d26d04df1ad6807cb4ce66ce8acf54476ea20eb9cdac2b719fc6d9280d546fe4be1d09f55840d01
 DIST pythia6.tar.gz 567451 SHA256 ebc90b8ec94897d8b09030341323d2c7c6e5c7c65077f98b96c8cff00d40a5ce SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1 WHIRLPOOL e334779f77e938cde85ecd0fbc2dbf0d86a52fc1ef673c909b8533f779e51d6d6680bc5de3aceeb002015ccfdf03da3f975aaf0cc7a249c462cdd3b206c359a2
 DIST pythia8186.tgz 8921248 SHA256 1c0914fc04801ee922c1ad3b544a3cd48b34d9afa4407ae40afbacd009039bd2 SHA512 84729004abbdf522183c27918ae35db037a8954af761a2b452dcff54f82076b1e3bfc7fe9ea0a7cb2c0b6499aedb1c25cc13768d47b24edaa08d631b55d0b86b WHIRLPOOL ecef83d2cb018b1aac55225850cf2a3a8f2b87d08f99bd9c5881f4fa341f012eeabed3b9a43ffda3699daebc54c181d08aac30c1f6b514e98516c29e88a6fbaf
 DIST pythia8210.tgz 14301345 SHA256 a2564c6011235a286115ba9da065f50c1233229b2f1a824583565dfeec0baa35 SHA512 fe2d02e32fd5d25bcdcc216754b91ca509a189c58f1a06ca8deba975af552586632fc8cf8ad3e62920884ee64c4af596fbe7c6872f5ddbd1f5a0cea4ba4bc90d WHIRLPOOL d2d3f212ed2ad700fa6ae44b2b670cce1623e80382af04072bee884a72ea269346c10728cc77cfa4c9377e8cd775febe9488427cb0b890e52c651efebd66f60c

diff --git a/sci-physics/pythia/pythia-6.4.28-r1.ebuild b/sci-physics/pythia/pythia-6.4.28-r1.ebuild
new file mode 100644
index 0000000..197dd15
--- /dev/null
+++ b/sci-physics/pythia/pythia-6.4.28-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools fortran-2 versionator
+
+MV=$(get_major_version)
+MY_PN=${PN}${MV}
+DOC_PV=0613
+EX_PV=6.4.18
+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://dev.gentoo.org/~bicatali/distfiles/${P}.tar.xz
+	https://root.cern.ch/download/pythia6.tar.gz -> ${PYR_P}.tar.gz
+	doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp${DOC_PV}man2.pdf )
+	examples? ( mirror://gentoo/${PN}-${EX_PV}-examples.tar.bz2 )"
+
+SLOT="6"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs"
+
+src_prepare() {
+	cp ../pythia6/tpythia6_called_from_cc.F .
+	cp ../pythia6/pythia6_common_address.c .
+	cat > configure.ac <<-EOF
+		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"
+	echo >> Makefile.am "libpythia6_la_SOURCES = \ "
+	# 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} \\"
+	done
+	echo  >> Makefile.am "  ssmssm.f sugra.f visaje.f pdfset.f \\"
+	echo  >> Makefile.am "  tpythia6_called_from_cc.F pythia6_common_address.c"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodoc update_notes.txt
+	use doc && dodoc "${DISTDIR}"/lutp${DOC_PV}man2.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${WORKDIR}"/examples
+	fi
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2021-01-20 10:16 David Seifert
  0 siblings, 0 replies; 20+ messages in thread
From: David Seifert @ 2021-01-20 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f52b501c92f9e8089447b76566495185d851f271
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Jan 20 10:16:11 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 10:16:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52b501c

sci-physics/pythia: Remove old

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-physics/pythia/Manifest             |   1 -
 sci-physics/pythia/pythia-8.1.86.ebuild | 100 -----------------
 sci-physics/pythia/pythia-8.2.10.ebuild | 184 --------------------------------
 3 files changed, 285 deletions(-)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index ed97e8094c2..a8c8cb3fe79 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -11,5 +11,4 @@ DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b98055
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
 DIST pythia6.tar.gz 567451 BLAKE2B c32a67d87fc6f22027d3d9551256af5a0151e494fbae02c5d14ccf08595f1ebf49b638a1c33f7a52214e8bbb510756a72ef0f68f5dc8037e2a6acd3fbf290cfd SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1
 DIST pythia8186.tgz 8921248 BLAKE2B 9e753a04c2dbc5362a24b06d40c238e5fcc5ac700dd20b9bc47b1a68604fdb87808018593c28a1d6dcb06a212bdec1146431f1096db70f4c934413a0c3b20fa0 SHA512 84729004abbdf522183c27918ae35db037a8954af761a2b452dcff54f82076b1e3bfc7fe9ea0a7cb2c0b6499aedb1c25cc13768d47b24edaa08d631b55d0b86b
-DIST pythia8210.tgz 14301345 BLAKE2B 799955192d55f34fb7a0b91c4ea4b130fe2836437b5fed3416be5e0edf476c00a3054615e73d3b926cfc3facffbf6bbd973fb59e1439481a95c00e91fdabb5f5 SHA512 fe2d02e32fd5d25bcdcc216754b91ca509a189c58f1a06ca8deba975af552586632fc8cf8ad3e62920884ee64c4af596fbe7c6872f5ddbd1f5a0cea4ba4bc90d
 DIST pythia8226.tgz 17639842 BLAKE2B b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad SHA512 85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0

diff --git a/sci-physics/pythia/pythia-8.1.86.ebuild b/sci-physics/pythia/pythia-8.1.86.ebuild
deleted file mode 100644
index b7a47e6657b..00000000000
--- a/sci-physics/pythia/pythia-8.1.86.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator toolchain-funcs multilib
-
-MV=$(get_major_version)
-MY_P=${PN}$(replace_all_version_separators "" ${PV})
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia8.hepforge.org/"
-SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz"
-
-SLOT="8"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gzip +hepmc static-libs"
-
-DEPEND="
-	gzip? ( dev-libs/boost sys-libs/zlib )
-	hepmc? ( sci-physics/hepmc:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	PYTHIADIR="${EPREFIX}/usr/share/pythia8"
-	# set datadir for xmldor in include file
-	sed -i \
-		-e "s:../xmldoc:${PYTHIADIR}/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::g" \
-		configure || die
-	sed -i \
-		-e "s:LIBDIR=.*:LIBDIR=$(get_libdir):" \
-		-e "s:LIBDIRARCH=.*:LIBDIRARCH=$(get_libdir):" \
-		-e "s:cp -r lib:cp -r $(get_libdir):" \
-		-e '/ln -fs/d' \
-		Makefile examples/Makefile || die
-}
-
-src_configure() {
-	export USRCXXFLAGS="${CXXFLAGS}"
-	export USRLDFLAGSSHARED="${LDFLAGS}"
-	tc-export CC CXX
-	# homemade configure script
-	./configure \
-		--installdir="${EPREFIX}/usr" \
-		--datadir="${PYTHIADIR}" \
-		--enable-shared \
-		$(usex gzip "--enable-gzip=yes" "") \
-		$(usex hepmc "--with-hepmcversion=2 --with-hepmc=${EPREFIX}/usr" "") \
-		|| die
-	if ! use static-libs; then
-		sed -i \
-			-e '/targets.*=$(LIBDIR.*\.a$/d' \
-			-e 's/+=\(.*libpythia8\.\)/=\1/' \
-			Makefile || die
-		sed -i \
-			-e 's:\.a:\.so:g' \
-			-e 's:$(LIBDIRARCH):$(LIBDIR):g' \
-			examples/Makefile || die
-	fi
-}
-
-src_test() {
-	cd examples || die
-	# use emake for parallel instead of long runmains
-	local tests="$(echo main0{1..8})" t
-	use hepmc && tests="${tests} main31"
-	emake ${tests}
-	for t in ${tests}; do
-		LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
-			bin/${t}.exe > ${t}.out || die "test ${t} failed"
-	done
-	emake clean && rm main*out
-}
-
-src_install() {
-	emake INSTALLDIR="${ED}/usr" DATADIR="${D}/${PYTHIADIR}" install
-	rm -r "${D}"/${PYTHIADIR}/{html,php}doc || die
-	echo "PYTHIA8DATA=${PYTHIADIR}/xmldoc" >> 99pythia8
-	doenvd 99pythia8
-
-	dodoc GUIDELINES AUTHORS README
-	if use doc; then
-		dodoc worksheet.pdf
-		dohtml -r htmldoc/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}

diff --git a/sci-physics/pythia/pythia-8.2.10.ebuild b/sci-physics/pythia/pythia-8.2.10.ebuild
deleted file mode 100644
index 8c08ee47f62..00000000000
--- a/sci-physics/pythia/pythia-8.2.10.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator
-
-MV=$(get_major_version)
-MY_P=${PN}$(replace_all_version_separators "" ${PV})
-LHA_VER="6.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia8.hepforge.org/"
-SRC_URI="http://home.thep.lu.se/~torbjorn/${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 ~amd64-linux ~x86-linux"
-IUSE="doc examples gzip +hepmc fastjet lhapdf root static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	fastjet? ( >=sci-physics/fastjet-3 )
-	gzip? ( sys-libs/zlib )
-	hepmc? ( sci-physics/hepmc:0= )
-	lhapdf? ( >=sci-physics/lhapdf-6:= )
-"
-# ROOT is used only when building related tests
-DEPEND="${RDEPEND}
-	test? ( root? ( sci-physics/root:= ) )
-"
-
-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}"
-	# 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
-	if ! use static-libs; then
-		sed -i \
-			-e '/TARGETS=$(LOCAL_LIB)\/libpythia8\.a/d' \
-			-e 's:libpythia8\.a$:libpythia8\.so$:g' \
-			Makefile || die
-		sed -i 's:libpythia8\.a:libpythia8\.so:g' \
-			examples/Makefile || die
-	fi
-
-	epatch "${FILESDIR}/${PN}8209-run-tests.patch"
-	epatch "${FILESDIR}/${PN}8209-root-noninteractive.patch"
-}
-
-# 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 gzip "--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 lib/*
-	insinto "${PYTHIADIR}"
-	doins -r share/Pythia8/xmldoc examples/Makefile.inc
-
-	echo "PYTHIA8DATA=${EPYTHIADIR}/xmldoc" >> 99pythia8
-	doenvd 99pythia8
-
-	dodoc AUTHORS GUIDELINES README
-	if use doc; then
-		dodoc share/Pythia8/pdfdoc/*
-		dohtml -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/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# cleanup
-	unset PYTHIADIR EPYTHIADIR
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2021-02-13 22:52 David Seifert
  0 siblings, 0 replies; 20+ messages in thread
From: David Seifert @ 2021-02-13 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     b85cd98a24a07c3b349f84c254b76ce65df824d2
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Feb 13 22:51:39 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 22:51:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85cd98a

sci-physics/pythia: Port pythia:8 to EAPI 7

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...ythia-8.2.26.ebuild => pythia-8.2.26-r1.ebuild} | 57 ++++++++++++----------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/sci-physics/pythia/pythia-8.2.26.ebuild b/sci-physics/pythia/pythia-8.2.26-r1.ebuild
similarity index 85%
rename from sci-physics/pythia/pythia-8.2.26.ebuild
rename to sci-physics/pythia/pythia-8.2.26-r1.ebuild
index 5adb37c9e6d..d76dc0fc811 100644
--- a/sci-physics/pythia/pythia-8.2.26.ebuild
+++ b/sci-physics/pythia/pythia-8.2.26-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils multilib toolchain-funcs versionator
+inherit toolchain-funcs
 
-MV=$(get_major_version)
-MY_P=${PN}$(replace_all_version_separators "" ${PV})
+MV=$(ver_cut 1)
+MY_P="${PN}${PV//./}"
 LHA_VER="6.1"
 
 DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
@@ -25,19 +25,24 @@ SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
 SLOT="8"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gzip +hepmc fastjet lhapdf root static-libs test"
+IUSE="doc examples fastjet gzip +hepmc lhapdf root test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	fastjet? ( >=sci-physics/fastjet-3 )
+	fastjet? ( sci-physics/fastjet )
 	gzip? ( sys-libs/zlib )
 	hepmc? ( sci-physics/hepmc:0= )
-	lhapdf? ( >=sci-physics/lhapdf-6:= )
-"
+	lhapdf? ( sci-physics/lhapdf:= )"
 # ROOT is used only when building related tests
 DEPEND="${RDEPEND}
-	test? ( root? ( sci-physics/root:= ) )
-"
+	test? (
+		root? ( sci-physics/root:= )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PF}-run-tests.patch
+	"${FILESDIR}"/${PN}8209-root-noninteractive.patch
+)
 
 S="${WORKDIR}/${MY_P}"
 
@@ -51,6 +56,8 @@ pkg_pretend() {
 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:" \
@@ -84,18 +91,13 @@ src_prepare() {
 		examples/main54.cc || die
 	# ask cflags from root
 	sed -i "s:root-config:root-config --cflags:g" examples/Makefile || die
-	if ! use static-libs; then
-		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
-	fi
 
-	eapply "${FILESDIR}/${PF}-run-tests.patch"
-	eapply "${FILESDIR}/${PN}8209-root-noninteractive.patch"
-	eapply_user
+	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:
@@ -157,17 +159,18 @@ src_install() {
 	# make install is too broken, much easier to install manually
 	dobin bin/pythia8-config
 	doheader -r include/*
-	dolib lib/*
+	dolib.so lib/libpythia8.so
 	insinto "${PYTHIADIR}"
 	doins -r share/Pythia8/xmldoc examples/Makefile.inc
 
-	echo "PYTHIA8DATA=${EPYTHIADIR}/xmldoc" >> 99pythia8
-	doenvd 99pythia8
+	newenvd - 99pythia8 <<- _EOF_
+		PYTHIA8DATA=${EPYTHIADIR}/xmldoc
+	_EOF_
 
 	dodoc AUTHORS GUIDELINES README
 	if use doc; then
-		dodoc share/Pythia8/pdfdoc/*
-		dohtml -r share/Pythia8/htmldoc/*
+		dodoc -r share/Pythia8/pdfdoc/.
+		dodoc -r share/Pythia8/htmldoc/.
 	fi
 	if use examples; then
 		# reuse system Makefile.inc
@@ -175,7 +178,7 @@ src_install() {
 		sed -i "s:include Makefile.inc:include ${EPYTHIADIR}:" \
 			examples/Makefile || die
 
-		insinto /usr/share/doc/${PF}
+		insinto /usr/share/${PN}
 		doins -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2021-02-14 10:27 David Seifert
  0 siblings, 0 replies; 20+ messages in thread
From: David Seifert @ 2021-02-14 10:27 UTC (permalink / raw
  To: gentoo-commits

commit:     3b6d53abb3c3930dfb8e4cb71de672233e0a4ec2
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Feb 14 10:27:34 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 10:27:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b6d53ab

sci-physics/pythia: Apply the correct patch in pythia:8

Closes: https://github.com/gentoo/gentoo/pull/19458
Closes: https://bugs.gentoo.org/770445
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-physics/pythia/pythia-8.2.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/pythia/pythia-8.2.26-r1.ebuild b/sci-physics/pythia/pythia-8.2.26-r1.ebuild
index d76dc0fc811..3c735682cf1 100644
--- a/sci-physics/pythia/pythia-8.2.26-r1.ebuild
+++ b/sci-physics/pythia/pythia-8.2.26-r1.ebuild
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PF}-run-tests.patch
+	"${FILESDIR}"/${P}-run-tests.patch
 	"${FILESDIR}"/${PN}8209-root-noninteractive.patch
 )
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2021-02-24 23:51 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-02-24 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     60f0d52609574717c1c74d72fc915e3e1bfbfa63
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 23:51:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 23:51:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f0d526

sci-physics/pythia: Stabilize 6.4.28-r2 x86, #770442

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-physics/pythia/pythia-6.4.28-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/pythia/pythia-6.4.28-r2.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
index 86fbe7d4358..364be9f183d 100644
--- a/sci-physics/pythia/pythia-6.4.28-r2.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ SRC_URI="
 
 SLOT="6"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2021-02-25  6:17 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-02-25  6:17 UTC (permalink / raw
  To: gentoo-commits

commit:     a212b1f14eb995a053e09959cfdac96e9a5b7f21
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 06:17:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 06:17:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a212b1f1

sci-physics/pythia: Stabilize 6.4.28-r2 amd64, #770442

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-physics/pythia/pythia-6.4.28-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/pythia/pythia-6.4.28-r2.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
index 364be9f183d..f5761743a61 100644
--- a/sci-physics/pythia/pythia-6.4.28-r2.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 
 SLOT="6"
 LICENSE="public-domain"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2021-02-25 19:07 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-02-25 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e8e8626dfd701d1be4aa2abc5238cb5ff5cea792
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Feb 25 08:04:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 19:07:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e8626d

sci-physics/pythia: Remove old

Bug: https://bugs.gentoo.org/770442
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-physics/pythia/Manifest             |  1 -
 sci-physics/pythia/pythia-6.4.28.ebuild | 67 ---------------------------------
 2 files changed, 68 deletions(-)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 7f224575c76..f8c0687c371 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -9,5 +9,4 @@ DIST lutp0613man2.pdf 2902047 BLAKE2B c2f8e8f9031c843933cd927b32921813b580a18117
 DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B ec655014d3904b66da4a1e748a37c366c2adf9e914b9abf8c38968dcbc09129badcccd2705bc9437c05e73ee4489807835383546f55fbc9cd65399fb507e704e SHA512 ba921379a6df4ca417b60ea5b78af506f13135cdf896fa6beeca9713428ad6f298c94c0fe65fca3e583f8f268dcf84ebe4f1f81b46fd865d5f641f7c1e9fa7e1
 DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b980554046a57979cc72c80067be96f00b5056dee29fc7f0039ddae074560823427c3a0e24e59f69662f08524fbdcd4 SHA512 f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
-DIST pythia6.tar.gz 567451 BLAKE2B c32a67d87fc6f22027d3d9551256af5a0151e494fbae02c5d14ccf08595f1ebf49b638a1c33f7a52214e8bbb510756a72ef0f68f5dc8037e2a6acd3fbf290cfd SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1
 DIST pythia8226.tgz 17639842 BLAKE2B b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad SHA512 85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0

diff --git a/sci-physics/pythia/pythia-6.4.28.ebuild b/sci-physics/pythia/pythia-6.4.28.ebuild
deleted file mode 100644
index af2b9cbbb1b..00000000000
--- a/sci-physics/pythia/pythia-6.4.28.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools fortran-2 versionator
-
-MV=$(get_major_version)
-MY_PN=${PN}${MV}
-DOC_PV=0613
-EX_PV=6.4.18
-
-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://dev.gentoo.org/~bicatali/distfiles/${P}.tar.xz
-	https://root.cern.ch/download/pythia6.tar.gz
-	doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp${DOC_PV}man2.pdf )
-	examples? ( mirror://gentoo/${PN}-${EX_PV}-examples.tar.bz2 )"
-
-SLOT="6"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-src_prepare() {
-	cp ../pythia6/tpythia6_called_from_cc.F .
-	cp ../pythia6/pythia6_common_address.c .
-	cat > configure.ac <<-EOF
-		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"
-	echo >> Makefile.am "libpythia6_la_SOURCES = \ "
-	# 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} \\"
-	done
-	echo  >> Makefile.am "  ssmssm.f sugra.f visaje.f pdfset.f \\"
-	echo  >> Makefile.am "  tpythia6_called_from_cc.F pythia6_common_address.c"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc update_notes.txt
-	use doc && dodoc "${DISTDIR}"/lutp${DOC_PV}man2.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/examples
-	fi
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2021-05-23 13:29 Andrew Savchenko
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Savchenko @ 2021-05-23 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ba9d63eca7793d2bd236670186fb16b1ab7cf078
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 13:15:54 2021 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun May 23 13:28:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9d63ec

sci-physics/pythia: version bump slot 8

- Update to 8.2.45
  - This fixes build with lhapdf (bug 772923)
- Use '|' instead of ':' as sed separator due to bug 685160

Closes: https://bugs.gentoo.org/710706
Closes: https://bugs.gentoo.org/772923
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 sci-physics/pythia/Manifest             |   1 +
 sci-physics/pythia/pythia-8.2.45.ebuild | 187 ++++++++++++++++++++++++++++++++
 2 files changed, 188 insertions(+)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index f8c0687c371..f526c4d1d10 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -10,3 +10,4 @@ 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 pythia8226.tgz 17639842 BLAKE2B b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad SHA512 85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0
+DIST pythia8245.tgz 23737440 BLAKE2B 74fd060229a342a32ddd33cd1911708c03e23ee0656a23ed91663fa08b35bb015f75bedba2e6ef13cfc9524affde8e8b65653596eb34f1f080781e655b85af5b SHA512 25107eb98474217ac697476143e879c62fcf5653994a2daf61cfca892f91fbaea3c274019fb4469e9ef547e87d69b8842ee28db5fdac6433965a62eeb16ef95a

diff --git a/sci-physics/pythia/pythia-8.2.45.ebuild b/sci-physics/pythia/pythia-8.2.45.ebuild
new file mode 100644
index 00000000000..0dc12374459
--- /dev/null
+++ b/sci-physics/pythia/pythia-8.2.45.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MV=$(ver_cut 1)
+MY_P="${PN}${PV//./}"
+LHA_VER="6.1"
+
+DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
+HOMEPAGE="http://pythia8.hepforge.org/"
+SRC_URI="http://home.thep.lu.se/~torbjorn/${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 ~amd64-linux ~x86-linux"
+IUSE="doc examples fastjet gzip +hepmc lhapdf root test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	fastjet? ( sci-physics/fastjet )
+	gzip? ( sys-libs/zlib )
+	hepmc? ( sci-physics/hepmc:0= )
+	lhapdf? ( sci-physics/lhapdf:= )"
+# 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 gzip "--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
+	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
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2021-07-20 16:42 Matt Turner
  0 siblings, 0 replies; 20+ messages in thread
From: Matt Turner @ 2021-07-20 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     20662810f676778313c4654393fff47e13a2a397
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  8 05:08:30 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 16:42:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20662810

sci-physics/pythia: Rename IUSE=gzip->zlib

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sci-physics/pythia/pythia-8.2.45.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/pythia/pythia-8.2.45.ebuild b/sci-physics/pythia/pythia-8.2.45.ebuild
index 0dc12374459..64f18f325b5 100644
--- a/sci-physics/pythia/pythia-8.2.45.ebuild
+++ b/sci-physics/pythia/pythia-8.2.45.ebuild
@@ -25,14 +25,14 @@ SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
 SLOT="8"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fastjet gzip +hepmc lhapdf root test"
+IUSE="doc examples fastjet +hepmc lhapdf root test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	fastjet? ( sci-physics/fastjet )
-	gzip? ( sys-libs/zlib )
 	hepmc? ( sci-physics/hepmc:0= )
-	lhapdf? ( sci-physics/lhapdf:= )"
+	lhapdf? ( sci-physics/lhapdf:= )
+	zlib? ( sys-libs/zlib )"
 # ROOT is used only when building related tests
 DEPEND="${RDEPEND}
 	test? (
@@ -113,7 +113,7 @@ src_configure() {
 		--prefix-lib="$(get_libdir)" \
 		--prefix-share="${EPYTHIADIR}" \
 		$(usex fastjet "--with-fastjet3" "") \
-		$(usex gzip "--with-gzip" "") \
+		$(usex zlib "--with-gzip" "") \
 		$(usex hepmc "--with-hepmc2" "") \
 		$(usex lhapdf "--with-lhapdf6
 			--with-lhapdf6-plugin=LHAPDF6.h


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2022-03-20 18:51 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-03-20 18:51 UTC (permalink / raw
  To: gentoo-commits

commit:     442508ffa429a842db078f06ca8c025ddd5c7479
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 18:50:32 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 18:51:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442508ff

sci-physics/pythia: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-physics/pythia/pythia-8.2.45.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/pythia/pythia-8.2.45.ebuild b/sci-physics/pythia/pythia-8.2.45.ebuild
index 64f18f325b58..b46fed8fb5df 100644
--- a/sci-physics/pythia/pythia-8.2.45.ebuild
+++ b/sci-physics/pythia/pythia-8.2.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -107,7 +107,7 @@ src_configure() {
 	# homemade configure script
 	./configure \
 		--arch=Linux \
-		--cxx=$(tc-getCXX) \
+		--cxx="$(tc-getCXX)" \
 		--enable-shared \
 		--prefix="${EPREFIX}/usr" \
 		--prefix-lib="$(get_libdir)" \


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2022-08-26 11:13 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2022-08-26 11:13 UTC (permalink / raw
  To: gentoo-commits

commit:     9b1b955a2314b0d7f778c35640edcc2d44a35b8b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 11:11:07 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 11:13:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b1b955a

sci-physics/pythia: add 8.3.07

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-physics/pythia/Manifest             |   1 +
 sci-physics/pythia/pythia-8.3.07.ebuild | 182 ++++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index b9d8657ca23c..6da91b47b53d 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -10,3 +10,4 @@ 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

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


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2022-08-26 11:13 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2022-08-26 11:13 UTC (permalink / raw
  To: gentoo-commits

commit:     160a7a038d90f4aa325889c21769addd5d3280e2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 10:49:08 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 11:12:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=160a7a03

sci-physics/pythia: depend on hepmc:2

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-physics/pythia/{pythia-8.2.45.ebuild => pythia-8.2.45-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/pythia/pythia-8.2.45.ebuild b/sci-physics/pythia/pythia-8.2.45-r1.ebuild
similarity index 99%
rename from sci-physics/pythia/pythia-8.2.45.ebuild
rename to 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


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2022-10-18 13:57 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2022-10-18 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     163e3f4ac82513d749b0501a9b6dbe4281764421
Author:     Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Tue Oct 18 12:25:29 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 13:57:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163e3f4a

sci-physics/pythia: Install lhapdf plugin lib

Closes: https://github.com/gentoo/gentoo/pull/27395
Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../pythia/{pythia-8.2.45-r1.ebuild => pythia-8.2.45-r2.ebuild}        | 3 ++-
 sci-physics/pythia/{pythia-8.3.07.ebuild => pythia-8.3.07-r1.ebuild}   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-physics/pythia/pythia-8.2.45-r1.ebuild b/sci-physics/pythia/pythia-8.2.45-r2.ebuild
similarity index 98%
rename from sci-physics/pythia/pythia-8.2.45-r1.ebuild
rename to sci-physics/pythia/pythia-8.2.45-r2.ebuild
index 7826f78f0c0d..a660f6924c7d 100644
--- a/sci-physics/pythia/pythia-8.2.45-r1.ebuild
+++ b/sci-physics/pythia/pythia-8.2.45-r2.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}${PV//./}"
 LHA_VER="6.1"
 
 DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia8.hepforge.org/"
+HOMEPAGE="https://pythia.org/"
 SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
 	test? ( lhapdf? (
 		https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/CT10.tar.gz
@@ -159,6 +159,7 @@ src_install() {
 	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
 

diff --git a/sci-physics/pythia/pythia-8.3.07.ebuild b/sci-physics/pythia/pythia-8.3.07-r1.ebuild
similarity index 98%
rename from sci-physics/pythia/pythia-8.3.07.ebuild
rename to sci-physics/pythia/pythia-8.3.07-r1.ebuild
index 08fe8482f92e..9dc0a0382067 100644
--- a/sci-physics/pythia/pythia-8.3.07.ebuild
+++ b/sci-physics/pythia/pythia-8.3.07-r1.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}${PV//./}"
 LHA_VER="6.2.1"
 
 DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="https://pythia8.hepforge.org/"
+HOMEPAGE="https://pythia.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
@@ -154,6 +154,7 @@ src_install() {
 	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
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2022-12-11 17:55 Arthur Zamarin
  0 siblings, 0 replies; 20+ messages in thread
From: Arthur Zamarin @ 2022-12-11 17:55 UTC (permalink / raw
  To: gentoo-commits

commit:     81eec4a09d7fa3c235c65fde4bb8eeefed81f812
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 17:55:22 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 17:55:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81eec4a0

sci-physics/pythia: Keyword 8.3.07-r1 x86, #866674

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-physics/pythia/pythia-8.3.07-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/pythia/pythia-8.3.07-r1.ebuild b/sci-physics/pythia/pythia-8.3.07-r1.ebuild
index 9dc0a0382067..c96a2a3ac462 100644
--- a/sci-physics/pythia/pythia-8.3.07-r1.ebuild
+++ b/sci-physics/pythia/pythia-8.3.07-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz
 
 SLOT="8"
 LICENSE="GPL-2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples fastjet +hepmc lhapdf root test zlib"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2023-06-09 15:06 Arthur Zamarin
  0 siblings, 0 replies; 20+ messages in thread
From: Arthur Zamarin @ 2023-06-09 15:06 UTC (permalink / raw
  To: gentoo-commits

commit:     db0dbb6191c0193dc55a0bfad90d20102bcb13a7
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 14:56:27 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 14:50:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db0dbb61

sci-physics/pythia: destabilize for ~x86

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-physics/pythia/pythia-6.4.28-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/pythia/pythia-6.4.28-r2.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
index f5761743a612..9d17582d521d 100644
--- a/sci-physics/pythia/pythia-6.4.28-r2.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ SRC_URI="
 
 SLOT="6"
 LICENSE="public-domain"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2023-08-17  9:05 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2023-08-17  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     1f84e0c1d191f696872592461ffa6cb994369a4b
Author:     Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Sat Jul 29 18:47:14 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 09:05:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f84e0c1

sci-physics/pythia: update SRC_URI

Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/32056
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-physics/pythia/Manifest                |  4 ++--
 sci-physics/pythia/pythia-6.4.28-r2.ebuild | 15 +++++++++++++--
 sci-physics/pythia/pythia-8.2.45-r2.ebuild |  6 +++---
 sci-physics/pythia/pythia-8.3.09.ebuild    | 14 +++++++-------
 sci-physics/pythia/pythia-9999.ebuild      | 14 +++++++-------
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 295d8493abb6..f3de451fdba1 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -7,8 +7,8 @@ DIST cteq66.tar.gz 8647237 BLAKE2B 3ac47b6eee434f89ff329cfcb8268782af4ffa552ca4b
 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 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 pythia6428-split.tgz 689807 BLAKE2B 5acb53a75db22509e3def7d0a2fa31672e50f8db6ce64052ba0b68869c706c44e810f288f08fbbba3ef5a0c78c937556a290651f172bdec4158702fc1a76a7ac SHA512 48c08f0212b8cd7847f19d381ff4412acc3eb72fc99ed3254bff770faec500f113367e8cb37740486bd18678d6862433653b549059d0545374d069d551d4b506
+DIST pythia8245.tgz 23605527 BLAKE2B 1007c2f8b50a115d29fe1b0363a187feca717cb2147ef759e999aeaf51ac457e9edbbdc78be47ed57d008e572b99fb327823249b31596241ee72ff587b81c8f1 SHA512 1cc579581475bfe2381059cc4789069041fa63649c86353f65cc2baa12c85142fb6c087e1607c2004b6284a21cada30a172da9853a71afa01c787272a7534574
 DIST pythia8307.tgz 26016414 BLAKE2B 0253309d71ca4e46183de80396c3a226d072ea2e8aeaf87da33994b3303017a6ca567f6731902aba43c20fec2c0aeace0728f2ce725f9221f161a70055fa6043 SHA512 63e7a3e76f8bfe0cd7b34ef523d8bbcfa50ee780c8437384ef7eb208f0f682481b0166673647db98468baeb6df855fdbf0cbb1509dcc5eda39c90f3f3461fd2a
 DIST pythia8309.tgz 28407620 BLAKE2B 0ef226e2e65829952d670b57c24bff2108d916ca547233041e97dabb81d9616be3e404da7225f9cb4a2c9773c0c22939d813eaed92560e01c6fbe37e4690c232 SHA512 c7d99a9a1f7bf1441532720667ab224283b866e7f3ea9e730c839ac62e3b8b9e5c01471fb94a4a48d481635544e4ed230796a710531650bfffde96f0f78590bf

diff --git a/sci-physics/pythia/pythia-6.4.28-r2.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
index 9d17582d521d..01ffdc71dd71 100644
--- a/sci-physics/pythia/pythia-6.4.28-r2.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
@@ -9,6 +9,7 @@ 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"
@@ -18,10 +19,11 @@ HOMEPAGE="http://pythia6.hepforge.org/"
 # 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://dev.gentoo.org/~bicatali/distfiles/${P}.tar.xz
+	https://pythia.org/download/pythia6/pythia${MY_PV}-split.tgz
 	https://root.cern.ch/download/pythia6.tar.gz -> ${PYR_P}.tar.gz
-	doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp${DOC_PV}man2.pdf )
+	doc? ( https://pythia.org/download/pythia6/lutp${DOC_PV}man2.pdf )
 	examples? ( mirror://gentoo/${PN}-${EX_PV}-examples.tar.bz2 )"
 
 SLOT="6"
@@ -31,6 +33,15 @@ 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 .

diff --git a/sci-physics/pythia/pythia-8.2.45-r2.ebuild b/sci-physics/pythia/pythia-8.2.45-r2.ebuild
index a660f6924c7d..4d9890579f3d 100644
--- a/sci-physics/pythia/pythia-8.2.45-r2.ebuild
+++ b/sci-physics/pythia/pythia-8.2.45-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit toolchain-funcs
 
-MV=$(ver_cut 1)
+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="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
+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

diff --git a/sci-physics/pythia/pythia-8.3.09.ebuild b/sci-physics/pythia/pythia-8.3.09.ebuild
index 32715ad857ac..251f96ebbcd6 100644
--- a/sci-physics/pythia/pythia-8.3.09.ebuild
+++ b/sci-physics/pythia/pythia-8.3.09.ebuild
@@ -13,13 +13,13 @@ 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/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/CT10.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2007lomod.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq66.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq6l1.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/unvalidated/MRST2004qed.tar.gz
+		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"

diff --git a/sci-physics/pythia/pythia-9999.ebuild b/sci-physics/pythia/pythia-9999.ebuild
index 5938af76f961..fa0f3f011561 100644
--- a/sci-physics/pythia/pythia-9999.ebuild
+++ b/sci-physics/pythia/pythia-9999.ebuild
@@ -14,13 +14,13 @@ HOMEPAGE="https://pythia.org/"
 
 # just data
 SRC_URI="test? ( lhapdf? (
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/CT10.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2007lomod.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq66.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq6l1.tar.gz
-		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/unvalidated/MRST2004qed.tar.gz
+		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


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2023-08-17  9:05 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2023-08-17  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     64bc39eb91bc75f6f97e5016da13d11da5ddd30c
Author:     Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Wed Jul 26 17:51:33 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 09:05:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64bc39eb

sci-physics/pythia: add 8.3.09, 9999

Closes: https://bugs.gentoo.org/862103
Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-physics/pythia/Manifest             |   1 +
 sci-physics/pythia/metadata.xml         |   5 +
 sci-physics/pythia/pythia-8.3.09.ebuild | 188 ++++++++++++++++++++++++++++++
 sci-physics/pythia/pythia-9999.ebuild   | 196 ++++++++++++++++++++++++++++++++
 4 files changed, 390 insertions(+)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 6da91b47b53d..295d8493abb6 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -11,3 +11,4 @@ DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b98055
 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
+DIST pythia8309.tgz 28407620 BLAKE2B 0ef226e2e65829952d670b57c24bff2108d916ca547233041e97dabb81d9616be3e404da7225f9cb4a2c9773c0c22939d813eaed92560e01c6fbe37e4690c232 SHA512 c7d99a9a1f7bf1441532720667ab224283b866e7f3ea9e730c839ac62e3b8b9e5c01471fb94a4a48d481635544e4ed230796a710531650bfffde96f0f78590bf

diff --git a/sci-physics/pythia/metadata.xml b/sci-physics/pythia/metadata.xml
index 6d4b2f695ab6..fb8f9f855f2b 100644
--- a/sci-physics/pythia/metadata.xml
+++ b/sci-physics/pythia/metadata.xml
@@ -19,7 +19,12 @@
   <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>
   </use>
+  <upstream>
+    <remote-id type="gitlab">Pythia8/releases</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/sci-physics/pythia/pythia-8.3.09.ebuild b/sci-physics/pythia/pythia-8.3.09.ebuild
new file mode 100644
index 000000000000..32715ad857ac
--- /dev/null
+++ b/sci-physics/pythia/pythia-8.3.09.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2023 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://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/CT10.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2007lomod.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq66.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq6l1.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/unvalidated/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? ( 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="${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-9999.ebuild b/sci-physics/pythia/pythia-9999.ebuild
new file mode 100644
index 000000000000..5938af76f961
--- /dev/null
+++ b/sci-physics/pythia/pythia-9999.ebuild
@@ -0,0 +1,196 @@
+# 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://pythia.org/"
+
+# just data
+SRC_URI="test? ( lhapdf? (
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/CT10.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2007lomod.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq66.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq6l1.tar.gz
+		https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/unvalidated/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
+
+SLOT="8"
+LICENSE="GPL-2"
+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? ( 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
+)
+
+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
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2024-05-15 10:29 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2024-05-15 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     e0e79b7d35e95207ef5f23a978138ccdbebeb545
Author:     Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
AuthorDate: Sun May  5 17:29:52 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed May 15 10:26:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e79b7d

sci-physics/pythia: add 8.3.11

Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-physics/pythia/Manifest             |   1 +
 sci-physics/pythia/pythia-8.3.11.ebuild | 188 ++++++++++++++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index f3de451fdba1..79a364ae3853 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -12,3 +12,4 @@ DIST pythia6428-split.tgz 689807 BLAKE2B 5acb53a75db22509e3def7d0a2fa31672e50f8d
 DIST pythia8245.tgz 23605527 BLAKE2B 1007c2f8b50a115d29fe1b0363a187feca717cb2147ef759e999aeaf51ac457e9edbbdc78be47ed57d008e572b99fb327823249b31596241ee72ff587b81c8f1 SHA512 1cc579581475bfe2381059cc4789069041fa63649c86353f65cc2baa12c85142fb6c087e1607c2004b6284a21cada30a172da9853a71afa01c787272a7534574
 DIST pythia8307.tgz 26016414 BLAKE2B 0253309d71ca4e46183de80396c3a226d072ea2e8aeaf87da33994b3303017a6ca567f6731902aba43c20fec2c0aeace0728f2ce725f9221f161a70055fa6043 SHA512 63e7a3e76f8bfe0cd7b34ef523d8bbcfa50ee780c8437384ef7eb208f0f682481b0166673647db98468baeb6df855fdbf0cbb1509dcc5eda39c90f3f3461fd2a
 DIST pythia8309.tgz 28407620 BLAKE2B 0ef226e2e65829952d670b57c24bff2108d916ca547233041e97dabb81d9616be3e404da7225f9cb4a2c9773c0c22939d813eaed92560e01c6fbe37e4690c232 SHA512 c7d99a9a1f7bf1441532720667ab224283b866e7f3ea9e730c839ac62e3b8b9e5c01471fb94a4a48d481635544e4ed230796a710531650bfffde96f0f78590bf
+DIST pythia8311.tgz 28757044 BLAKE2B 93a7cc26682bc6418f85e41def94a8cdfe39e180fa9fec2a6e47e9237fc2d42800dca2b76f54e2d56cb1d3a2b9a0008baf7b77610aabac2a6505fe08b2b4ffe2 SHA512 e0ae6cb444f11f3e3cf84d738b8c135f07ceafb28911b855bb63e3c596c5b9fd312a1f4ff78a098b707bfbb8f517a46177c4dbc57b4882cf03b12b0be49e2885

diff --git a/sci-physics/pythia/pythia-8.3.11.ebuild b/sci-physics/pythia/pythia-8.3.11.ebuild
new file mode 100644
index 000000000000..291b7e736a10
--- /dev/null
+++ b/sci-physics/pythia/pythia-8.3.11.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2024 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? ( sys-libs/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
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/
@ 2024-07-09  3:08 Eli Schwartz
  0 siblings, 0 replies; 20+ messages in thread
From: Eli Schwartz @ 2024-07-09  3:08 UTC (permalink / raw
  To: gentoo-commits

commit:     f149ed13e8e2abfc5cab650e1b417a2a6eb7a50f
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  9 02:57:12 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Jul  9 03:08:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f149ed13

sci-physics/pythia: mark as LTO-unsafe

It's very old code. So old, in fact, that upstream doesn't support it
anymore and introduced a major new release series (which resulted in
adding an outright SLOT to the ebuild) to port it to C++. And that was
in 2012.

The error itself is, naturally, fortran related. :) :) So there is
simply no point in reporting this anywhere. The newer SLOT works fine.
Simply prevent LTO. Anyways, no one is using 6.x except "to allow older
published results to be reproduced, should the need arise". Free
permission to not care about LTO...

Closes: https://bugs.gentoo.org/927728
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 sci-physics/pythia/pythia-6.4.28-r2.ebuild | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/sci-physics/pythia/pythia-6.4.28-r2.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
index 01ffdc71dd71..14188ab9f6df 100644
--- a/sci-physics/pythia/pythia-6.4.28-r2.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools fortran-2
+inherit autotools flag-o-matic fortran-2
 
 MV=$(ver_cut 1)
 MY_PN=${PN}${MV}
@@ -70,6 +70,17 @@ src_prepare() {
 }
 
 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
 }
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2024-07-09  3:08 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-09  3:08 [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/ Eli Schwartz
  -- strict thread matches above, loose matches on Subject: below --
2024-05-15 10:29 Andrew Ammerlaan
2023-08-17  9:05 Andrew Ammerlaan
2023-08-17  9:05 Andrew Ammerlaan
2023-06-09 15:06 Arthur Zamarin
2022-12-11 17:55 Arthur Zamarin
2022-10-18 13:57 Andrew Ammerlaan
2022-08-26 11:13 Andrew Ammerlaan
2022-08-26 11:13 Andrew Ammerlaan
2022-03-20 18:51 Sam James
2021-07-20 16:42 Matt Turner
2021-05-23 13:29 Andrew Savchenko
2021-02-25 19:07 Sam James
2021-02-25  6:17 Sam James
2021-02-24 23:51 Sam James
2021-02-14 10:27 David Seifert
2021-02-13 22:52 David Seifert
2021-01-20 10:16 David Seifert
2016-04-14  0:30 Andrew Savchenko
2016-04-13 13:55 Guilherme Amadio

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox