summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-06-28 10:43:39 +0000
committerFabian Groffen <grobian@gentoo.org>2011-06-28 10:43:39 +0000
commit34537ea50d34571fa05adca08154dd7f954aba15 (patch)
treebf5c5d3eae25306440eabf18131a774a450e7cef /sci-libs/cfitsio
parentRemove old versions. (diff)
downloadhistorical-34537ea50d34571fa05adca08154dd7f954aba15.tar.gz
historical-34537ea50d34571fa05adca08154dd7f954aba15.tar.bz2
historical-34537ea50d34571fa05adca08154dd7f954aba15.zip
Fix linking against zlib (don't force zlib from host system) in Prefix
Package-Manager: portage-2.2.01.18252-prefix/cvs/SunOS i386
Diffstat (limited to 'sci-libs/cfitsio')
-rw-r--r--sci-libs/cfitsio/ChangeLog5
-rw-r--r--sci-libs/cfitsio/Manifest10
-rw-r--r--sci-libs/cfitsio/cfitsio-3.270.ebuild5
3 files changed, 13 insertions, 7 deletions
diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index 1c84102dedd8..c1a29d8bda1f 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/cfitsio
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.49 2011/05/03 09:38:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.50 2011/06/28 10:43:39 grobian Exp $
+
+ 28 Jun 2011; Fabian Groffen <grobian@gentoo.org> cfitsio-3.270.ebuild:
+ Fix linking against zlib (don't force zlib from host system) in Prefix
03 May 2011; Fabian Groffen <grobian@gentoo.org> cfitsio-3.250-r1.ebuild,
cfitsio-3.270.ebuild:
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 94f4b2e3b2ed..e2a4fc4bc838 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -8,13 +8,13 @@ DIST cfitsio-3.270.tar.gz 3139349 RMD160 b506c699845e5cd4eaabb41745490499f234e70
DIST cfitsio3140.tar.gz 2903379 RMD160 df80966f6b0ae7a435828bdfe4ef33ae708aecf5 SHA1 54c10c83e1edc9901229169b3aba337677e468a7 SHA256 d45e253d513d8df331a0294d243460773c57f9045878c8b79efbc7427c873d96
EBUILD cfitsio-3.140.ebuild 1466 RMD160 9e4105541fce82519486847c10dc2334c799ab86 SHA1 a39fa6ad85bab2f4b50081ed65d1138dbf1da2ac SHA256 ebadb23dca7e5c8c892b84d743137b1778091b0fb4e8f4efef68b93d887e043a
EBUILD cfitsio-3.250-r1.ebuild 1372 RMD160 679115ccda4d65292e90b6aba88d39a88677983e SHA1 3520b2e9463dea6b2c3f9e05ac2188102bec4290 SHA256 69ecae44de0511bcfa493616a87573df5e135ad7c19b532dc803b1079d2b019c
-EBUILD cfitsio-3.270.ebuild 1388 RMD160 0fc3475be6bb0c3ba2f9f81b12cdfec1407233c7 SHA1 476d05c24d0a5cf07c4df54123421c36c1ab8d10 SHA256 a0a8708012031ad7a9249a3979198ce410dd2f107078584a3f361b619a7d47b7
-MISC ChangeLog 9742 RMD160 838e2dbcf284a25674222fde861993ebef089c65 SHA1 c2e5ca950afb55397958d961d36c7077076ba03b SHA256 408be5981c4a57e15358a9a93a37ea0dda33ea9f89d3fd7f256bd5419873aecf
+EBUILD cfitsio-3.270.ebuild 1512 RMD160 56d123316fd102e5c697406c75cafcad633bb035 SHA1 582aaabf162f9c6d46882875c3d705f5cbdd9b82 SHA256 1b33c869f60a3d1bdcaae3704fe1782e335527291b9ced67dda2a52cab2918fa
+MISC ChangeLog 9889 RMD160 1d88aaaef1170a1fc76bf71d47f865782833daed SHA1 4295aa037288e8781ce303486b285403e8eda86b SHA256 2dc989369f81e2ac1d265e239672ce6cd698c96bb45ec6a2c9c992f1a879a457
MISC metadata.xml 677 RMD160 3a527306bc0d3ee04c9aa7a89ae9669300449f25 SHA1 332827a79018490259a4fda69a9b508862612941 SHA256 20ff9f82126be9cb9b5a8c21e1bf2556e8ae91e32442b59f26f938ccc1f42b91
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (SunOS)
-iEYEARECAAYFAk2/zSwACgkQX3X2B8XHTomMcwCfYHN2E+BYTVjSsFXliFszHOx5
-BtAAnRp/Ql+fMZapiigtmgL+sX4zC3bU
-=23E7
+iEYEARECAAYFAk4JsGEACgkQX3X2B8XHTok9sACgnnXbfYvgX76X7AIIgcEQ97QO
+NdYAnj6opZB7ICS/U1DU3DSBN8r6zzDQ
+=2pPh
-----END PGP SIGNATURE-----
diff --git a/sci-libs/cfitsio/cfitsio-3.270.ebuild b/sci-libs/cfitsio/cfitsio-3.270.ebuild
index 236d4b83ceb3..a5e8ce31edbc 100644
--- a/sci-libs/cfitsio/cfitsio-3.270.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.270.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.270.ebuild,v 1.3 2011/05/03 09:38:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.270.ebuild,v 1.4 2011/06/28 10:43:39 grobian Exp $
EAPI=3
inherit autotools-utils
@@ -25,12 +25,15 @@ src_prepare() {
ln -s "${EPREFIX}"/usr/include/cfortran.h .
fi
autotools-utils_src_prepare
+ # fix stupdity in zlib check macro
+ sed -i -e '/^ZLIB_HOME=\/usr\/local/d' configure || die
}
src_configure() {
myeconfargs=(
$(use_enable threads)
$(use_enable fortran)
+ "--with-zlib=${EPREFIX}/usr"
)
autotools-utils_src_configure
}