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

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

4 files changed, 34 insertions, 32 deletions

diff --git a/sci-chemistry/cyana/ChangeLog b/sci-chemistry/cyana/ChangeLog
index 9946762b78fa..8fa8b6767cd9 100644
--- a/sci-chemistry/cyana/ChangeLog
+++ b/sci-chemistry/cyana/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/cyana
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/ChangeLog,v 1.11 2011/06/21 16:03:46 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/ChangeLog,v 1.12 2012/10/19 09:45:27 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> cyana-2.1.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> cyana-2.1.ebuild:
   Add dependency on virtual/fortran
diff --git a/sci-chemistry/cyana/Manifest b/sci-chemistry/cyana/Manifest
index 9a35747319fd..f5abfcf60f07 100644
--- a/sci-chemistry/cyana/Manifest
+++ b/sci-chemistry/cyana/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 2.1-exec.patch 1959 RMD160 c67a5748eb7627c1dc66d1e6546bc24416bf8263 SHA1 002889b52871499fe62e85d9217c1c3e0b52d163 SHA256 fe8835c6dcdb6a8befa32e6bff1b761c5c6ae6131f73750e18724fb96f9a9623
-AUX 2.1-expire.patch 578 RMD160 7fd79ba6c2b477b06769182485d8c4b09b642bdd SHA1 9417eb4dddfb0c3fabcdedb65e8182088cf4dcc0 SHA256 723d69026e63995b281ae36582f5114562a1c4d6295d311ca2eb2900a1dc7b95
-AUX 2.1-typo.patch 484 RMD160 c947da047f562eedcc8036d8d97bef37885e1521 SHA1 65f772b18082b956ae5bdfebe8663a522b7d7cc3 SHA256 ef05c4254cf859e804c44cdfa5774aca5a2f1aa853f0b6c0bccee837db2a5b8b
-AUX 2.1-xiar.patch 385 RMD160 4a8953e2f058facaca4010950d4ff8876f771c2a SHA1 bacbe534b6c701e2700ec5bfe594642f1d4f5fb9 SHA256 c8d4daddaafa1388b87c7b107206df873fe98dc418db36ab48bfb2c60b3435e6
-DIST cyana-2.1.tar.gz 2203650 RMD160 20dc614587792f5d02d50a104871a04b2507ee24 SHA1 60583c10117634e6031a901021ce6bad3206bb7d SHA256 4b49d23eda3a327074fa337c7ee13262e93fb2b92cc6feb9139dfb7695bdeded
-EBUILD cyana-2.1.ebuild 1781 RMD160 71bc54db7b742be9fb9b0d79b6325a25a49aed2b SHA1 9fce7268a083ee0c16a1bcbef473f43df13ee4a2 SHA256 434bc642dee1f71eba1f38cabf09a9d42bf8c489cc87959b41ede2842fcba14b
-MISC ChangeLog 1882 RMD160 c79c53ba4906bcb22315fbaa7195f019ac2114a1 SHA1 42c037133bd75eef3ef99e479abb1d02c9ba876c SHA256 d3124075a10bfdd113d1c70271a23fe44acfc8217165de1b862529883c517e4b
-MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
+AUX 2.1-exec.patch 1959 SHA256 fe8835c6dcdb6a8befa32e6bff1b761c5c6ae6131f73750e18724fb96f9a9623 SHA512 43f04008b623e95e09cc323abd504c4f5bf708bde4771f2e334ae5d4ca59c24cfcaf34a3ad7c5b65ebb4587614343982fe377a226648098e02de8bdaa1c36a1d WHIRLPOOL 5ff8eedecd3e680e0f17917b6bd3c08bca6a0412f4e3e1693163af431eae3e9534d9fd87e574feaa11268988770a6f15ef5b3e070995995200f91521b8f1302a
+AUX 2.1-expire.patch 578 SHA256 723d69026e63995b281ae36582f5114562a1c4d6295d311ca2eb2900a1dc7b95 SHA512 7816f284a7af23c5d87a5a464ea36e7a1b09e73516852b85fac0d71bb8376639788f3f9395f8a6fd9365906d2aaadbd060f2194c7af3b68a24927adefcd56c40 WHIRLPOOL 8443238b88c5869225b6d68841a44fcdd618df21df9b07998b35897ad907a0b4e4264ad5925a46d944cfc7996f2ff9618380ac4f14f1b1f55926595eecedcbc2
+AUX 2.1-typo.patch 484 SHA256 ef05c4254cf859e804c44cdfa5774aca5a2f1aa853f0b6c0bccee837db2a5b8b SHA512 298e5053e4261477a11f0dff2339f198e50e92a96b98c5aea82e3a432b806b1ea0baa3638ef6e65dee315be3223510a804e2c849a82fdda0a1cf296de9d89db4 WHIRLPOOL 18b1db0e746630a9c040bd80b9f6cddff1ceaec2e92ce6d5583f6fb830d565012d25cfba284eb194f7b7930c5b01338b302b8dd7be01d56d62a580ac546ad572
+AUX 2.1-xiar.patch 385 SHA256 c8d4daddaafa1388b87c7b107206df873fe98dc418db36ab48bfb2c60b3435e6 SHA512 ce4c27b70d0c432b33f76b4ff76d004f525243269064f1af439bf42ab9783edd9dc19712b277d8e08bb692a28c40db7007040da1635cbd3c432029e4fe6c680f WHIRLPOOL 76d7e103437a7b76a0411fe563e082f90de514d67cf20e0ef0e7e2f9754230ac65a175471ec0685a8a3be9fa2d612a38137f4d03f10014a6e6dd547b4ff37100
+DIST cyana-2.1.tar.gz 2203650 SHA256 4b49d23eda3a327074fa337c7ee13262e93fb2b92cc6feb9139dfb7695bdeded
+EBUILD cyana-2.1.ebuild 1722 SHA256 d70b93ddbbbe2fdd3f90ad135dc303c792e3c5f8936f8536474cd40c71615a9e SHA512 2b2dc1995b1413697705ee1da40f5db9661db9489582f141c068d007ba5b89c69e52ee94c174f3abfbb5cf3671ca1fca5c736410b55f57af7a8c771c8738ca46 WHIRLPOOL 8b2b4dde1dc80961a9a0c3c27aaeb80b545cd456c86c3e3f95328644e691630ca18db4db7be8e01880052a9bcfd22568c33a8944aed9fa66b007fee8e7a59947
+MISC ChangeLog 2067 SHA256 7473ea5b3691fb4449523eead3ee0e05fe21d877540483e301f4e429ef214f53 SHA512 5b4a39d39bdbf3accc7d6d5fb7305d849276efe79a0dfc66bc09454273f10ea98e4f848b525a55e70247d5c0ffc1df0114188db9331b7c935001de6c7ffbe537 WHIRLPOOL 29598d7260376caec6a48af90cc423cabcdfb5ee2712ca4a227ce8cdd87cbd08692336b6551523afe7a9021f407098806028a09178901b7ef0331584c58a453b
+MISC metadata.xml 219 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8 SHA512 8e1fa48bb6533db28b30f09f61673779d75cebd0ba8058abb411cb62595788272998bb9d3e1be8a0f6f95ca42722efc6af7e4d5741e15fe72df4ad8c872383c1 WHIRLPOOL 12f73f93602d45fe69385989b4e8e91507665e0d7deb148365fce2c41d9a85e9bcaaa940ce039a554770f4f4b2207e33a2cea5ad784561b3c3a92be8584f4478
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk4AwOcACgkQgAnW8HDreRa4UwCgxi8uwOJyQFZkAk+4byvjkd/I
-7goAoIgCfl+2GXB9LV8jYtOAKpv3eVhD
-=Wbhs
+iEYEAREIAAYFAlCBITgACgkQgAnW8HDreRYTxQCghao79bI1lXTIao+uwjzco+1x
+DnoAnjfPB3qcfJ4f95/i1/rYt0+IOwcf
+=IYAs
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/cyana/cyana-2.1.ebuild b/sci-chemistry/cyana/cyana-2.1.ebuild
index 0b97e05b3311..33da7dea6ff5 100644
--- a/sci-chemistry/cyana/cyana-2.1.ebuild
+++ b/sci-chemistry/cyana/cyana-2.1.ebuild
@@ -1,8 +1,8 @@
-# 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-chemistry/cyana/cyana-2.1.ebuild,v 1.9 2011/06/21 16:03:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/cyana-2.1.ebuild,v 1.10 2012/10/19 09:45:27 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils fortran-2 toolchain-funcs
 
