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

4 files changed, 29 insertions, 22 deletions

diff --git a/sci-physics/cernlib-montecarlo/ChangeLog b/sci-physics/cernlib-montecarlo/ChangeLog
index 4e6836deef2d..49854b826df3 100644
--- a/sci-physics/cernlib-montecarlo/ChangeLog
+++ b/sci-physics/cernlib-montecarlo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/cernlib-montecarlo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.16 2011/07/21 16:49:43 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.17 2012/10/16 19:03:23 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org>
+  cernlib-montecarlo-2006-r2.ebuild, cernlib-montecarlo-2006-r3.ebuild,
+  metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
 *cernlib-montecarlo-2006-r3 (21 Jul 2011)
 
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild
index a028f788cd95..038f060206dc 100644
--- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild
+++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.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/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild,v 1.8 2011/06/21 14:40:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r2.ebuild,v 1.9 2012/10/16 19:03:23 jlec Exp $
 
 EAPI=2
+
 inherit eutils fortran-2 toolchain-funcs
 
 DEB_PN=mclibs
@@ -12,21 +13,20 @@ DEB_P=${DEB_PN}_${DEB_PV}
 
 DESCRIPTION="Monte-carlo library and tools for the cernlib"
 HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/cernlib"
-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="0"
+LICENSE="GPL-2 LGPL-2 BSD"
+KEYWORDS="amd64 x86"
 IUSE="+herwig"
 
 RDEPEND="
-	virtual/fortran
->=x11-libs/openmotif-2.3:0
+	x11-libs/openmotif:0
 	dev-lang/cfortran
 	sci-physics/cernlib
 	herwig? ( !sci-physics/herwig )"
-
 DEPEND="${RDEPEND}
 	virtual/latex-base
 	x11-misc/imake
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
index 612ceb3a59b7..266c20ab4846 100644
--- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
+++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.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/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v 1.1 2011/07/21 16:49:43 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v 1.2 2012/10/16 19:03:23 jlec Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -12,17 +12,18 @@ DEB_P=${DEB_PN}_${DEB_PV}
 
 DESCRIPTION="Monte-carlo library and tools for the cernlib"
 HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/cernlib"
-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}.debian.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
+LICENSE="GPL-2 LGPL-2 BSD"
 IUSE="+herwig"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=x11-libs/openmotif-2.3:0
+RDEPEND="
+	x11-libs/openmotif:0
 	dev-lang/cfortran
-	virtual/fortran
 	sci-physics/cernlib
 	herwig? ( !sci-physics/herwig )"
 
diff --git a/sci-physics/cernlib-montecarlo/metadata.xml b/sci-physics/cernlib-montecarlo/metadata.xml
index cacbb7ee6b3f..3b9831ca23f1 100644
--- a/sci-physics/cernlib-montecarlo/metadata.xml
+++ b/sci-physics/cernlib-montecarlo/metadata.xml
@@ -1,16 +1,16 @@
 <?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">
   This metapackage provides various Monte Carlo libraries included in
   Cernlib (both shared and static). Likely only physicists will be
   interested in these packages.
   The libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are not
   available for Gentoo: see cernlib Debian packaging for explanation.
 </longdescription>
-<use>
-    <flag name="herwig">Build Herwig internal event generator, newer version
+	<use>
+		<flag name="herwig">Build Herwig internal event generator, newer version
     available in <pkg>sci-physics/herwig</pkg></flag>
-</use>
+	</use>
 </pkgmetadata>