* [gentoo-commits] proj/sci:master commit in: sci-physics/pythia/
@ 2015-06-04 0:04 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2015-06-04 0:04 UTC (permalink / raw
To: gentoo-commits
commit: c04c65a4dbc291cd3da43fa74708874223cbed6c
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Jun 4 00:03:01 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Thu Jun 4 00:03:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c04c65a4
sci-physics/pythia:8: version bump
Remove keywords for now: there are several known bugs, but works
fine for common use cases.
sci-physics/pythia/ChangeLog | 286 ++++++++++++++++++++++++++++++++
sci-physics/pythia/metadata.xml | 22 +++
sci-physics/pythia/pythia-8.2.09.ebuild | 130 +++++++++++++++
3 files changed, 438 insertions(+)
diff --git a/sci-physics/pythia/ChangeLog b/sci-physics/pythia/ChangeLog
new file mode 100644
index 0000000..a7f58ca
--- /dev/null
+++ b/sci-physics/pythia/ChangeLog
@@ -0,0 +1,286 @@
+# ChangeLog for sci-physics/pythia
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.62 2015/05/27 14:06:39 bircoph Exp $
+
+*pythia-8.2.09 (03 Jun 2015)
+
+ 03 Jun 2015; Andrew Savchenko <bircoph@gentoo.org> +pythia-8.2.09.ebuild,
+ +metadata.xml:
+ Version bump. WIP.
+ TODO:
+ - some tests are failing
+ - LDFLAGS are ignored
+ - re-add static-libs support
+
+ 27 May 2015; Andrew Savchenko <bircoph@gentoo.org> -pythia-8.1.45.ebuild:
+ Remove old, fixes bug 478636.
+
+ 27 May 2015; Agostino Sarubbo <ago@gentoo.org> pythia-8.1.86.ebuild:
+ Stable for x86, wrt bug #546256
+
+ 27 May 2015; Agostino Sarubbo <ago@gentoo.org> pythia-8.1.86.ebuild:
+ Stable for amd64, wrt bug #546256
+
+ 20 Apr 2015; Justin Lecher <jlec@gentoo.org> -pythia-6.4.24.ebuild,
+ -pythia-8.1.80.ebuild, -pythia-8.1.83.ebuild, -pythia-8.1.85.ebuild,
+ metadata.xml:
+ Drop old
+
+ 19 Apr 2015; Agostino Sarubbo <ago@gentoo.org> pythia-6.4.28.ebuild:
+ Stable for x86, wrt bug #546254
+
+ 13 Apr 2015; Agostino Sarubbo <ago@gentoo.org> pythia-6.4.28.ebuild:
+ Stable for amd64, wrt bug #546254
+
+*pythia-8.1.86 (02 Sep 2014)
+
+ 02 Sep 2014; Jauhien Piatlicki <jauhien@gentoo.org> +pythia-8.1.86.ebuild:
+ version bump
+
+*pythia-8.1.85 (03 Apr 2014)
+
+ 03 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> +pythia-8.1.85.ebuild:
+ Version bump
+
+*pythia-8.1.83 (23 Feb 2014)
+
+ 23 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> +pythia-8.1.83.ebuild,
+ -pythia-6.4.27.ebuild, -pythia-8.1.76.ebuild:
+ Version bump
+
+*pythia-8.1.80 (29 Oct 2013)
+
+ 29 Oct 2013; Sébastien Fabbro <bicatali@gentoo.org> +pythia-8.1.80.ebuild,
+ -pythia-8.1.70.ebuild, metadata.xml:
+ Version bump for pythiia8, reworked ebuild
+
+*pythia-6.4.28 (29 Oct 2013)
+
+ 29 Oct 2013; Sébastien Fabbro <bicatali@gentoo.org> +pythia-6.4.28.ebuild:
+ Version bump - ebuild submitted by Andrew Savchenko, bug #487210
+
+*pythia-8.1.76 (07 Jun 2013)
+
+ 07 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +pythia-8.1.76.ebuild,
+ -pythia-6.4.26.ebuild:
+ Version bump
+
+*pythia-6.4.27 (17 Jan 2013)
+
+ 17 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> +pythia-6.4.27.ebuild:
+ Version bump
+
+ 30 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> -pythia-8.1.65.ebuild,
+ pythia-6.4.24.ebuild, pythia-6.4.26.ebuild, pythia-8.1.45.ebuild,
+ pythia-8.1.70.ebuild:
+ Changed home page, thanks Andrew Savchenko bug #438762
+
+*pythia-8.1.70 (15 Nov 2012)
+
+ 15 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> +pythia-8.1.70.ebuild:
+ Version bump
+
+ 16 Oct 2012; Justin Lecher <jlec@gentoo.org> pythia-6.4.24.ebuild,
+ pythia-6.4.26.ebuild, pythia-8.1.45.ebuild, pythia-8.1.65.ebuild,
+ metadata.xml:
+ Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+ updated fortran-2.eclass
+
+ 08 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -pythia-8.1.62.ebuild,
+ pythia-6.4.26.ebuild, pythia-8.1.65.ebuild:
+ Keyword amd64-linux, x86-linux
+
+*pythia-8.1.65 (22 May 2012)
+
+ 22 May 2012; Sébastien Fabbro <bicatali@gentoo.org> -pythia-8.1.57.ebuild,
+ +pythia-8.1.65.ebuild:
+ Version bump
+
+*pythia-8.1.62 (13 Mar 2012)
+
+ 13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> -pythia-6.4.25.ebuild,
+ -pythia-8.1.50.ebuild, +pythia-8.1.62.ebuild:
+ Version bump
+
+*pythia-8.1.57 (25 Nov 2011)
+*pythia-6.4.26 (25 Nov 2011)
+
+ 25 Nov 2011; Sébastien Fabbro <bicatali@gentoo.org> +pythia-6.4.26.ebuild,
+ +pythia-8.1.57.ebuild:
+ Version bumps
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> pythia-8.1.45.ebuild,
+ pythia-8.1.50.ebuild:
+ Add dependency on virtual/fortran
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> pythia-6.4.24.ebuild,
+ pythia-6.4.25.ebuild, pythia-8.1.45.ebuild, pythia-8.1.50.ebuild:
+ Added fortran-2.eclass support
+
+*pythia-8.1.50 (13 Jun 2011)
+*pythia-6.4.25 (13 Jun 2011)
+
+ 13 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> +pythia-6.4.25.ebuild,
+ +pythia-8.1.50.ebuild:
+ Version bumps
+
+ 07 Jun 2011; Jeroen Roovers <jer@gentoo.org> pythia-6.4.24.ebuild,
+ pythia-8.1.45.ebuild:
+ Drop HPPA keywording
+
+ 18 Feb 2011; Jeroen Roovers <jer@gentoo.org> pythia-6.4.24.ebuild,
+ pythia-8.1.45.ebuild:
+ Stable for HPPA (bug #354015).
+
+ 13 Feb 2011; Raúl Porcel <armin76@gentoo.org> pythia-6.4.22.ebuild,
+ pythia-6.4.24.ebuild, pythia-8.1.35.ebuild, pythia-8.1.45.ebuild:
+ Drop sparc keywords
+
+ 10 Feb 2011; Markos Chandras <hwoarang@gentoo.org> pythia-6.4.24.ebuild,
+ pythia-8.1.45.ebuild:
+ Stable on amd64 wrt bug 354013 and bug 354015
+
+ 09 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> pythia-6.4.24.ebuild,
+ pythia-8.1.45.ebuild:
+ x86 stable, bug #354013, bug #354015
+
+ 08 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> pythia-8.1.45.ebuild:
+ Added LD_LIBRARY_PATH for the tests to make sure it loads the correct library
+
+ 18 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> -pythia-6.4.23.ebuild,
+ -pythia-8.1.08-r1.ebuild, -pythia-8.1.42.ebuild:
+ Drop old.
+
+*pythia-8.1.45 (20 Nov 2010)
+*pythia-6.4.24 (20 Nov 2010)
+
+ 20 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> +pythia-6.4.24.ebuild,
+ +pythia-8.1.45.ebuild:
+ Version bumps
+
+*pythia-8.1.42 (26 Aug 2010)
+
+ 26 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org>
+ +pythia-8.1.42.ebuild:
+ Version bump
+
+ 18 Jul 2010; Raúl Porcel <armin76@gentoo.org> pythia-8.1.35.ebuild:
+ sparc stable wrt #318467
+
+*pythia-6.4.23 (13 Jul 2010)
+
+ 13 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org>
+ -pythia-6.4.19.ebuild, -pythia-6.4.21.ebuild, +pythia-6.4.23.ebuild:
+ Bump
+
+ 10 Jul 2010; Raúl Porcel <armin76@gentoo.org> pythia-6.4.22.ebuild:
+ sparc stable wrt #318465
+
+ 07 Jul 2010; Christian Faulhammer <fauli@gentoo.org> pythia-8.1.35.ebuild:
+ stable x86, bug 318467
+
+ 03 Jun 2010; Markos Chandras <hwoarang@gentoo.org> pythia-8.1.35.ebuild:
+ Stable on amd64 wrt bug #318467
+
+ 25 May 2010; Pacho Ramos <pacho@gentoo.org> pythia-6.4.22.ebuild:
+ stable amd64, bug 318465
+
+ 17 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> pythia-6.4.22.ebuild:
+ x86 stable wrt bug #318465
+
+ 13 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
+ pythia-8.1.08-r1.ebuild, -pythia-8.1.25.ebuild, -pythia-8.1.30.ebuild:
+ Removed tests for hepmc on 8.1.08, not compatible with recent hepmc, and
+ removed older unstable versions
+
+ 13 May 2010; Jeroen Roovers <jer@gentoo.org> pythia-8.1.35.ebuild:
+ Stable for HPPA (bug #318467).
+
+ 13 May 2010; Jeroen Roovers <jer@gentoo.org> pythia-6.4.22.ebuild:
+ Stable for HPPA (bug #318465).
+
+*pythia-8.1.35 (23 Mar 2010)
+
+ 23 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
+ +pythia-8.1.35.ebuild:
+ Version bump
+
+ 08 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> pythia-8.1.30.ebuild:
+ Reduce the number of tests, closing bug #297512
+
+*pythia-8.1.30 (23 Nov 2009)
+*pythia-6.4.22 (23 Nov 2009)
+
+ 23 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ -pythia-6.4.20.ebuild, +pythia-6.4.22.ebuild, +pythia-8.1.30.ebuild:
+ Version bumps
+
+ 21 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ +pythia-6.4.19.ebuild:
+ re-add pythia-6.4.19.ebuild inadvertently removed
+
+ 19 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ -pythia-6.4.19.ebuild, pythia-6.4.21.ebuild:
+ Removed old and fortran eclass from newer
+
+*pythia-6.4.21 (09 Sep 2009)
+
+ 09 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ -pythia-6.4.18.ebuild, +pythia-6.4.21.ebuild, -pythia-8.1.20.ebuild:
+ Version bump
+
+*pythia-8.1.25 (24 Jun 2009)
+
+ 24 Jun 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ +pythia-8.1.25.ebuild:
+ Version bump, thanks Ben Bannier for testing, closing bug #274969
+
+ 05 May 2009; Christian Faulhammer <fauli@gentoo.org>
+ pythia-8.1.08-r1.ebuild:
+ stable x86, bug 245875
+
+ 05 May 2009; Christian Faulhammer <fauli@gentoo.org> pythia-6.4.19.ebuild:
+ stable x86, bug 245875
+
+ 22 Mar 2009; Jeremy Olexa <darkside@gentoo.org> pythia-6.4.19.ebuild:
+ amd64 stable, bug 245875
+
+ 22 Mar 2009; Jeremy Olexa <darkside@gentoo.org> pythia-8.1.08-r1.ebuild:
+ amd64 stable, bug 245875
+
+*pythia-8.1.20 (18 Mar 2009)
+*pythia-6.4.20 (18 Mar 2009)
+
+ 18 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ +pythia-6.4.20.ebuild, +pythia-8.1.20.ebuild:
+ Version bumps
+
+ 03 Mar 2009; Ferris McCormick <fmccor@gentoo.org> pythia-6.4.19.ebuild,
+ pythia-8.1.08-r1.ebuild:
+ Sparc stable, part of Bug #245875.
+
+*pythia-6.4.19 (13 Dec 2008)
+
+ 13 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+ +pythia-6.4.19.ebuild:
+ Version bump. Now build our own tar ball to allow faster parallel build
+
+ 16 Sep 2008; Jeroen Roovers <jer@gentoo.org> pythia-6.4.18.ebuild:
+ Marked ~hppa (bug #231484).
+
+ 16 Sep 2008; Jeroen Roovers <jer@gentoo.org> pythia-8.1.08-r1.ebuild:
+ Marked ~hppa (bug #231484).
+
+*pythia-8.1.08-r1 (07 Sep 2008)
+
+ 07 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+ pythia-6.4.18.ebuild, +pythia-8.1.08-r1.ebuild:
+ pythia:6, added more examples, some cleaning. pythia:8, added HepMC
+ support, respect flags, better testing, cleaning.
+
+*pythia-8.1.08 (02 Sep 2008)
+*pythia-6.4.18 (02 Sep 2008)
+
+ 02 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
+ +pythia-6.4.18.ebuild, +pythia-8.1.08.ebuild:
+ Initial import. Thanks Benjamin Bannier for his good work on bug #231484
diff --git a/sci-physics/pythia/metadata.xml b/sci-physics/pythia/metadata.xml
new file mode 100644
index 0000000..a0a2a6e
--- /dev/null
+++ b/sci-physics/pythia/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-physics</herd>
+ <longdescription lang="en">
+ PYTHIA is a program for the generation of high-energy physics
+ events, i.e. for the description of collisions at high energies
+ between elementary particles such as e+, e-, p and pbar in various
+ combinations. It contains theory and models for a number of physics
+ aspects, including hard and soft interactions, parton distributions,
+ initial- and final-state parton showers, multiple interactions,
+ fragmentation and decay. It is largely based on original research,
+ but also borrows many formulae and other knowledge from the
+ literature.
+</longdescription>
+ <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="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>
+</pkgmetadata>
diff --git a/sci-physics/pythia/pythia-8.2.09.ebuild b/sci-physics/pythia/pythia-8.2.09.ebuild
new file mode 100644
index 0000000..51c7fce
--- /dev/null
+++ b/sci-physics/pythia/pythia-8.2.09.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-8.1.86.ebuild,v 1.3 2015/05/27 11:19:04 ago Exp $
+
+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=""
+IUSE="doc examples gzip +hepmc fastjet lhapdf root 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}"
+
+src_prepare() {
+ PYTHIADIR="${EPREFIX}/usr/share/pythia8"
+ # set datadir for xmldor in include file
+ sed -i \
+ -e "s:../share/Pythia8/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:${CXXFLAGS}:g" \
+ -e "s:Cint:Core:g" \
+ configure || die
+ # fix root builds
+ sed -i \
+ -e "s:root-config:root-config --cflags:g" \
+ examples/Makefile || 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' \
+# examples/Makefile || die
+# fi
+}
+
+# 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="${PYTHIADIR}" \
+ $(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
+}
+
+src_test() {
+ cd examples || die
+
+ local tests="$(echo main{{01..33},37,38,{51..54},61,62,73,80})" t
+ use hepmc && tests+=" $(echo main{{41..43},{85..89}})"
+ use fastjet && tests+=" $(echo main{71,72})"
+ use fastjet && use hepmc && tests+=" $(echo main{81..84})"
+ use root && tests+=" $(echo main{91,92})"
+
+ # use emake for parallel instead of long runmains
+ 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 || die
+}
+
+src_install() {
+ # make install is too broken, much easier to install manually
+ dobin bin/pythia8-config
+ doheader -r include/*
+ dolib lib/*
+ insinto "/usr/share/pythia8"
+ doins -r share/Pythia8/xmldoc
+
+ echo "PYTHIA8DATA=${PYTHIADIR}/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
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ # cleanup
+ unset PYTHIADIR
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/pythia/
@ 2015-06-04 14:30 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2015-06-04 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 12181b123225975e99552499f014f7023581a9a5
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Jun 4 14:29:37 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Thu Jun 4 14:29:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=12181b12
sci-physics/pythia: fix most tests
sci-physics/pythia/ChangeLog | 3 +++
sci-physics/pythia/pythia-8.2.09.ebuild | 37 +++++++++++++++++++++++++--------
2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/sci-physics/pythia/ChangeLog b/sci-physics/pythia/ChangeLog
index a7f58ca..a284d84 100644
--- a/sci-physics/pythia/ChangeLog
+++ b/sci-physics/pythia/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.62 2015/05/27 14:06:39 bircoph Exp $
+ 04 Jun 2015; Andrew Savchenko <bircoph@gentoo.org> pythia-8.2.09.ebuild:
+ Fix some tests.
+
*pythia-8.2.09 (03 Jun 2015)
03 Jun 2015; Andrew Savchenko <bircoph@gentoo.org> +pythia-8.2.09.ebuild,
diff --git a/sci-physics/pythia/pythia-8.2.09.ebuild b/sci-physics/pythia/pythia-8.2.09.ebuild
index 51c7fce..61b8435 100644
--- a/sci-physics/pythia/pythia-8.2.09.ebuild
+++ b/sci-physics/pythia/pythia-8.2.09.ebuild
@@ -44,10 +44,14 @@ src_prepare() {
-e "s:-O2:${CXXFLAGS}:g" \
-e "s:Cint:Core:g" \
configure || die
- # fix root builds
+ # we use lhapdf6 instead of lhapdf5
sed -i \
- -e "s:root-config:root-config --cflags:g" \
- examples/Makefile || die
+ -e "s:LHAPDF5:LHAPDF6:g" \
+ -e "s:\.LHgrid::g" \
+ -e "s:\.LHpdf::g" \
+ examples/*.{cc,cmnd} || 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.*=$(LIBDIR.*\.a$/d' \
@@ -87,20 +91,35 @@ src_configure() {
src_test() {
cd examples || die
- local tests="$(echo main{{01..33},37,38,{51..54},61,62,73,80})" t
- use hepmc && tests+=" $(echo main{{41..43},{85..89}})"
+ local tests="$(echo main{{01..32},37,38,51,52,54,61,62,73,80})" t
+ use hepmc && tests+=" $(echo main{41,42,85,86})"
+ use hepmc && use lhapdf && tests+=" $(echo main{43,{87..89}})"
+ use lhapdf && tests+=" $(echo main{51..54})"
use fastjet && tests+=" $(echo main{71,72})"
- use fastjet && use hepmc && tests+=" $(echo main{81..84})"
- use root && tests+=" $(echo main{91,92})"
+ use fastjet && use hepmc && use lhapdf && tests+=" $(echo main{81..84})"
+ use root && tests+=" main91"
+ # Disabled tests:
+ # 33 needs PowHEG
+ # 46 needs ProMC
+ # 48 needs EvtGen
+ # 92 generated ROOT dictionary is badly broken
+
+ # some tests need arguments
+ local -a args
+ args[16]="main16.cmnd"
+ args[42]="main42.cmnd hepmcout42.dat"
+ args[43]="main43.cmnd hepmcout43.dat"
# use emake for parallel instead of long runmains
emake ${tests}
for t in ${tests}; do
+ einfo "Running test ${t}..."
LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
- bin/${t}.exe > ${t}.out || die "test ${t} failed"
+ PYTHIA8DATA="../share/Pythia8/xmldoc/" \
+ ./"${t}" ${args[t]} > "${t}.out" || die "test ${t} failed"
done
emake clean
- rm main*out || die
+ rm main*.out *.dat || die
}
src_install() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/pythia/
@ 2015-06-05 7:33 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2015-06-05 7:33 UTC (permalink / raw
To: gentoo-commits
commit: 3b6a89c3e3d5a081401a08d27e94da375574b93e
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Jun 5 07:32:14 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Fri Jun 5 07:32:14 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3b6a89c3
sci-physics/pythia: ready for ~arch
sci-physics/pythia/ChangeLog | 6 ++++++
...ythia-8.2.09.ebuild => pythia-8.2.09-r1.ebuild} | 25 +++++++++++-----------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/sci-physics/pythia/ChangeLog b/sci-physics/pythia/ChangeLog
index ae20b92..ff984f4 100644
--- a/sci-physics/pythia/ChangeLog
+++ b/sci-physics/pythia/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.62 2015/05/27 14:06:39 bircoph Exp $
+*pythia-8.2.09-r1 (05 Jun 2015)
+
+ 05 Jun 2015; Andrew Savchenko <bircoph@gentoo.org> -pythia-8.2.09.ebuild,
+ +pythia-8.2.09-r1.ebuild:
+ Fix LDFLAGS support, re-enable static-libs.
+
05 Jun 2015; Andrew Savchenko <bircoph@gentoo.org> pythia-8.2.09.ebuild,
+files/pythia8209-root-noninteractive.patch,
+files/pythia8209-run-tests.patch:
diff --git a/sci-physics/pythia/pythia-8.2.09.ebuild b/sci-physics/pythia/pythia-8.2.09-r1.ebuild
similarity index 90%
rename from sci-physics/pythia/pythia-8.2.09.ebuild
rename to sci-physics/pythia/pythia-8.2.09-r1.ebuild
index b112f9a..ded0fe5 100644
--- a/sci-physics/pythia/pythia-8.2.09.ebuild
+++ b/sci-physics/pythia/pythia-8.2.09-r1.ebuild
@@ -25,8 +25,8 @@ SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
SLOT="8"
LICENSE="GPL-2"
-KEYWORDS=""
-IUSE="doc examples gzip +hepmc fastjet lhapdf root test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gzip +hepmc fastjet lhapdf root static-libs test"
RDEPEND="
fastjet? ( >=sci-physics/fastjet-3 )
@@ -62,6 +62,9 @@ src_prepare() {
-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 \
@@ -79,18 +82,16 @@ src_prepare() {
-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.*=$(LIBDIR.*\.a$/d' \
-# -e 's/+=\(.*libpythia8\.\)/=\1/' \
-# Makefile || die
-# sed -i \
-# -e 's:\.a:\.so:g' \
-# examples/Makefile || die
-# fi
+ 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"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-05 7:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-05 7:33 [gentoo-commits] proj/sci:master commit in: sci-physics/pythia/ Andrew Savchenko
-- strict thread matches above, loose matches on Subject: below --
2015-06-04 14:30 Andrew Savchenko
2015-06-04 0:04 Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox