Version bump

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 39 insertions, 105 deletions

diff --git a/sci-physics/pythia/ChangeLog b/sci-physics/pythia/ChangeLog
index 79946fcd6dcc..227b0e916cb3 100644
--- a/sci-physics/pythia/ChangeLog
+++ b/sci-physics/pythia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/pythia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.12 2009/06/24 04:13:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.13 2009/09/09 21:57:15 bicatali Exp $
+
+*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)
 
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index f6b60262a089..636e768c2f8f 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -3,26 +3,23 @@ Hash: SHA1
 
 DIST lutp0613man2.pdf 2902047 RMD160 a45a1fcd47db9dc4ec3448018038b441174bc55d SHA1 4601580d13482d9230026dad6f943d01bf3ffd74 SHA256 03d637310ea80f0d7aea761492bd38452c602890d8cf913a1ec9edacd79fa43d
 DIST pythia-6.4.18-examples.tar.bz2 36366 RMD160 92142cd1edd6344a59466168c95b5880fd3af00e SHA1 55f4dbae8edca3523ad0bd230dabd51167baf222 SHA256 17b1809fb0cffba20115c2bc1032c24d8efece25bd3f1f632f88265ade4dd084
-DIST pythia-6.4.18.f.gz 575245 RMD160 215355c6f4c2459ae7d7d3c6bb4314cd6331f136 SHA1 afe2355c13013163075f0efba046018c06229369 SHA256 06f55c461233ba633a99200370914f729fa109d583ff15003c26149a714797f1
 DIST pythia-6.4.19.tar.bz2 540487 RMD160 925261a883df73a0718af9f162a2b7d64dba4a19 SHA1 48d74723c5aba912c8e0447c3e7c667339947307 SHA256 b0ecbd3781c0cd1a0992b1b7c396e7ded25ec9a4afc68d9671cc24776923a34c
 DIST pythia-6.4.20.tar.bz2 552906 RMD160 4893b32d95b076195992dd6863dae5a4f5da9b4f SHA1 c5d1a2c1f1f8e0256633be6aa5f4de70dc400b49 SHA256 539355fde405cce9c4b4ffe1beb6636ecf6e111bfa013971195705a78169fc47
+DIST pythia-6.4.21.tar.bz2 552280 RMD160 78c455080d981cd8e14af0ff6f308f60cdddac33 SHA1 b41783f65f2b7832fa3be7566809d6cf0c2ce216 SHA256 d8e116df4938b7c4c450a1038c2d9e1c5a22454c85dbb01f7d8df2e4b368304c
 DIST pythia6.tar.gz 567451 RMD160 a6bd12a24f85436e64c51482c71469335c20372b SHA1 f2401d493bb4d5e059a1c4c48517c1679d74a437 SHA256 ebc90b8ec94897d8b09030341323d2c7c6e5c7c65077f98b96c8cff00d40a5ce
 DIST pythia8108.tgz 1694925 RMD160 b8cb8c9002984cd103f28bef9d5b58dbc705d40b SHA1 7c120f339ae23983cf3b1f5f6f294c22ff96ae29 SHA256 1314f7b27b8569b1dca38eea8389c54ae1b718616fd2750d83f32984a1159715
-DIST pythia8120.tgz 3049947 RMD160 cdab6fc03c3993de9cd87292f4b3e6ca1571e115 SHA1 4b62b61404cc7e31509a11be05ecb9deb29f113d SHA256 b744f873057b3b2c2b406c889b7bcd7b7fb70bfd870ad06427bc4be9895bca15
 DIST pythia8125.tgz 3561886 RMD160 982d33e46dc99482923dd29d8bc3ff34bac99a96 SHA1 7e8f38561e22c6cbb652137ad1669d0c38e48d85 SHA256 18a84b7e21c43dd6dd7cff625081a1f7c099768709d556b4d528c06f6b4bf22c
