Version bump for pythiia8, reworked ebuild

Package-Manager: portage-2.2.7-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 129 insertions, 97 deletions

diff --git a/sci-physics/pythia/ChangeLog b/sci-physics/pythia/ChangeLog
index 9141772de3ab..954d82c7c0bb 100644
--- a/sci-physics/pythia/ChangeLog
+++ b/sci-physics/pythia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/pythia
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.52 2013/10/29 19:52:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.53 2013/10/29 22:04:54 bicatali Exp $
+
+*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)
 
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 6e8c59d3579f..4ba657f301ca 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST lutp0613man2.pdf 2902047 SHA256 03d637310ea80f0d7aea761492bd38452c602890d8cf913a1ec9edacd79fa43d
 DIST pythia-6.4.18-examples.tar.bz2 36366 SHA256 17b1809fb0cffba20115c2bc1032c24d8efece25bd3f1f632f88265ade4dd084
 DIST pythia-6.4.24.tar.bz2 568813 SHA256 683e85100ef98bef2a1ef526eb83aadc7fc0ed3a96e92b595a0b6dece779e4df
@@ -5,13 +8,20 @@ DIST pythia-6.4.27.tar.bz2 582576 SHA256 76d262b9d47f402131a3744b0532334df269465
 DIST pythia-6.4.28.tar.xz 490248 SHA256 6ca6acc172314cf7b56e2a8e18321d28ce57a511e34210a6c64ebbfd5e06d5f4 SHA512 f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc WHIRLPOOL d6ab42af092348b1ae5c5078c34ef17042b46f728d6c4068cd0930999ccbfefae9b55be05499188525c9fc6499c8cb8c490fe6a37f04bf9b45048f7cf8026cdb
 DIST pythia6.tar.gz 567451 SHA256 ebc90b8ec94897d8b09030341323d2c7c6e5c7c65077f98b96c8cff00d40a5ce SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1 WHIRLPOOL e334779f77e938cde85ecd0fbc2dbf0d86a52fc1ef673c909b8533f779e51d6d6680bc5de3aceeb002015ccfdf03da3f975aaf0cc7a249c462cdd3b206c359a2
 DIST pythia8145.tgz 4813223 SHA256 6a8f17e043ce743ff8a6a05cf31b26f18a72f680d3bc2d9bcbaca674110138b5
-DIST pythia8170.tgz 5446443 SHA256 58fe7c076c68fa88d45a0a0a27c7561714a7d623dea90f991401d6498665caa5 SHA512 fbe4da5c3837fcb7d7ef78608099c7920f36f8beb74eec76afdf4d2b6a12ba79ec89d069a6166f5131572ed13ec54830cc673dcd8833a6df78feafc99aaaf612 WHIRLPOOL cc8784ceaa70c93f9823e69c4992610471f6ddccdba2ac5337c4abf5dd22548f7dd90c8c7cc0146d6a10368151ebadcd656a074cf5d5ada96dd6434b9417d72e
 DIST pythia8176.tgz 5785048 SHA256 6d4422acc78969c5e0f81b505d740f25f10819162cd50ee24ea2095132c5ca3e SHA512 18a5d4aa9c42288fedb2194541c2927c37b99467d77d873c9458dc430dc8db75706347c2232013362789e4ac0f787043080676d3335becd62fc09cdb725abdfb WHIRLPOOL 04e9c8b8a2dff727127188d55afdac7fb9ff6982d8060ca72c39d37e1877141cb0448ad96d660edda8a92953b3847fe5fe37409b929c010c3a50f6cf8a99bbe0