@@ -11,16 +11,14 @@ HOMEPAGE="http://www.las.jp/english/products/s08_cyana/index.html"
 SRC_URI="${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="as-is"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RESTRICT="fetch"
 
 # we need libg2c for gfortran # 136988
-DEPEND="
-	virtual/fortran
-	dev-lang/ifc"
+DEPEND="dev-lang/ifc"
 RDEPEND="${DEPEND}"
 
 pkg_nofetch() {
@@ -66,20 +64,19 @@ src_prepare() {
 
 src_compile() {
 	cd src
-	emake \
-		|| die
+	emake
 }
 
 src_install() {
-	dobin cyana{job,table,filter,clean} || die
-	newbin src/${PN}/${PN}exe.* ${PN} || die
+	dobin cyana{job,table,filter,clean}
+	newbin src/${PN}/${PN}exe.* ${PN}
 	insinto /usr/share/${PN}
-	doins -r lib macro help || die
+	doins -r lib macro help
 	use examples && doins -r demo
 
 	cat >> "${T}"/20cyana <<- EOF
 	CYANALIB="${EPREFIX}/usr/share/${PN}"
 	EOF
 
-	doenvd "${T}"/20cyana || die
+	doenvd "${T}"/20cyana
 }
diff --git a/sci-chemistry/cyana/metadata.xml b/sci-chemistry/cyana/metadata.xml
index c6856dc7f2cf..210ad0db014c 100644
--- a/sci-chemistry/cyana/metadata.xml
+++ b/sci-chemistry/cyana/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</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>