-DIST update_notes-6.4.18.txt 68019 RMD160 2f579ff64538128d60c5625afc13061dd4429e84 SHA1 ae73f097e2640b09e8b69c003699f2dac50eeaa7 SHA256 464b71451d8f1b4847ba2c649f3c9d556b4a11f24c2ae29b2e7f1d03086a00a2
-EBUILD pythia-6.4.18.ebuild 1605 RMD160 6a3c0698c70c349a3f892c2fe70eb252f59db18a SHA1 d0b531e718c25c0ecbe13a2e53cb594c55d071fa SHA256 67306a655397521cd54a8d5accea72a6200f39f6b50ac676eea77f7578150ac2
 EBUILD pythia-6.4.19.ebuild 1956 RMD160 eaee85340083f82d8a347f396ac62397e857109d SHA1 e578fbb17ae235cdd82b0df72d31fa58ba2a0db0 SHA256 847921632f78089c0b8134cbfc794998636546a8dd9d52ed344824d816d819d4
 EBUILD pythia-6.4.20.ebuild 1958 RMD160 29deaafe8017c65a1dec0f6b8ec6aef7521b32ce SHA1 bb92863166b1a8c0688ae3dc0fa84cd6c1d521b2 SHA256 c42b087ade9d5a7d795e8fd8224047208ff205742f34bfec7c3fec45dbef6aff
+EBUILD pythia-6.4.21.ebuild 1958 RMD160 813ee1a3b9b62cd9c9c7a64d97076d46fd6a271d SHA1 d3e93b3eb7c0ee121386953e8d044e4b61a9cafb SHA256 501e3c636b9e8bc6bcb7613e90b6f34bad799855154bdda1ba39a707ab7def03
 EBUILD pythia-8.1.08-r1.ebuild 2060 RMD160 1a3c465998d579ffc7dbd32d7fac78134e315e77 SHA1 123943c9f2b0938233c0efaba0b773ab48829c37 SHA256 d2dc3728be97d7027e323afc7b11f078dcb5cab453f1902ef31363d9a865f830
-EBUILD pythia-8.1.20.ebuild 2108 RMD160 23b95b99403103ac3896586f82513f02a7fab1af SHA1 bcfdb8f9a7499462aefb0d40a8ce90da0fa35551 SHA256 1600a6374a3759ab525e2cf29ebbb398c9281540fdfd552a8f87644995813f7e
 EBUILD pythia-8.1.25.ebuild 2108 RMD160 04e9b296f37c9458ab49437e6325bfd340bc366d SHA1 1d98c52a3efe45b8258f90615e035e1a8671eef2 SHA256 94b0ade50026b92eea46a19fbe4cfb97ff24f07974b549cc3568a2a436148e0e
-MISC ChangeLog 2039 RMD160 2481a32e9a980599dab04fa204fbf71891e9653d SHA1 aa39931068ffc5c5afbd7dabe468d028ee0d2074 SHA256 19c11419dd36a2246d2d9cd90f65c9c8a5ff877d40371a53347d7b7ed9a73635
+MISC ChangeLog 2211 RMD160 e01de08036f127c52d1de97bd89bf7892ed88070 SHA1 ce45fce5480420794f19005012fd71e59a52fa89 SHA256 02659b25564b6327c2f385f69b4756686535872fc846638843c5114a26e5f25d
 MISC metadata.xml 894 RMD160 f5a14a2a8897a78169e1337bdf95aa52c3fbb4b0 SHA1 ae2432ca7098c360862a470193edd692fa24794b SHA256 bf610680f4c8ba31c905668ff4b4108d7eb3cf40fd72d7fadd45e6a51e4d8aba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpBqBEACgkQ1ycZbhPLE2Ap9gCdFMKhmMitzEnZ1oNeP+3hnxyY
-RjMAnizfQKUFi2Vt1VJ7JJDFk+MNZT0k
-=3gxN
+iEYEARECAAYFAkqoJMQACgkQ1ycZbhPLE2DbtACfWs8h3ftYiA4Em+7J0KwxdFN6
+LLUAniMURiDvrYE9cCpzl6UuwzAyo8eS
+=JDTc
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/pythia/pythia-6.4.18.ebuild b/sci-physics/pythia/pythia-6.4.21.ebuild
index 9ea47221c691..0f2d7533c487 100644
--- a/sci-physics/pythia/pythia-6.4.18.ebuild
+++ b/sci-physics/pythia/pythia-6.4.21.ebuild
@@ -1,61 +1,65 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-6.4.18.ebuild,v 1.3 2008/09/16 21:43:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-6.4.21.ebuild,v 1.1 2009/09/09 21:57:15 bicatali Exp $
 
+EAPI=2
 inherit fortran versionator autotools
 
 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://projects.hepforge.org/pythia6/"
 
