version bump

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x565953B95372756C

3 files changed, 206 insertions, 15 deletions

diff --git a/sci-physics/pythia/ChangeLog b/sci-physics/pythia/ChangeLog
index d12de4fd775d..c04456e23612 100644
--- a/sci-physics/pythia/ChangeLog
+++ b/sci-physics/pythia/ChangeLog
@@ -1,6 +1,11 @@
 # 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.64 2015/06/05 08:40:17 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.65 2015/07/17 23:28:52 bircoph Exp $
+
+*pythia-8.2.10 (17 Jul 2015)
+
+  17 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> +pythia-8.2.10.ebuild:
+  Version bump.
 
 *pythia-8.2.09-r1 (05 Jun 2015)
 
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 8044c3aa655b..3ee6223293c1 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -16,26 +16,28 @@ DIST pythia-6.4.28.tar.xz 490248 SHA256 6ca6acc172314cf7b56e2a8e18321d28ce57a511
 DIST pythia6.tar.gz 567451 SHA256 ebc90b8ec94897d8b09030341323d2c7c6e5c7c65077f98b96c8cff00d40a5ce SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1 WHIRLPOOL e334779f77e938cde85ecd0fbc2dbf0d86a52fc1ef673c909b8533f779e51d6d6680bc5de3aceeb002015ccfdf03da3f975aaf0cc7a249c462cdd3b206c359a2
 DIST pythia8186.tgz 8921248 SHA256 1c0914fc04801ee922c1ad3b544a3cd48b34d9afa4407ae40afbacd009039bd2 SHA512 84729004abbdf522183c27918ae35db037a8954af761a2b452dcff54f82076b1e3bfc7fe9ea0a7cb2c0b6499aedb1c25cc13768d47b24edaa08d631b55d0b86b WHIRLPOOL ecef83d2cb018b1aac55225850cf2a3a8f2b87d08f99bd9c5881f4fa341f012eeabed3b9a43ffda3699daebc54c181d08aac30c1f6b514e98516c29e88a6fbaf
 DIST pythia8209.tgz 14299640 SHA256 f5a98859d17c3f8dd327bb6a1d53b91155dcd42e9cdba0a28e61ec324e4d9796 SHA512 4c9a7e80ce53308c59df2a84d0e65b31199c6c6741758f129f76d1b54e39d660373bb0a94047e53d0c15c6d0f84683972f30ac17ab5abacef5918e4b8d8765db WHIRLPOOL 20722dc0b4e96c80391ee6d1372862cfb06efb388aee7b754728b7f394c304395018fe8eb26441ba5ad1a68e01a9c7efa7b3b76b2d2beaf85be70ba48b277d3c
+DIST pythia8210.tgz 14301345 SHA256 a2564c6011235a286115ba9da065f50c1233229b2f1a824583565dfeec0baa35 SHA512 fe2d02e32fd5d25bcdcc216754b91ca509a189c58f1a06ca8deba975af552586632fc8cf8ad3e62920884ee64c4af596fbe7c6872f5ddbd1f5a0cea4ba4bc90d WHIRLPOOL d2d3f212ed2ad700fa6ae44b2b670cce1623e80382af04072bee884a72ea269346c10728cc77cfa4c9377e8cd775febe9488427cb0b890e52c651efebd66f60c
 EBUILD pythia-6.4.28.ebuild 1968 SHA256 cc88b592c6ee9ee28169fc55adf05540c0d90b43c23da6f4cfa3e3900dcb75be SHA512 3bfe3b4953267a776ee90ecef977a8e577b467cff938848706e395eb1deba60c1b4b6287e9152b419b018eb9f81265a43fe129aa8f8f3dda0f337b0eb032b6ad WHIRLPOOL 2c5756c7524e7e5003f1559089b433cab50f243b37ec294afae832bb7610fa22c08e39a5ab4a741b17883e517d0fc6f909a4d7daa53bdd7ac0e38d90c0436f4e
 EBUILD pythia-8.1.86-r1.ebuild 2736 SHA256 c4e92d9150ba20ad5951ce18b42ad147f04790aa8d485d99288206a6769de390 SHA512 bd2165f313cbc89e284a508a77efb56fa4f6f7fb483642afd4172320aacf5a2fe7d65ac148919e03da37243d2de70fab2c9d12713c10fb669e80baa3d198adf3 WHIRLPOOL e3b32528c078ae44ee556f553d12dee6da52517b67d23b8413a9a3415706ccc2e2d5bc649589fd27928194b5d410acc8da71f560f273d833f0b125126fb5c613
 EBUILD pythia-8.1.86.ebuild 2684 SHA256 1a99e584c4bfbc5a4770655d5ef512e7cee2e6cfff8ef0ea9dff7c87324cb4d8 SHA512 db9580fe2c40fff4a8c270e22632d21f24995231729f3ef6d9163a3d6d116747f3e8eb21939c8a2e77c27ba3fbf5f0cf0c391bd6664922461ded77b38aab8842 WHIRLPOOL ea64385309d63be786e582e817184918f6f89aacd28613fc3c38c60b73b46ff63e6bd10580c17beee3bb10985cbcda981d94c8689ae72a2c5ab8b71dddcd2000
 EBUILD pythia-8.2.09-r1.ebuild 5915 SHA256 38491c8dc0dc2c792d2edf1232bc3d78f606d52317add24060b85e30b656c5af SHA512 00bb8732d2ad647f7b31cbe79b210e0d7aa666fde2c1a6cba516b858841b85d2a1bdae49f825d949e4515ef8c8119ef2fa97b03a56856525cb2011debec46c60 WHIRLPOOL 7976f9a4e8c0c7a10541cea3d9250c783a79ec9899800fb00c04e14d7e1470c4e20a452687f1fb4ce4ed2c1c337578e9609270b8e37f7066a30dbe635f0d8e0d
-MISC ChangeLog 9465 SHA256 4f2bf371065645ec51b00f8ce0f74d59e38a71168da10c76887d9f991259d368 SHA512 2fbd539a40be6dcf3a932355f0ce28f52930af255bbf149b7dcba4bf2648d9795a901a48fc7aba99bb17e81b14e31bbbff67d820f594ec6129794205f78157e2 WHIRLPOOL 79c8f76559745c52411ba3bf9c02c9ffa075649deed55c48455b109234e09e106c129827478649c94baadfbedd0ee2e548f93102edfa194860cd23262ea57e2b
+EBUILD pythia-8.2.10.ebuild 5912 SHA256 0e50b81dc5210b6d944f34fca8022baa9b86394db17f031161e96167ac71926b SHA512 8d61c064a27e8fa6da05a8501a4f41712685fbf94d9079108a83faafdce0fb7a1225b09c2330daf44163f1265a2fef46e6bb020160eb21a378a087b541273a73 WHIRLPOOL fe9a652f148718998460af6a96995be94a6b23130516594da465e2a9d1f9b6c8707ddb9e4358f6d71dd7634755f30b496b81d9fa3f7ab071f18b4ba0e622403b
+MISC ChangeLog 9588 SHA256 7810c6dc806ebda8bbe084fe725a52e5a17fee1ec8434c4ea61449ed9cd398ec SHA512 bb3fa98bd120d354aed976c76925a35f2d819957d76f56c21974150dc95535fe978194c3ef39c2f4c605e57ef22496a0528ced45792d3a9b12c41f659451e769 WHIRLPOOL 410299c893548d2c99345d64f04e0960f38a432336b52fa9a15782418487bc98c422cf1bed84b4a7c7257cf6fff6dc16216094b003431d148d9e9c22e7a68b93
 MISC metadata.xml 1197 SHA256 5928d89911d9c0b1eb46c2f02c3c2b781ec020bb395d9c7ea3e0a9cc9dd633a2 SHA512 1b3cc7caa61652f819c083ae383c8c9516fdbae7daa1f5559d0ea7225ef18cbca12c9944120c88001fa25ffb6809f0fba962a4835a05cb937b99da023d76abfa WHIRLPOOL e3941bfc118dd067f68cf3d3ed40badcda536427fb53289119f33893acb3b54bb4a43c90feb34dec18262ac06719254211f996dd150fa87be9d6ce6fb3579e21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVcWB8AAoJEPZTWjO6HuSNXp8P/1iTEZRb1qiY/Z/QiiPlmuC2
