aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-libs/cgnslib/ChangeLog3
-rw-r--r--sci-libs/cgnslib/Manifest10
-rw-r--r--sci-libs/cgnslib/cgnslib-2.5.4.ebuild11
3 files changed, 15 insertions, 9 deletions
diff --git a/sci-libs/cgnslib/ChangeLog b/sci-libs/cgnslib/ChangeLog
index f5acb5a31..400ad2532 100644
--- a/sci-libs/cgnslib/ChangeLog
+++ b/sci-libs/cgnslib/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> cgnslib-2.5.4.ebuild:
+ Streamlined fortran-2 eclass usage
+
21 Jun 2011; Justin Lecher <jlec@gentoo.org> cgnslib-2.5.4.ebuild:
Added fortran-2.eclass support
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index 8bfb52a72..f228e1749 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
AUX cgnslib-2.5.4.patch 2730 RMD160 0d92b759686fc657bb1dce75ea64f35abda60516 SHA1 bf32f3294a3636f9f4fc3d24826642f9b5781477 SHA256 e601058b0641ad6646025156d7929fafdd17ec5c6ddaf688ac07a6fa30a47f4b
AUX cgnslib-2.5.4_hdf5.patch 1889 RMD160 1fb75472109c51b7166f930891003901f4877c8b SHA1 1904fbc320b986642278f4e2df9d6ae09d81e601 SHA256 29cd5834f7adcb744575f1246ad4695df267cb8655acdd02bfba08189a63bb14
DIST cgnslib_2.5-4.tar.gz 398419 RMD160 1215e928bf5fe282637252661fd95e8a67dc89ed SHA1 d5f99f6df7409d923d8703fc3732b13bd1d89b20 SHA256 0485b32649f1e15de2e85a17f0cb2b5fe4d2522415eafe1f6c8cfa4820719964
-EBUILD cgnslib-2.5.4.ebuild 1151 RMD160 50135e7f2f7f8bf70ee881944aa43c4dcde372c9 SHA1 6ba06b1207024eac435a832d02a1784f555b8f53 SHA256 b07409f440e24e8353f931a16fcd07353261d87e7eceb93f58f4ddf7eb9e348a
-MISC ChangeLog 2176 RMD160 f745141ae592916e7df008b13604cf78a5d38d96 SHA1 3f7822e8198cb9115f1130f8d7096834f5f2ecbf SHA256 441283f6b92e762fe5779e5f6fc6d7c8f2ba6173d74a10b7b1dcb4381cf756ce
+EBUILD cgnslib-2.5.4.ebuild 1234 RMD160 3d7c6cc9fffb5a659956599be45882bd4cbc3964 SHA1 7eb9f33b3ce8d6dc8fb64d1aa175f861e097dc40 SHA256 6ba0fcd6dbe5accca6edb888ff1cd866b3127f0cb8fbfd4c7e5c52c3ace6dc9e
+MISC ChangeLog 2283 RMD160 b641e4027fd91189dd8ffd96c2e069a43814e2d7 SHA1 a0866e43988ffee40ef65bfdc04707f36840c8b0 SHA256 61be0ed262f94c6522eb93ce59890251d1ae829238469a8f6e538da7dfc523d1
MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk4AgtgACgkQgAnW8HDreRZexACeMz6DxwcBsFiW4fyPDEP18VpR
-+4wAoLK+/t3A+LYkmGVlwzaDCCvo2IEj
-=qLrb
+iEYEARECAAYFAk4Ef7QACgkQgAnW8HDreRbpswCfZfQcNDU02Km+o90mYu09aYtR
+WiMAoNEJRUBZe6wW2DPkZye014W6+wAM
+=PmAt
-----END PGP SIGNATURE-----
diff --git a/sci-libs/cgnslib/cgnslib-2.5.4.ebuild b/sci-libs/cgnslib/cgnslib-2.5.4.ebuild
index 1ce6e284a..ce5ae6792 100644
--- a/sci-libs/cgnslib/cgnslib-2.5.4.ebuild
+++ b/sci-libs/cgnslib/cgnslib-2.5.4.ebuild
@@ -19,9 +19,10 @@ KEYWORDS="~amd64 ~x86"
IUSE="fortran hdf5 szip zlib"
DEPEND="
+ fortran? ( virtual/fortran )
hdf5? ( >=sci-libs/hdf5-1.8 )
- zlib? ( sys-libs/zlib )
- szip? ( sci-libs/szip )"
+ szip? ( sci-libs/szip )
+ zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}"
S="${WORKDIR}"/${MY_S}
@@ -38,7 +39,7 @@ src_prepare() {
src_configure() {
local myconf="--enable-gcc --enable-lfs --enable-shared=all --enable-64bit"
- tc-export CC
+ tc-export CC FC
econf \
${myconf} \
@@ -50,5 +51,7 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install || die "install failed"
- use hdf5 && fperms 755 /usr/bin/{hdf2adf,adf2hdf}
+ use hdf5 && \
+ fperms 755 /usr/bin/{hdf2adf,adf2hdf} || \
+ rm -f "${D}"/usr/bin/{hdf2adf,adf2hdf}
}