sci-physics/cernlib: 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, 26 insertions, 24 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index 4cee57876cc1..143a6680e2d4 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.29 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.30 2012/10/16 19:04:50 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org> cernlib-2006-r3.ebuild,
+  cernlib-2006-r4.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> cernlib-2006-r3.ebuild,
   cernlib-2006-r4.ebuild:
diff --git a/sci-physics/cernlib/cernlib-2006-r3.ebuild b/sci-physics/cernlib/cernlib-2006-r3.ebuild
index 35b66b4eee89..18e4ea544785 100644
--- a/sci-physics/cernlib/cernlib-2006-r3.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r3.ebuild
@@ -1,9 +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/cernlib/cernlib-2006-r3.ebuild,v 1.12 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.13 2012/10/16 19:04:50 jlec Exp $
 
 EAPI=3
-inherit eutils fortran-2 toolchain-funcs
+
+inherit eutils fortran-2 multilib toolchain-funcs
 
 DEB_PN=cernlib
 DEB_PV=${PV}.dfsg.2
@@ -12,27 +13,24 @@ DEB_P=${DEB_PN}_${DEB_PV}
 
 DESCRIPTION="CERN program library for High Energy Physics"
 HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/cernlib"
-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 hppa sparc x86"
 LICENSE="GPL-2 LGPL-2 BSD"
-
 SLOT="0"
+KEYWORDS="amd64 hppa sparc x86"
+IUSE=""
 
 RDEPEND="
-	virtual/fortran
->=x11-libs/openmotif-2.3:0
+	x11-libs/openmotif:0
 	virtual/lapack
 	dev-lang/cfortran"
-
 DEPEND="${RDEPEND}
 	x11-misc/imake
 	x11-misc/makedepend
 	virtual/pkgconfig"
 
-IUSE=""
-
 S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
 
 src_prepare() {
diff --git a/sci-physics/cernlib/cernlib-2006-r4.ebuild b/sci-physics/cernlib/cernlib-2006-r4.ebuild
index 3fcd524e5a2a..8e799f31e956 100644
--- a/sci-physics/cernlib/cernlib-2006-r4.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r4.ebuild
@@ -1,9 +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/cernlib/cernlib-2006-r4.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild,v 1.4 2012/10/16 19:04:50 jlec Exp $
 
 EAPI=4
-inherit eutils fortran-2 toolchain-funcs
+
+inherit eutils fortran-2 multilib toolchain-funcs
 
 DEB_PN=cernlib
 DEB_PV=20061220+dfsg3
@@ -12,26 +13,24 @@ DEB_P=${DEB_PN}_${DEB_PV}
 
 DESCRIPTION="CERN program library for High Energy Physics"
 HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/cernlib"
-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 ~hppa ~sparc ~x86"
-LICENSE="GPL-2 LGPL-2 BSD"
-
 SLOT="0"
+LICENSE="GPL-2 LGPL-2 BSD"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE=""
 
-RDEPEND=">=x11-libs/openmotif-2.3:0
-	virtual/fortran
+RDEPEND="
+	x11-libs/openmotif:0
 	virtual/lapack
 	dev-lang/cfortran"
-
 DEPEND="${RDEPEND}
 	x11-misc/imake
 	x11-misc/makedepend
 	virtual/pkgconfig"
 
-IUSE=""
-
 S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
 
 src_prepare() {
diff --git a/sci-physics/cernlib/metadata.xml b/sci-physics/cernlib/metadata.xml
index 72b191c10bcf..b2b80ddce18c 100644
--- a/sci-physics/cernlib/metadata.xml
+++ b/sci-physics/cernlib/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">
   The CERN Program Library is a large collection of general purpose
   libraries and modules maintained and offered in both source and
   object code form on the CERN central computers. Most of these