+DIST pythia8180.tgz 7068685 SHA256 7c3ce6efbdc588035e333a6dbbde56755066a237caadf9df00f22248c2033df0 SHA512 fac1b8fe902659a5dbb2347255af386eebd4a8017ef3a2e462d5db7dc56b163d69471eb2faf1ac8d42136a372e4197788134eef426b1fc65d249d6ae5f2b8ff9 WHIRLPOOL ff058fe07615a4192b0ea29a7af14d6772a5ba48ab86774366841575e4ceae9b5d2dc78d49de1b91a3ad3999d75df6303b43f04ac8afbd3337b4e9ff348416d4
 EBUILD pythia-6.4.24.ebuild 2021 SHA256 aca0a1feb71d864e093977d5bb55d11071f96192ee4216e0872452465b7e3411 SHA512 941767d64783da0812121a529c79029834ed25899cef0fc05bbf043bd3a21973a72b1f8347a1f1ccd93d474d4484607e5a3e36421faa56a44849e356dfd306aa WHIRLPOOL 2de3d7295a82c91188e72721acc0c4980752eb6c830fb9f26751dd9dfa4e973f72b63f455b264d444de79833b75ff22eb15cde4f896ae9e427d25e553db7f770
 EBUILD pythia-6.4.27.ebuild 1977 SHA256 702a64469d49076740ec7f301f25ab935531b8e80cc067bf6e023b288b882881 SHA512 c4c62ddb84988b4098fc30cc96c3f3f037ed1dba92fe26cdf453d27c8313c796554eb6cb0a3efc0ba4ae6c6cf00631662ca039a5f2188b1d737d3fc4a102e31a WHIRLPOOL 07e34b99bc508c06b818df3011f531eef652fad09c313a20551c59721ce801a9e2d118d26f7fe368969be7a2b718a3f676909e10cc51a40dcc1adfdc19d71fd8
 EBUILD pythia-6.4.28.ebuild 1975 SHA256 eed1af827695092892a017f49080669d657b742842906b4c7784f16633ea13ae SHA512 6c85bf903b6e43ece50cf54399144453b071bd7a604142a7085d0e6f6d6f6c2fe2754f86c836a4e4eeaab527c24f80186f4cd396e2debb560cb09adc973c5a06 WHIRLPOOL a64032b99ef636770e4f619deb26589bcb717f153c1efa24347a6f3818fe93b7d613d8586ceb7946e436c3dd4d71ea04386886deb916a0e17d1d492be6314943
 EBUILD pythia-8.1.45.ebuild 2522 SHA256 b5effbf0e687ec0e7bb5dfe5d89759e99ee897d7477eb92e1282b028087878a4 SHA512 f9d144646ee6c0e478d5f2c6d8fe539d55412112e28e6e919e522a1f62d23278abfd4a5fdc9af6d6abe106ab92cc8726a78a3b56212fa5f4b10cae1c3663d52d WHIRLPOOL 0aa67801924114f0c99e24449215fd2d3e79f61afa79450691660c77b7a04db61213a41e6c09b4b23a5844ee4756d9d229822ed4ab143a67b7f497ef2fa0cf00
-EBUILD pythia-8.1.70.ebuild 2085 SHA256 484e4d8ac42f4114e1e7048d0054cd54e988ff8763b5e7c5a7b639be29af13a4 SHA512 aee7296dfabb7275d3b017cf576687ecf5c8908e66acf3c83e3b40b2a53721cae37f31a3ad0a66a0b04437d7bd0fa920858afc9c0d97ec059ddda8529496f074 WHIRLPOOL 187a60672e232cdf881f1f974022bb160a3dd25f0228753ac62c3af0681831bea83b007cd948582b48168ff7a5d9bf1fad046284e0657e251c8db240edd91e65
 EBUILD pythia-8.1.76.ebuild 2085 SHA256 e4cb3e1447306f0fbe3807f7f522eb05cea6bd5e9a9425debf980ae7beda80c9 SHA512 93e0c4a61d195e6fe572163890fe926e6ad59b4dec1096f01a455dfd0be84f910ed33c52aa274b5143bb470f6ef89a72ec293fa672356f4d86536c2991771990 WHIRLPOOL 712ba85395f49851ce31cf37d8e59c6ea5fb11b9d6ffe4b15a843b859761aa8c01a14cc613453559792b4c092741c6691a6d7a70e355401fdf514de3a8abd1d5
-MISC ChangeLog 7665 SHA256 1181d10a5c1ad62f55c8c5ed516d247b0c3cadb6abbd0158415db2b154d44834 SHA512 95dde1f542d73864c744a7a9f33513980748ee5f2b2e8eac96eb46b038929ce448fb794056f81a0ee52efead8588ba8c4f2e566012b1434345a606997ef4989e WHIRLPOOL 58b035ee4b134703605c0baad5490c295eaf115c15731943de6d7cb673485fb99849d650ab4ab17ff6caa9a43fb6dec0e7e8f0ede7ae0398214f9e65118b6aae
-MISC metadata.xml 898 SHA256 9c978aa61ebdc90c575b0f32efc05abde46067e001275c72230bcc39b1629de0 SHA512 d386a1247cd5645849d7677f190cc61f88d28fe8fc8a6747314ff2e8f5e59cf01f27bee19e4c5ad3cc42867e09124dc86544ebf3d666c8a598d8a6fffabeb6bd WHIRLPOOL d8fecfb2599e603364d2d95226cf24e3d423f506a40f1816ddb3475c90028b77a1b8441d2b84fcc350ce3227acf4294c45e756095ea62afb7b709e7b392b61a6
+EBUILD pythia-8.1.80.ebuild 2711 SHA256 8c6f84fe21cbe4b4d94491218d080092679e9aa4089584cff20c4c34994f7aa4 SHA512 3a8dcef237bbaacaf5cbb89594b689bc7180c45dc95c6d0c409b40b1861bb310d79aeb36171b88f0d2a5a467c77f1297056a05e8e23ab84a5e3c0cec663cf9c8 WHIRLPOOL 7cfb71e2559b8631e122a4fe6336c4280704ab423892f52ce45e00c5a82860f37a4f66c5d790df661aba8aa0b96ed57310d55eefaf2a1dd075389d07eecaf645
+MISC ChangeLog 7858 SHA256 6def531cbbac5836fb4c2d8d941160acfcadb66f26ffdcb19cf842ff81289338 SHA512 aef6f231bfa19b0e0648e0d81a6388faf3ae7ede23768a560c9b22663039c848153000bc755fd8a366caa1f47c577e4f6b916d020aaecc3d5778c1b4c91e8c0a WHIRLPOOL 2f2436627c0e2b0383bc4c8a1238f9b89cfc59cf1659c42029252515f8f76fc8396d8b0c538b1cf4c44bf76a53cf4ae674831eb5775fc6a11c9e0013dd41bf9e
+MISC metadata.xml 894 SHA256 f154993481ba82c5a93c955827e127e82a6d86087ff362c4412fa0236de73560 SHA512 774d2638df70ecea696549945b6c58744c43ed550a59cd8e5b460be254deafded83d6d8a3eca08e6e5695b6de84604a7d9d8a66e41f658107fde8c1c176017af WHIRLPOOL 086831e3b99779f47a222a1c7ac0eb12f55acf050e45c48685b0eef33dfb33b64cdf513e5f41bb06be45c396730b44b0b52f18cd605eba4d986c015f224d737d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlJwMQkACgkQ1ycZbhPLE2C/awCeP1hr+NBxNMFxWRM7msbABKEr
+uQAAnRLL2LH6Xxpwvh4Xj5WW3kWHoaLN
+=VNqJ
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/pythia/metadata.xml b/sci-physics/pythia/metadata.xml
index 836091b7be0d..b0a3a6a29e85 100644
--- a/sci-physics/pythia/metadata.xml
+++ b/sci-physics/pythia/metadata.xml
@@ -1,8 +1,8 @@
 <?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">
+<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
@@ -13,8 +13,8 @@
   but also borrows many formulae and other knowledge from the
   literature.
 </longdescription>
-	<use>
-		<flag name="hepmc">Adds support for High Energy Physics Monte Carlo
+<use>
+  <flag name="hepmc">Adds support for High Energy Physics Monte Carlo
   Generators <pkg>sci-physics/hepmc</pkg></flag>
-	</use>
+</use>
 </pkgmetadata>
diff --git a/sci-physics/pythia/pythia-8.1.70.ebuild b/sci-physics/pythia/pythia-8.1.70.ebuild
deleted file mode 100644
index 2c3fbfffae55..000000000000
--- a/sci-physics/pythia/pythia-8.1.70.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-8.1.70.ebuild,v 1.2 2012/11/30 22:08:58 bicatali Exp $
-
-EAPI=4
-
-inherit eutils fortran-2 versionator
-
-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 +hepmc static-libs"
-
-DEPEND="hepmc? ( sci-physics/hepmc )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	use hepmc && export HEPMCVERSION=2 HEPMCLOCATION="${EPREFIX}/usr"
-	# homemade configure script creates a useless config.mk
-	rm -f config.mk
-	cat > config.mk <<-EOF
-		SHAREDLIBS = yes
-		LDFLAGSSHARED = -shared ${LDFLAGS}
-		LDFLAGLIBNAME = -Wl,-soname
-		SHAREDSUFFIX = so
-	EOF
-	if ! use static-libs; then
-		sed -i \
-			-e '/targets.*\.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
-	# use emake for parallel instead of long runmains
-	emake main0{1..9}
-	for i in main0{1..9}*.exe; do
-		LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
-			./${i} > ${i}.out || die "test ${i} failed"
-	done
-	if use hepmc; then
-		emake main31
-		LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
-			./main31.exe > main31.exe.out || die
-	fi
-	emake clean && rm -f main*out
-}
-
-src_install() {
-	dolib.so lib/*so
-	use static-libs && dolib.a lib/archive/*
-
-	insinto /usr/include/${PN}
-	doins include/*
-
-	# xmldoc needed by root
-	insinto /usr/share/${PN}
-	doins -r xmldoc
-
-	echo "PYTHIA8DATA=${EROOT}usr/share/${PN}/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
-	fi
-}
diff --git a/sci-physics/pythia/pythia-8.1.80.ebuild b/sci-physics/pythia/pythia-8.1.80.ebuild
new file mode 100644
index 000000000000..04fbcc33a0fe
--- /dev/null
+++ b/sci-physics/pythia/pythia-8.1.80.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-8.1.80.ebuild,v 1.1 2013/10/29 22:04:54 bicatali 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="~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 )"
+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
+	emake main0{1..9}
+	for i in main0{1..9}*.exe; do
+		LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
+			./${i} > ${i}.out || die "test ${i} failed"
+	done
+	if use hepmc; then
+		emake main31
+		LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \
+			./main31.exe > main31.exe.out || die
+	fi
+	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
+	fi
+}