sci-physics/cernlib-montecarlo: 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, 44 insertions, 36 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/Manifest b/sci-physics/cernlib-montecarlo/Manifest
index d12455146d02..b681ca952d95 100644
--- a/sci-physics/cernlib-montecarlo/Manifest
+++ b/sci-physics/cernlib-montecarlo/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX cernlib-montecarlo-2006-noherwig.patch 1993 RMD160 00bbaa63f49daf9311e6c33bc3711f3f0f8806a6 SHA1 a0faaa0244e2e9f8917e3639098a610777a10fb8 SHA256 bb85c46eb9d2acaf95dad615aac3b3c08b2607aea3368f7bbadd2532d58e177d
-DIST mclibs_2006.dfsg.2-5.diff.gz 38713 RMD160 24a7186fcc39174871044c782830ad42c11c1873 SHA1 2aba8e42db0fc317e559092b9d51b16520ac7678 SHA256 3c0d73211ad0cbb6c8b8c2d329a93ffcd853475e3027f5bb82120c112e0d0123
-DIST mclibs_2006.dfsg.2.orig.tar.gz 7406559 RMD160 116bc443dafc299d66d0e83080c1b3b5b34d41b9 SHA1 4c86439750f0b0824bf2f58cf9f2dab810be5293 SHA256 8e73ccb987cb8f930ed44eac807d4f8fd5b03d6926b2f8d62ffb6b31806acf73
-DIST mclibs_20061220+dfsg3-1.debian.tar.gz 46362 RMD160 8f3981abf82183ad569016c953f990ce30de269f SHA1 653aa80276ce48153ea34fc5ef551dac52a9f768 SHA256 17a9f61860237b963bc4b6240296add2bbe45cf16ce994061c3f20c33994cf73
-DIST mclibs_20061220+dfsg3.orig.tar.gz 7642494 RMD160 fcd263523d8353af99f4f9a6e4e48a92d7cf01bc SHA1 edb54b0058d8cfb13dbf9294ab75e81075e8847b SHA256 cb5ea19bc54a06c031c90192685748ce0f7df016bfae6b9d7d672d77a3444ce5
-EBUILD cernlib-montecarlo-2006-r2.ebuild 1991 RMD160 ef4e4d2a78ca6e81a2e969c2aaaa96bddb31239d SHA1 88d79a314c1b3c8f1aa1ca92dc2a4020cd9602be SHA256 f0005f4bd68c330f5bf09a720b68ed2d8b97fbb71faca23b96eb295ad302766b
-EBUILD cernlib-montecarlo-2006-r3.ebuild 1719 RMD160 8e5f1eb38cd8e01e5eab68c4275946a46e217084 SHA1 99f7b9f8030c78c40d71421d977f09bddd9ac4c6 SHA256 281581bb0a5ebd10c014b72e4fd1a06e43e223f057ce16563cd653588da85ce0
-MISC ChangeLog 2820 RMD160 c4888ec6b70ab241198b6a7d82d233bf8f3025bc SHA1 35c987681d79f9b7b805950389798b29828f7cfa SHA256 457da62d22f204a79a32e2f1784e61fd26831bf26d1dfe549841273ed7577aae
-MISC metadata.xml 665 RMD160 af9455141b04bef1ca123e0972dfe42394ed4114 SHA1 8fa6aaafe86b3e4d9cae2f1251d8a94a44872ec4 SHA256 c5e63a2fc2c3e38285e31547e814cfab76b8aac8da77114a9a0d7ad16ef38dc5
+AUX cernlib-montecarlo-2006-noherwig.patch 1993 SHA256 bb85c46eb9d2acaf95dad615aac3b3c08b2607aea3368f7bbadd2532d58e177d SHA512 e53794aeefdda4667bc71826b9514f44dd23fb0076cb55284ff4af0277facf5d3e1664f76dff80f975157350a02b871437230c66b49816c75730b4afed9d5ec9 WHIRLPOOL 088f7786549f24b1fcb47bdd1fd4ee98a973d7ef0a5add7f327ad84def85ddd0be38467e478aa5028e324fff26d3a50e0f7f6bb63074192a28b26d55440bd715
+DIST mclibs_2006.dfsg.2-5.diff.gz 38713 SHA256 3c0d73211ad0cbb6c8b8c2d329a93ffcd853475e3027f5bb82120c112e0d0123
+DIST mclibs_2006.dfsg.2.orig.tar.gz 7406559 SHA256 8e73ccb987cb8f930ed44eac807d4f8fd5b03d6926b2f8d62ffb6b31806acf73
+DIST mclibs_20061220+dfsg3-1.debian.tar.gz 46362 SHA256 17a9f61860237b963bc4b6240296add2bbe45cf16ce994061c3f20c33994cf73
+DIST mclibs_20061220+dfsg3.orig.tar.gz 7642494 SHA256 cb5ea19bc54a06c031c90192685748ce0f7df016bfae6b9d7d672d77a3444ce5
+EBUILD cernlib-montecarlo-2006-r2.ebuild 1971 SHA256 20d6ce9539c08919d1859936d928ebe651691f36028084c622b5533e33f3701a SHA512 46c03590e95cedba30262febaf71d95fae4231669e47263a41d3f9da6438e8c411a1a458069db984dbd7fdf70b8266b8dab1d945c0c47c577e8daaee834d2e6e WHIRLPOOL f8e643c1b6f7ba50afb9b838e86ffc1bed15c0402a88c05199352315759df9189549a788d19ef4ce86a5b70b540ceec499627f839e5560d7b7f38bb2481f1aac
+EBUILD cernlib-montecarlo-2006-r3.ebuild 1696 SHA256 6ebd857f5cc82dd744602b3bab7f721d8cd2c125a9b99a64aeb08e4338e6033d SHA512 6950135235459b63a75a2d45ae521044159d1621ddcf5a5993fccc8287a6adfabd160410a7d19804142502dfd4ca30bd8ee5a0ad5da05d2f87d4e984c9bf9c5f WHIRLPOOL 5b4d017d793a64780605eebac7ce347db94d2765115cf0719952e8ee5be5479be50f6c2509cd3c0b7340e0635eff6407cb99191e45fa466cbcf2e82fa1b36372
+MISC ChangeLog 3057 SHA256 04287fe903c97a11ad831b6714bc5e83001c4d3df27f37d3d7603c4255c9d590 SHA512 eafe68c77e570285309744d7c9b0a3f43b1226c14094c9f453c158cee814017ec3f82c6fad3241dc00c704e3519723c32ec1cf9fdef814de45630ad1a610ff1e WHIRLPOOL 2db98667ac84bddd3437eb8067e744b59dff2d71fb8655ccba4cd8b816e1e0791d07171242e6bcdb6fe06d88e5ba2ef15e9d7dca82fed7a5953179996b04e83b
+MISC metadata.xml 667 SHA256 d82203b5477f47d85acc2fe060be1d7432df0e66dea7742593f16bb0f0d42ac0 SHA512 05349ee1bd053e287011ede8b10916bae1f0fb2e4edf5232d7b3190ddcb321e21aac11a7328a89d38bf2d05e58927bb67827a83d55dd4e8f979ea0e9f9bd67e3 WHIRLPOOL ff3e34c4c47513f8db83679e44eb44df461b6b0e1d3a194dde7dc9cfbcc3cc66c5d3de875ca9eb71c5a41b56a4aa934a5633fa1d4f2c7ce9c22c4ffbc9afaf81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk4oWLAACgkQ1ycZbhPLE2ALFwCfaLPFapdlfmwu8QyBWOkNYcwI
-u4IAnRttw6hPBUmbYYOwbUCTCnHMmGQI
-=GYw3
+iEYEAREIAAYFAlB9r30ACgkQgAnW8HDreRbymACfVvoJbXHLfR50wHU+qrZPZjFr
+Z3sAn1Sn/EVm8BtL6qJ/ah7fwO8omzbd
+=po3m
 -----END PGP SIGNATURE-----
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>