summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-12-16 08:39:14 +0000
committerJustin Lecher <jlec@gentoo.org>2010-12-16 08:39:14 +0000
commit58a1e242239a9579bb0e9c60fa270916f177e212 (patch)
tree781345b08bd32326bbfbc2f7dd89f4a6959b6b87 /sci-chemistry/cyana
parentx86 stable wrt bug #348595 (diff)
downloadhistorical-58a1e242239a9579bb0e9c60fa270916f177e212.tar.gz
historical-58a1e242239a9579bb0e9c60fa270916f177e212.tar.bz2
historical-58a1e242239a9579bb0e9c60fa270916f177e212.zip
Removal of fortran.eclass, #348851
Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/cyana')
-rw-r--r--sci-chemistry/cyana/ChangeLog5
-rw-r--r--sci-chemistry/cyana/Manifest10
-rw-r--r--sci-chemistry/cyana/cyana-2.1.ebuild22
3 files changed, 21 insertions, 16 deletions
diff --git a/sci-chemistry/cyana/ChangeLog b/sci-chemistry/cyana/ChangeLog
index d880b9188591..baee37570384 100644
--- a/sci-chemistry/cyana/ChangeLog
+++ b/sci-chemistry/cyana/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/cyana
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/ChangeLog,v 1.3 2010/11/16 17:16:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/ChangeLog,v 1.4 2010/12/16 08:39:14 jlec Exp $
+
+ 16 Dec 2010; Justin Lecher <jlec@gentoo.org> cyana-2.1.ebuild:
+ Removal of fortran.eclass, #348851
16 Nov 2010; Justin Lecher <jlec@gentoo.org> cyana-2.1.ebuild:
Removed not needed line from ebuild
diff --git a/sci-chemistry/cyana/Manifest b/sci-chemistry/cyana/Manifest
index 575830ca0a60..da9661f0e61d 100644
--- a/sci-chemistry/cyana/Manifest
+++ b/sci-chemistry/cyana/Manifest
@@ -5,13 +5,13 @@ AUX 2.1-exec.patch 1959 RMD160 c67a5748eb7627c1dc66d1e6546bc24416bf8263 SHA1 002
AUX 2.1-expire.patch 541 RMD160 9a1b273e333f535e1ac8948902cc930fcf9488d7 SHA1 739e2244f7fced69f87dce5b38572fbbe419a46b SHA256 19ae0d1c08d6627dd243d33244d33509991d581bc89d8ff88394a83655a61790
AUX 2.1-typo.patch 484 RMD160 c947da047f562eedcc8036d8d97bef37885e1521 SHA1 65f772b18082b956ae5bdfebe8663a522b7d7cc3 SHA256 ef05c4254cf859e804c44cdfa5774aca5a2f1aa853f0b6c0bccee837db2a5b8b
DIST cyana-2.1.tar.gz 2203650 RMD160 20dc614587792f5d02d50a104871a04b2507ee24 SHA1 60583c10117634e6031a901021ce6bad3206bb7d SHA256 4b49d23eda3a327074fa337c7ee13262e93fb2b92cc6feb9139dfb7695bdeded
-EBUILD cyana-2.1.ebuild 1654 RMD160 cb60d1a58b463d256360e50d1077543f63233b5b SHA1 5b11c427afbdd4a75d1fcb81dea86b51058bce5d SHA256 feaa90f27bc6cff02445b1f5a7749d019595d42ad3e63880b29fdd7494a14a81
-MISC ChangeLog 997 RMD160 c93993e59cfb836c43bb58a4924268b095e36126 SHA1 747dc3189a37c7ad920e4013f8b13fcae49678b8 SHA256 16f647ae9ccf0687eab4349bf331f0e379f26aef1dc93436dd53d43d8e45e245
+EBUILD cyana-2.1.ebuild 1664 RMD160 8cedb5d9989281b9c641517c6a8d36557afe23cf SHA1 8c530d569c995c6836f060ba5c72711feade0a63 SHA256 0438cd07becf32cc601dc768e5d3e04354071b87966e42c0662ba98342aae67e
+MISC ChangeLog 1100 RMD160 8a23aa43ab498caf697d8f533b3886e63c6d4e7e SHA1 fb29b98599eac4f701d2fa73c9ea8834dd0309fd SHA256 7c4e08f85b6d045e7437ff01f5374a8589bc6a8726976caea5a0decd0a24a9b2
MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkzivIgACgkQgAnW8HDreRaP0gCePr6pB9i/tatuu8P6KyP32cZt
-ODIAn3mq1N7v3PMAfKabdZCXWa0GpYpM
-=Z8Ur
+iEYEARECAAYFAk0J0DgACgkQgAnW8HDreRZ3qQCgxovp7dymeS4BJ+kMhVBEIIG5
+27sAn0lhIT9VKdOEO1ToKRVmkQI3EQpE
+=aceU
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/cyana/cyana-2.1.ebuild b/sci-chemistry/cyana/cyana-2.1.ebuild
index fd23ed3177bd..58834d2fa623 100644
--- a/sci-chemistry/cyana/cyana-2.1.ebuild
+++ b/sci-chemistry/cyana/cyana-2.1.ebuild
@@ -1,13 +1,10 @@
# Copyright 1999-2010 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.3 2010/11/16 17:16:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/cyana-2.1.ebuild,v 1.4 2010/12/16 08:39:14 jlec Exp $
EAPI="3"
-inherit eutils fortran toolchain-funcs
-
-# we need libg2c for gfortran # 136988
-FORTRAN="ifc"
+inherit eutils toolchain-funcs
DESCRIPTION="Combined assignment and dynamics algorithm for NMR applications"
HOMEPAGE="http://www.las.jp/english/products/s08_cyana/index.html"
@@ -20,6 +17,10 @@ IUSE="examples"
RESTRICT="fetch"
+# we need libg2c for gfortran # 136988
+DEPEND="dev-lang/ifc"
+RDEPEND="${DEPEND}"
+
pkg_nofetch() {
elog "Please visit"
elog "http://www.las.jp/english/products/s08_cyana/licenses.html"
@@ -28,14 +29,15 @@ pkg_nofetch() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PV}-typo.patch
- epatch "${FILESDIR}"/${PV}-exec.patch
- epatch "${FILESDIR}"/${PV}-expire.patch
+ epatch \
+ "${FILESDIR}"/${PV}-typo.patch \
+ "${FILESDIR}"/${PV}-exec.patch \
+ "${FILESDIR}"/${PV}-expire.patch
cat >> etc/config <<- EOF
VERSION=${PV}
SHELL=${EPREFIX}/bin/sh
- FC=${FORTRANC}
+ FC=ifort
FFLAGS=${FFLAGS}
FFLAGS2=${FFLAGS}
CC=$(tc-getCC)
@@ -44,7 +46,7 @@ src_prepare() {
LIBS=-pthread -lpthread -liomp5
EOF
- if [[ ${FORTRANC} == gfortran ]]; then
+ if [[ $(tc-getFC) == gfortran ]]; then
cat >> etc/config <<- EOF
DEFS=-Dgfortran
SYSTEM=gfortran