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

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 47 insertions, 34 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/Manifest b/sci-physics/cernlib/Manifest
index d11b604a44db..05fcb02dfd96 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -1,10 +1,21 @@
-AUX cernlib-2006-fgets.patch 759 RMD160 f8bdb2fc42740bc6baee8468eafa90d1a4389fb5 SHA1 24fe018212c9cee09d115ac9e5e44963d3f2ad03 SHA256 eb1e965627b094a698af5f9629f5f69cb4b966f33c01b48a7bcf75b80c3e9eaf
-AUX cernlib-2006-nogfortran.patch 1994 RMD160 dccb57e0b1d360080bc4527caef2beaa1225398d SHA1 10c32ccea93e78942afe5524b48dd47b4529ead8 SHA256 f9839ef5dc005715387bd997f69565aa1e5984502e6c6e625659e35bbaf9d997
-DIST cernlib_2006.dfsg.2-14.diff.gz 191345 RMD160 e2c6180b76855b33eb637878157722803c046119 SHA1 1d3c1e5300227eda76ea41672d0dc1675003d578 SHA256 e58c84825ea6fc775acdbccbaaa7ac8c3b70120da8f99e704270ea0aa437e665
-DIST cernlib_2006.dfsg.2.orig.tar.gz 6152834 RMD160 a75f320a2568eb3942268e7b03525a045e324b70 SHA1 181fef4381d49a2e40a8f21550c3cef0dbaa4dd9 SHA256 f8ef612cdef0e02b69ccabbe0061eed5f952522565affc25e8ad6e0b73b73f26
-DIST cernlib_20061220+dfsg3-1.debian.tar.gz 263187 RMD160 866467318ecc60d42287d492cf39f26515d46381 SHA1 b4702a675c7632258867494dc8b6349514c85792 SHA256 5613c101b0089d572a52e0a36e0a11caa04f3c2aa2d19ebff36b40e40e930eaa
-DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 RMD160 ab45ff443288293abf738d6c10d3dede1e35d86b SHA1 c60418df0600166ac934bd6fdece8a0f270aa224 SHA256 767ecf344cb00a7b2ec232a61c67645ce0fe1a6af861e60a9aa2f96544470f1b
-EBUILD cernlib-2006-r3.ebuild 3335 RMD160 a2d4b78f3f4aaa2276be265f85ba40e18d41fa09 SHA1 361d35cc7c6cb015d5b9ba3cacf8a4e44f0c520e SHA256 b29248f92996ea88d6490bf0655b6265b97ee790d74a70b15098d300042983a3
-EBUILD cernlib-2006-r4.ebuild 2814 RMD160 d1a1944387114599fd7041498f78d2930677b688 SHA1 c62df3b795d191c0dc15b86d25e5f50fc7572b47 SHA256 dc0fdee37ff7715fe8f0bf99f2d1fbc503323eb104764d1414c2b5897daee582
-MISC ChangeLog 4582 RMD160 44ada78f13d8f634b15d72a7cc10a8c3dd39708a SHA1 4240592cbb2f28c00d4f3ef475f280a34a84abd3 SHA256 498e174025c603c1a5a5356d40e50ce6c978175a15c0e0e68c390b6255149939
-MISC metadata.xml 654 RMD160 a33df2636030f2653d4bf478451979fc9850dc85 SHA1 7b018c6bb2eb2b897cd4a60b3a6080995094f44a SHA256 9812f051c9ac5c19fd295cdf79d9ba9d799a7b5ebe6b10d4cf9428d1ebf4e32c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cernlib-2006-fgets.patch 759 SHA256 eb1e965627b094a698af5f9629f5f69cb4b966f33c01b48a7bcf75b80c3e9eaf SHA512 efd017d9164e94870364e7124ae7ffd001989ffafe44ee85c5161bcc6399de4559430fdb39daf25e4fdb788a74ada06f00b9023651e714ca0c5ccf1ca248e821 WHIRLPOOL 17e8dfd1e788c7fae1276f08af3bcb6d5b50c7d0bc3885498317a702e27502d0cf697346ce25afe9cc964c96912878e44c20f8cf6b299c147f978bade2825547
+AUX cernlib-2006-nogfortran.patch 1994 SHA256 f9839ef5dc005715387bd997f69565aa1e5984502e6c6e625659e35bbaf9d997 SHA512 9446e85f57c5cdc78468e738f2a5d7227a2a91d4d6591b063fbc0a976bdb1b1f34edceee92ed7fbac558b1f6ba2663d1b43c373e92da3f414df21c601a0f1f72 WHIRLPOOL cab7f7b2ba7e71b539306b198649368324c75bbeb3e514ad7562ce6ec421f5c57a5b6502b99e78b5b35e954b64abb44b3a423212c14dda88bcddba8fa04ca498
+DIST cernlib_2006.dfsg.2-14.diff.gz 191345 SHA256 e58c84825ea6fc775acdbccbaaa7ac8c3b70120da8f99e704270ea0aa437e665
+DIST cernlib_2006.dfsg.2.orig.tar.gz 6152834 SHA256 f8ef612cdef0e02b69ccabbe0061eed5f952522565affc25e8ad6e0b73b73f26
+DIST cernlib_20061220+dfsg3-1.debian.tar.gz 263187 SHA256 5613c101b0089d572a52e0a36e0a11caa04f3c2aa2d19ebff36b40e40e930eaa
+DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 SHA256 767ecf344cb00a7b2ec232a61c67645ce0fe1a6af861e60a9aa2f96544470f1b
+EBUILD cernlib-2006-r3.ebuild 3320 SHA256 f500ec2f51743bf3214ed25d56da5bd52e2b60be4b82904cfeb3d7825c598c58 SHA512 6b36db6d8738623f502a71b570411b65a2c8f2b333e902c320e030cad34eae37bee70608954770a867f49798a99912d44e5151e55937dfa1828cda3e53ea36c4 WHIRLPOOL 4da3e84fe8f90de991a45107c1aa53b36cd8bfc5316faf136b1648c2d4f62e58d9a6eb8d2849923f7d919c033256bec8e8800206127cb6299d0d74575779abaf
+EBUILD cernlib-2006-r4.ebuild 2800 SHA256 cf0b3dc5c1d7183c303c9d0d1d215cf44186bad993469d56ebec0971478ff3b4 SHA512 f1a4a7e879a36becf1d1d34949f212a73e05744837cc2f55bcc02dc1a161aa977cffb00d91aadcf3410d347a1eaca23c34b1901760d1f61c2d714582e4fea8bd WHIRLPOOL 56d94b5f1efbfd5a48c6336b1282e33b18e13b72edd5620b5bb2e47f1575cd831a94416380cb9b908d25c6d563ff2fa755b42a827617f66ac41b77f6aadbde65
+MISC ChangeLog 4797 SHA256 7d029df4a104f0b0c2c3349d470fd66fcd5e65aaea744ead5ec1a3d71c5b6244 SHA512 27ff4824f3265044b45cc83bd12def8d0efd4ce6b429fa896716b2f7707f3de1c127a3ca971e04d2d808bb99347c470849e9b4673611dd3922b92c0a6d975164 WHIRLPOOL cc377b3c8af0ceef558deb629d7f8516b894b89f07a6da0144e722def50ff677dbf741f6805d5e34bf5d0d22921dd305cf7ce59e365b8578420ae0e21460ab9c
+MISC metadata.xml 656 SHA256 ec901901c15e68b5f9e0ad0780a169643bfa0708bf2b52fc444b48f1dbab5aae SHA512 777544b686ad9aa1f229ff9895aab24744ac13cab5d0d3051c90b6125573323b732d34183a5c1e4b7b4d6e886857e1072b4b1fb32f6eceb07f573a26fa8ad384 WHIRLPOOL 2c5a046f260553a40d9a2449b837c7310944a0ada6749c71401eae2ca23a2d2827fa01c2151e930484ca1c6310f0d9784cdf13c9c342f276369fa887741d1fb8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlB9r9MACgkQgAnW8HDreRYb+QCeKd+Uf707xsZH5WIciGgg1yny
+Sa0AoKjBGbJqFjL7oVGrZLBElUogoOl/
+=F5pV
+-----END PGP SIGNATURE-----
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