sci-physics/geant: 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)

7 files changed, 31 insertions, 25 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index b8c2d9602d89..6c40b2069f94 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/geant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.65 2012/07/04 08:11:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.66 2012/10/16 19:00:19 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org> geant-3.21.14-r2.ebuild,
+  geant-3.21.14-r3.ebuild, geant-4.9.2_p02.ebuild, geant-4.9.4_p03.ebuild,
+  geant-4.9.5-r1.ebuild, geant-4.9.5_p01.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   04 Jul 2012; Jeff Horelick <jdhore@gentoo.org> geant-4.9.4_p03.ebuild:
   marked x86 per bug 420295
diff --git a/sci-physics/geant/geant-3.21.14-r2.ebuild b/sci-physics/geant/geant-3.21.14-r2.ebuild
index eeca20d617f1..690059e887d3 100644
--- a/sci-physics/geant/geant-3.21.14-r2.ebuild
+++ b/sci-physics/geant/geant-3.21.14-r2.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/geant/geant-3.21.14-r2.ebuild,v 1.20 2011/06/28 13:34:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild,v 1.21 2012/10/16 19:00:19 jlec Exp $
 
 EAPI=2
 
@@ -26,7 +26,6 @@ RDEPEND="
 	dev-lang/cfortran
 	sci-physics/cernlib
 	sci-physics/paw
-	virtual/fortran
 	x11-libs/openmotif:0"
 DEPEND="${RDEPEND}
 	virtual/latex-base
diff --git a/sci-physics/geant/geant-3.21.14-r3.ebuild b/sci-physics/geant/geant-3.21.14-r3.ebuild
index 9441f5b2ce78..fe40d10f5bc8 100644
--- a/sci-physics/geant/geant-3.21.14-r3.ebuild
+++ b/sci-physics/geant/geant-3.21.14-r3.ebuild
@@ -1,8 +1,9 @@
-# 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/geant/geant-3.21.14-r3.ebuild,v 1.1 2011/07/21 16:50:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r3.ebuild,v 1.2 2012/10/16 19:00:19 jlec Exp $
 
 EAPI=4
+
 inherit eutils fortran-2
 
 DEB_PN=geant321
@@ -12,21 +13,20 @@ DEB_P=${DEB_PN}_${DEB_PV}
 
 DESCRIPTION="CERN's detector description and simulation Tool"
 HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/geant/"
-
-LICENSE="GPL-2 LGPL-2 BSD"
-SRC_URI="mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
 	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz"
 
-KEYWORDS="~amd64 ~x86"
 SLOT="3"
+LICENSE="GPL-2 LGPL-2 BSD"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/openmotif-2.3:0
-	virtual/fortran
+RDEPEND="
+	x11-libs/openmotif:0
 	dev-lang/cfortran
 	sci-physics/cernlib
 	sci-physics/paw"
-
 DEPEND="${RDEPEND}
 	virtual/latex-base
 	x11-misc/imake
diff --git a/sci-physics/geant/geant-4.9.2_p02.ebuild b/sci-physics/geant/geant-4.9.2_p02.ebuild
index f99b090593d8..c61491acdb9a 100644
--- a/sci-physics/geant/geant-4.9.2_p02.ebuild
+++ b/sci-physics/geant/geant-4.9.2_p02.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/geant/geant-4.9.2_p02.ebuild,v 1.16 2011/08/02 05:50:11 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v 1.17 2012/10/16 19:00:19 jlec Exp $
 
 EAPI=2
 
-inherit eutils fortran-2 toolchain-funcs versionator
+inherit eutils fortran-2 multilib toolchain-funcs versionator
 
 PV1=$(get_version_component_range 1 ${PV})
 PV2=$(get_version_component_range 2 ${PV})
@@ -32,7 +32,6 @@ IUSE="aida athena +data dawn debug examples gdml geant3 global minimal +motif
 	+opengl openinventor qt4 +raytracerx static +vrml zlib"
 
 RDEPEND="
-	virtual/fortran
 	<sci-physics/clhep-2.1
 	motif? ( x11-libs/openmotif:0 )
 	athena? ( x11-libs/libXaw )
diff --git a/sci-physics/geant/geant-4.9.4_p03.ebuild b/sci-physics/geant/geant-4.9.4_p03.ebuild
index 0facb51768de..1e6c16c7c7e4 100644
--- a/sci-physics/geant/geant-4.9.4_p03.ebuild
+++ b/sci-physics/geant/geant-4.9.4_p03.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/geant/geant-4.9.4_p03.ebuild,v 1.3 2012/07/04 08:11:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.4_p03.ebuild,v 1.4 2012/10/16 19:00:19 jlec Exp $
 
 EAPI=4
 
@@ -33,7 +33,7 @@ SLOT="4"
 KEYWORDS="amd64 x86"
 IUSE="+data dawn examples gdml geant3 granular qt4 static-libs vrml zlib"
 
-RDEPEND="virtual/fortran
+RDEPEND="
 	>=sci-physics/clhep-2.1
 	qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 )
 	gdml? ( dev-libs/xerces-c )
diff --git a/sci-physics/geant/geant-4.9.5-r1.ebuild b/sci-physics/geant/geant-4.9.5-r1.ebuild
index 020340b382bd..08dba456ef6f 100644
--- a/sci-physics/geant/geant-4.9.5-r1.ebuild
+++ b/sci-physics/geant/geant-4.9.5-r1.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/geant/geant-4.9.5-r1.ebuild,v 1.7 2012/05/20 16:46:58 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5-r1.ebuild,v 1.8 2012/10/16 19:00:19 jlec Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
 	raytracerx qt4 static-libs test vrml zlib"
 
-RDEPEND="virtual/fortran
+RDEPEND="
 	>=sci-physics/clhep-2.1.1
 	dawn? ( media-gfx/dawn )
 	gdml? ( dev-libs/xerces-c )
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYP}"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch \
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.4-zlib.patch
 	"${FILESDIR}"/${PN}-4.9.5-scripts-only-dataenv.patch )
 
 src_configure() {
diff --git a/sci-physics/geant/geant-4.9.5_p01.ebuild b/sci-physics/geant/geant-4.9.5_p01.ebuild
index 0e7622f8ed52..76f6bf412cee 100644
--- a/sci-physics/geant/geant-4.9.5_p01.ebuild
+++ b/sci-physics/geant/geant-4.9.5_p01.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/geant/geant-4.9.5_p01.ebuild,v 1.3 2012/05/20 16:46:58 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p01.ebuild,v 1.4 2012/10/16 19:00:19 jlec Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
 	raytracerx qt4 static-libs test vrml zlib"
 
-RDEPEND="virtual/fortran
+RDEPEND="
 	>=sci-physics/clhep-2.1.1
 	dawn? ( media-gfx/dawn )
 	gdml? ( dev-libs/xerces-c )
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYP}"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch \
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.4-zlib.patch
 	"${FILESDIR}"/${P}-scripts-only-dataenv.patch )
 
 src_configure() {