-# pythia6 from root is needed for some files to interface pythia6 with root
-SRC_URI="http://www.hepforge.org/archive/${MY_PN}/${P}.f.gz
-	http://www.hepforge.org/archive/${MY_PN}/update_notes-${PV}.txt
+# pythia6 from root is needed for some files to interface pythia6 with root.
+# To produce a split version on mirror do:
+# svn export http://svn.hepforge.org/pythia6/tags/v_6_4_19/ pythia-6.4.19
+# tar cjf pythia-6.4.19.tar.bz2
+SRC_URI="mirror://gentoo/${P}.tar.bz2
 	ftp://root.cern.ch/root/pythia6.tar.gz
 	doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp${DOC_PV}man2.pdf )
-	examples? ( mirror://gentoo/${P}-examples.tar.bz2 )"
+	examples? ( mirror://gentoo/${PN}-${EX_PV}-examples.tar.bz2 )"
 
 LICENSE="public-domain"
 SLOT="6"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE="doc examples"
 DEPEND=""
+RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
-FORTRAN="gfortran ifc g77"
-
-S="${WORKDIR}"
-src_unpack() {
-	unpack ${A}
+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
 		AC_PROG_LIBTOOL
+		AC_CHECK_LIB(m,sqrt)
 		AC_CONFIG_FILES(Makefile)
 		AC_OUTPUT
 	EOF
-	cat > Makefile.am <<-EOF
-		lib_LTLIBRARIES = lib${MY_PN}.la
-		lib${MY_PN}_la_SOURCES = ${P}.f \
-		   pythia6/tpythia6_called_from_cc.F \
-		   pythia6/pythia6_common_address.c
-	EOF
+	echo >> Makefile.am "lib_LTLIBRARIES = libpythia6.la"
+	echo >> Makefile.am "libpythia6_la_SOURCES = \ "
+	# replace wildcard from makefile to ls in shell
+	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_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc "${DISTDIR}"/update_notes-${PV}.txt
+	dodoc update_notes.txt README
 	insinto /usr/share/doc/${PF}/
 	if use doc; then
 		doins "${DISTDIR}"/lutp${DOC_PV}man2.pdf || die
 	fi
 	if use examples; then
-		doins -r examples || die
+		doins -r "${WORKDIR}"/examples || die
 	fi
 }
diff --git a/sci-physics/pythia/pythia-8.1.20.ebuild b/sci-physics/pythia/pythia-8.1.20.ebuild
deleted file mode 100644
index a0de0c9a2bbe..000000000000
--- a/sci-physics/pythia/pythia-8.1.20.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-8.1.20.ebuild,v 1.1 2009/03/18 16:19:40 bicatali Exp $
-
-EAPI=1
-
-inherit eutils versionator
-
-MV=$(get_major_version)
-MY_P=${PN}$(replace_all_version_separators "" ${PV})
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://home.thep.lu.se/~torbjorn/Pythia.html"
-SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="8"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="doc examples +hepmc"
-
-DEPEND="hepmc? ( sci-physics/hepmc )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	use hepmc && export HEPMCVERSION=2 HEPMCLOCATION=/usr
-	# homemade configure script creates a useless config.mk
-	rm -f config.mk && touch config.mk
-	emake SHAREDLIBS=yes LDFLAGSSHARED="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	cd "${S}"/examples
-	# use emake for parallel instead of long runmains
-	emake \
-		$(ls main0{1..9}*.cc main1{0..5}*.cc | sed -e 's/.cc//') \
-		|| die "emake tests failed"
-	for i in main0{1..9}*.exe main1{0..5}*.exe; do
-		./${i} > ${i}.out || die "test ${i} failed"
-	done
-	if use hepmc; then
-		emake main31 main32 || die "emake tests for hepmc failed"
-		./main31.exe > main31.exe.out || die
-		./main32.exe main32.cmnd hepmcout32.dat > main32.exe.out || die
-	fi
-	emake clean && rm -f main*out
-}
-
-src_install() {
-	dolib.so lib/*so || die "shared lib install failed"
-	dolib.a lib/archive/* || die "static lib install failed"
-
-	insinto /usr/include/${PN}
-	doins include/* || die "headers install failed"
-
-	# xmldoc needed by root
-	insinto /usr/share/${PN}
-	doins -r xmldoc || die "xmldoc install failed"
-	echo PYTHIA8DATA=/usr/share/${PN}/xmldoc >> 99pythia8
-	doenvd 99pythia8
-
-	insinto /usr/share/doc/${PF}
-	dodoc GUIDELINES AUTHORS README
-	if use doc; then
-		doins worksheet.pdf || die "doc install failed"
-		mv htmldoc html
-		doins -r html || die "html doc install failed"
-	fi
-	if use examples; then
-		doins -r examples || die "examples install failed"
-	fi
-}