sci-physics/pythia: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

(Portage version: 2.2.0_alpha138/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

6 files changed, 26 insertions, 27 deletions

diff --git a/sci-physics/pythia/ChangeLog b/sci-physics/pythia/ChangeLog
index e9f6b07b78f6..1a3a2eadf337 100644
--- a/sci-physics/pythia/ChangeLog
+++ b/sci-physics/pythia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/pythia
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.46 2012/08/08 04:17:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/ChangeLog,v 1.47 2012/10/16 18:54:19 jlec Exp $
+
+  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:
diff --git a/sci-physics/pythia/metadata.xml b/sci-physics/pythia/metadata.xml
index 4e28dbdc4185..836091b7be0d 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-6.4.24.ebuild b/sci-physics/pythia/pythia-6.4.24.ebuild
index 62ef516431fb..d2bc58270f1a 100644
--- a/sci-physics/pythia/pythia-6.4.24.ebuild
+++ b/sci-physics/pythia/pythia-6.4.24.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-6.4.24.ebuild,v 1.8 2011/06/21 14:39:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-6.4.24.ebuild,v 1.9 2012/10/16 18:54:19 jlec Exp $
 
 EAPI=2
 
@@ -18,7 +18,8 @@ HOMEPAGE="http://projects.hepforge.org/pythia6/"
 # 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="mirror://gentoo/${P}.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/${PN}-${EX_PV}-examples.tar.bz2 )"
@@ -28,9 +29,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 .
diff --git a/sci-physics/pythia/pythia-6.4.26.ebuild b/sci-physics/pythia/pythia-6.4.26.ebuild
index ef506948309a..559145c2ec67 100644
--- a/sci-physics/pythia/pythia-6.4.26.ebuild
+++ b/sci-physics/pythia/pythia-6.4.26.ebuild
@@ -1,6 +1,6 @@
 # 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-6.4.26.ebuild,v 1.2 2012/08/08 04:17:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-6.4.26.ebuild,v 1.3 2012/10/16 18:54:19 jlec Exp $
 
 EAPI=4
 
@@ -18,7 +18,8 @@ HOMEPAGE="http://projects.hepforge.org/pythia6/"
 # To produce a split version, 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
+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 )"
@@ -28,9 +29,6 @@ LICENSE="public-domain"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 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 .
diff --git a/sci-physics/pythia/pythia-8.1.45.ebuild b/sci-physics/pythia/pythia-8.1.45.ebuild
index aa5925c2dfc5..98da6f5e6229 100644
--- a/sci-physics/pythia/pythia-8.1.45.ebuild
+++ b/sci-physics/pythia/pythia-8.1.45.ebuild
@@ -1,10 +1,10 @@
-# 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.45.ebuild,v 1.9 2011/06/21 14:32:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-8.1.45.ebuild,v 1.10 2012/10/16 18:54:19 jlec Exp $
 
 EAPI=2
 
-inherit eutils versionator
+inherit eutils fortran-2 versionator
 
 MV=$(get_major_version)
 MY_P=${PN}$(replace_all_version_separators "" ${PV})
@@ -19,9 +19,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc examples +hepmc static-libs"
 
 DEPEND="hepmc? ( sci-physics/hepmc )"
-RDEPEND="
-	virtual/fortran
-${DEPEND}"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-physics/pythia/pythia-8.1.65.ebuild b/sci-physics/pythia/pythia-8.1.65.ebuild
index 954024e87468..ca72c47899e7 100644
--- a/sci-physics/pythia/pythia-8.1.65.ebuild
+++ b/sci-physics/pythia/pythia-8.1.65.ebuild
@@ -1,10 +1,10 @@
 # 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.65.ebuild,v 1.2 2012/08/08 04:17:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/pythia/pythia-8.1.65.ebuild,v 1.3 2012/10/16 18:54:19 jlec Exp $
 
 EAPI=4
 
-inherit eutils versionator
+inherit eutils fortran-2 versionator
 
 MV=$(get_major_version)
 MY_P=${PN}$(replace_all_version_separators "" ${PV})
@@ -19,8 +19,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples +hepmc static-libs"
 
 DEPEND="hepmc? ( sci-physics/hepmc )"
-RDEPEND="virtual/fortran
-	${DEPEND}"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"