From 0b3c014662b0b0f310460d583e231693338a7cfb Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 24 Jun 2011 14:17:59 +0200 Subject: Streamlined fortran-2 eclass usage (Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916) --- sci-libs/etsf_io/ChangeLog | 3 +++ sci-libs/etsf_io/Manifest | 10 +++++----- sci-libs/etsf_io/etsf_io-1.0.3.ebuild | 12 +++++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sci-libs/etsf_io/ChangeLog b/sci-libs/etsf_io/ChangeLog index 1fc11efb8..936952259 100644 --- a/sci-libs/etsf_io/ChangeLog +++ b/sci-libs/etsf_io/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 24 Jun 2011; Justin Lecher etsf_io-1.0.3.ebuild: + Streamlined fortran-2 eclass usage + 21 Jun 2011; Justin Lecher etsf_io-1.0.3.ebuild, +metadata.xml: Added fortran-2.eclass support diff --git a/sci-libs/etsf_io/Manifest b/sci-libs/etsf_io/Manifest index 9d846ccde..a65a0913c 100644 --- a/sci-libs/etsf_io/Manifest +++ b/sci-libs/etsf_io/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST etsf_io-1.0.3.tar 453734 RMD160 df90acd34b0de104a07844ae2c9694edf27519c6 SHA1 ab3c4cb22ea2fc2498b396f186f221edd2463fcc SHA256 a02ead44b9634bdb6e47e50d76f35d56c10df468743e6fe5259c0dc478f7b32e -EBUILD etsf_io-1.0.3.ebuild 735 RMD160 0085d8c28e20a79a5f371bb309a1944e0e616cfb SHA1 febbddb4c8d04395547834faf0c52a395c9813a2 SHA256 dfbf6d1a27c4353084614a3b274da793262247dcf405bd7d3099f79de98a754f -MISC ChangeLog 394 RMD160 730d2a041e2be03ddff89186dbeab87cf88eef36 SHA1 814969efb7d8dd02145c5e4778342aa9ae63bdcb SHA256 722b0740572106e95076a1073782ba764cf8a5204c46f0817ab18057313d1948 +EBUILD etsf_io-1.0.3.ebuild 817 RMD160 b1359c207864ceb7e7c7b007f7177b899be162f1 SHA1 afd7f7701b2353acb7dddb830927a37e0977d1da SHA256 841953938c4dabdc87f4943f8786d6a40c0c5946ed416ad6aec7cd9ba615b659 +MISC ChangeLog 501 RMD160 42230fdb6edfe4c9de7b7074b9f0ac0ac113a5be SHA1 be52887cfc3c895b8f0607696957e32e04bf9061 SHA256 fd2f298292de47f7d4d376e0163f08801a785f77b1d05383150eb8b83228145d MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4AhAIACgkQgAnW8HDreRY5tQCfeVSavONMoX1QVAB837HyUfgP -A3cAnAuTCGCXJvhjAmNkf2Dp32AHtIqY -=C7tA +iEYEARECAAYFAk4EgHcACgkQgAnW8HDreRbqmwCfenucusO4QA8NKdtBSJBXc5ID +mFcAnRbaZp4JPn/U9jEI37mxtUXWScAz +=5xUD -----END PGP SIGNATURE----- diff --git a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild b/sci-libs/etsf_io/etsf_io-1.0.3.ebuild index e8eb22f35..ac0563b34 100644 --- a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild +++ b/sci-libs/etsf_io/etsf_io-1.0.3.ebuild @@ -3,7 +3,7 @@ EAPI=4 -inherit fortran-2 +inherit fortran-2 multilib DESCRIPTION="A library of F90 routines to read/write the ETSF file format" HOMEPAGE="http://www.etsf.eu/resources/software/libraries_and_tools/" @@ -14,7 +14,9 @@ SLOT="0" IUSE="examples" KEYWORDS="~amd64 ~x86" -RDEPEND="sci-libs/netcdf[fortran]" +RDEPEND=" + sci-libs/netcdf[fortran] + virtual/fortran" DEPEND="${RDEPEND}" FORTRAN_STANDARD="90" @@ -23,8 +25,8 @@ src_configure() { # fortran 90 uses FCFLAGS export FCFLAGS="${FFLAGS:--O2}" econf \ - --prefix=/usr \ $(use_enable examples build-tutorials) \ - --with-netcdf-ldflags="-L/usr/lib -lnetcdff" \ - --with-moduledir=/usr/lib/finclude + --prefix="${EPREFIX}/usr" \ + --with-netcdf-ldflags="-L${EPREFIX}/usr/$(get_libdir) -lnetcdff" \ + --with-moduledir="${EPREFIX}/usr/$(get_libdir)/finclude" } -- cgit v1.2.3-65-gdbad