summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-libs/cfitsio/ChangeLog5
-rw-r--r--sci-libs/cfitsio/Manifest10
-rw-r--r--sci-libs/cfitsio/cfitsio-3.140.ebuild12
3 files changed, 12 insertions, 15 deletions
diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index f87896c82ddf..97de655bfff7 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/cfitsio
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.31 2009/08/26 06:18:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.32 2009/09/09 06:09:45 bicatali Exp $
+
+ 09 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> cfitsio-3.140.ebuild:
+ Added cfortran.h link to use properly system one
26 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
files/cfitsio-3.140-autotools.patch:
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 129478f1ec54..e6e3ee8588ae 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -13,13 +13,13 @@ DIST cfitsio3140.tar.gz 2903379 RMD160 df80966f6b0ae7a435828bdfe4ef33ae708aecf5
EBUILD cfitsio-2.510-r1.ebuild 1287 RMD160 72708a9c3e3c5d08d2a1f23351f4053550c8a1de SHA1 9df770665d76e579befcb47c93773cc9eb359195 SHA256 64ace0ce49863a1a0fbe8d7849a011bae1c0e0d6ac5cda37c83950ca092d1e3c
EBUILD cfitsio-2.510-r2.ebuild 1538 RMD160 06f3500a3f090c8dc567dd3b0e454a64a8e8b59f SHA1 b69ee19d46eccdc8d322b6ecd436cc637398f2ec SHA256 ba347f06c3a24ab67034bf02a975f7291d97aa3bafb35217c7d56840cdda7a51
EBUILD cfitsio-3.100-r1.ebuild 1580 RMD160 63f78c9151248f1a562f56cbea7ed8b62d03a731 SHA1 f42556efc30a864cbc8c943f8a77eae0dab92d0b SHA256 eaad3e85511bcc3e179df097d471adf11e988d361da8de30951a70fe3db8a435
-EBUILD cfitsio-3.140.ebuild 1540 RMD160 f36e3d8ba5e8156b0fd5c03f7ff5ad684a441eae SHA1 ba6997136bfcd601089c530a59fe993b407b20e8 SHA256 238165b71586456eb0851c7085f5d5fca4724b4f52fe3079eccd20e597f78386
-MISC ChangeLog 6752 RMD160 daf96fc7b11972c8fc6ae11a58d035fa54876de4 SHA1 f41e4e9c34832f06c64b9e0079664d999aa6eaf5 SHA256 00dacb0a2fa4f85a7c7b2ffa39a0b393353dcda8568d46d0abab8651f2500787
+EBUILD cfitsio-3.140.ebuild 1474 RMD160 becfebd5ac119555eb75ad1e26dc9fd867595a5a SHA1 5abb1614c4e0576283d7ccf4093f829a79a6f993 SHA256 b82a98e9bfd05f70853176bfcadb63386dec13f21cfd697a9571c93eb7ddb201
+MISC ChangeLog 6881 RMD160 3c893bc61629fbf3544d3b9d9f62d00399fcaa3d SHA1 298fcb311f8e95aac988e43fb43c6fbbc00b28bb SHA256 5b060f8118ec391c7365b2977e1a8f6f1c91f78d9bdb832cb7e5351a184211aa
MISC metadata.xml 677 RMD160 3a527306bc0d3ee04c9aa7a89ae9669300449f25 SHA1 332827a79018490259a4fda69a9b508862612941 SHA256 20ff9f82126be9cb9b5a8c21e1bf2556e8ae91e32442b59f26f938ccc1f42b91
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkqU07kACgkQ1ycZbhPLE2B6IACeJKDww1zN5au43u/4C8bRgDFa
-ErIAniMnEqtwiNvbs+s/JiuIPDI2r6jQ
-=ihWR
+iEYEARECAAYFAkqnRrIACgkQ1ycZbhPLE2BVDgCfdWw8paGPlwg5AAhqpnVwAEf1
+dNkAn3RwmkANjtqqEPrUrYjGOtGp1Aij
+=Qnbi
-----END PGP SIGNATURE-----
diff --git a/sci-libs/cfitsio/cfitsio-3.140.ebuild b/sci-libs/cfitsio/cfitsio-3.140.ebuild
index 29ed62b1dcf5..68f82e2f978e 100644
--- a/sci-libs/cfitsio/cfitsio-3.140.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.140.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.140.ebuild,v 1.1 2009/03/19 22:43:53 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.140.ebuild,v 1.2 2009/09/09 06:09:45 bicatali Exp $
EAPI=2
-inherit eutils fortran autotools
+inherit eutils autotools
DESCRIPTION="C and Fortran library for manipulating FITS files"
HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
@@ -19,13 +19,6 @@ RDEPEND=""
S="${WORKDIR}/${PN}"
-pkg_setup() {
- if use fortran; then
- FORTRAN="gfortran g77 ifc"
- fortran_pkg_setup
- fi
-}
-
src_prepare() {
# avoid internal cfortran
if use fortran; then
@@ -33,6 +26,7 @@ src_prepare() {
-e 's:"cfortran.h":<cfortran.h>:' \
f77_wrap.h || die "sed fortran failed"
mv cfortran.h cfortran.h.disabled
+ ln -s /usr/include/cfortran.h .
fi
epatch "${FILESDIR}"/${P}-autotools.patch
epatch "${FILESDIR}"/${P}-missing-include.patch