Version bump

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 15 insertions, 80 deletions

diff --git a/sci-physics/pythia/ChangeLog b/sci-physics/pythia/ChangeLog
index 2cf3e569eba8..f25444176d60 100644
--- a/sci-physics/pythia/ChangeLog
+++ b/sci-physics/pythia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/pythia
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.43 2011/11/25 21:50:37 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.44 2012/03/13 17:05:08 bicatali Exp $
+
+*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)
diff --git a/sci-physics/pythia/pythia-6.4.25.ebuild b/sci-physics/pythia/pythia-6.4.25.ebuild
deleted file mode 100644
index 2148e3b03f5a..000000000000
--- a/sci-physics/pythia/pythia-6.4.25.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-6.4.25.ebuild,v 1.3 2011/06/21 14:39:48 jlec Exp $
-
-EAPI=4
-
-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://projects.hepforge.org/pythia6/"
-
-# pythia6 from root is needed for some files to interface pythia6 with root.
-# To produce a split version on mirror do, 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.bz2
-SRC_URI="http://dev.gentoo.org/~bicatali/${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/${PN}-${EX_PV}-examples.tar.bz2 )"
-
-SLOT="6"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples static-libs"
-
-DEPEND="virtual/fortran"
-RDEPEND="${DEPEND}"
-
-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
-	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 || die
-	fi
-}
diff --git a/sci-physics/pythia/pythia-8.1.50.ebuild b/sci-physics/pythia/pythia-8.1.62.ebuild
index 6e107d8ac872..6cfb9b4b0e8d 100644
--- a/sci-physics/pythia/pythia-8.1.50.ebuild
+++ b/sci-physics/pythia/pythia-8.1.62.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.50.ebuild,v 1.3 2011/06/21 14:32:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-8.1.62.ebuild,v 1.1 2012/03/13 17:05:08 bicatali Exp $
 
 EAPI=4
 
@@ -19,9 +19,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples +hepmc static-libs"
 
 DEPEND="hepmc? ( sci-physics/hepmc )"
-RDEPEND="
-	virtual/fortran
-${DEPEND}"
+RDEPEND="virtual/fortran
+	${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -48,7 +47,7 @@ src_configure() {
 }
 
 src_test() {
-	cd "${S}"/examples
+	cd examples
 	# use emake for parallel instead of long runmains
 	emake main0{1..9}
 	for i in main0{1..9}*.exe; do
@@ -56,11 +55,9 @@ src_test() {
 			./${i} > ${i}.out || die "test ${i} failed"
 	done
 	if use hepmc; then
-		emake main31 main32
+		emake main31
 		LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
 			./main31.exe > main31.exe.out || die
-		LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
-			./main32.exe main32.cmnd hepmcout32.dat > main32.exe.out || die
 	fi
 	emake clean && rm -f main*out
 }
@@ -75,6 +72,7 @@ src_install() {
 	# xmldoc needed by root
 	insinto /usr/share/${PN}
 	doins -r xmldoc
+
 	echo "PYTHIA8DATA=${EROOT}usr/share/${PN}/xmldoc" >> 99pythia8
 	doenvd 99pythia8