-2HCm+DO5Ah77MWpL5is7TToyGBIO3iytOYHENIuwT+WSXqI81RtKYOjUzQcapMi4
-qTds4/PjChAC235QLppRnqXToNTyQqXgQymTLB5J95mu3Ro2k9Gd/kyGHKGDDlK8
-4u9SWBUFrqf4UNaXr2iHf7ZLadKRzvXaJs0e/LpuSz2mIZV0P8dFwDiVDTdgRzdf
-vy7FrHkSH+dazd4U2x+qf9VR0oDOQVQUOz5XgzPm1O1QR9a+kPBUCmpn2rdyh3BO
-EkfvjO9d8egjBOy0wBxNoy5GxyHRvs6CSldp4wqjx11idsXgrxhEGj6Vgryqw06v
-aiiLluoZMpyCTmJDNft7PHtN0PWAYCohwpLGcs79TkWLuTCeLxW+FODDAAuFFZHl
-TCW0FmXONIdRQmAhLKX0tXna8srC1s6HfI1p+gHrSeQop6mWcTYZ7MmxhUdLRbbW
-xSxkIbwR8N+ABLSEiWLr9EIGDwWc0Pn6qUFbF67ZAnI1dDMDgdOqlZWKdT1BjPQM
-vEGhACIss5gAsWU8jiwFvwW15q9XoxyHeJ7mIsgAZVkehb+ia3j5kEvJ7dVLwTH3
-lUtFXY2B2NTHdIjvEQvBIwt6N/b+04xaa0hODc8jWXyVLYOaH4wx2/zJE8/1dg/U
-jbE5VJazMXr1swrM18xZ
-=OcW0
+iQIcBAEBCAAGBQJVqY/UAAoJEPZTWjO6HuSNYXIQAKF4x7Bsa2w97Ii6SasMIRq2
+OoYq5+A0kUmWk40J3b83Y429cQqkFAMwtZJCwD5A1OF5rmarn47oxywv9AZQhIGq
+sdoesE/BXMgzg6ws8su97vx7OGQbfW2fQjvsVkWiVvSzQxCWVXylP3nbD2pRRUPj
+yJWN/rP4noo0cHbekZ0j7e0Zn+a55qEMsplxFUQGV0Lhs/kh1ULRxMf2cRwqjMzJ
++efPlOlqkjMEhgPfTu5NJnDeEgP0HfGav4jhKC8lII5N/ZALrAZzterKT727di5W
+MCphZx6vDzYpG2PE13D2J4eH7yS2tcBX5PJsodCQGCtIZ07U9AFObcD6igPNClJS
+8jCfLUvLK/w3z0naekbiwf98Lv9t4FsuOQzOjb3FBmQYn00+wx7fqsxiMCsNC3Sx
+zXtbMSLCHTECL0hm5kARfHp1oaL2FTg1i+2RWjpAwdoSrQh3HI+vXL3wYtq9l9j4
+qPMTcfMV1Ar63/Sbg9GZnBi+2EYpNACD+HbbZtLFtkq9Wghn6ebi0ghk/G5HnMOL
+PI8pxfbXYpb4zdvqdIT2RN9IRIsHppVFzYpAQyF8fUXan6usCV5CimuqBqLRUr6f
+Na3tzqPIM5rXCRcGPaFupgQGMkCLuB+q0BhpypISEBC2v9rUr3fbrqOQDWCE5ctD
+n/WOA69X0PHohR3KFctJ
+=ijkg
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/pythia/pythia-8.2.10.ebuild b/sci-physics/pythia/pythia-8.2.10.ebuild
new file mode 100644
index 000000000000..d4efa0f29f07
--- /dev/null
+++ b/sci-physics/pythia/pythia-8.2.10.ebuild
@@ -0,0 +1,184 @@
+# 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.2.10.ebuild,v 1.1 2015/07/17 23:28:52 bircoph Exp $
+
+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"
+
+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
+}