diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2010-09-25 20:22:54 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2010-09-25 20:22:54 +0000 |
| commit | ce907abbf810a36d0b90fe69eba80e69c7710b06 (patch) | |
| tree | e39f1b35c689304507f3e5599871e526bfe90c10 /sci-astronomy/cpl | |
| parent | Version bump, including kchart and kformula in koffice-libs (diff) | |
| download | historical-ce907abbf810a36d0b90fe69eba80e69c7710b06.tar.gz historical-ce907abbf810a36d0b90fe69eba80e69c7710b06.tar.bz2 historical-ce907abbf810a36d0b90fe69eba80e69c7710b06.zip | |
Fixed configure script when cfitsio is not built with static-libs
Package-Manager: portage-2.2_rc86/cvs/Linux x86_64
Diffstat (limited to 'sci-astronomy/cpl')
| -rw-r--r-- | sci-astronomy/cpl/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-astronomy/cpl/Manifest | 14 | ||||
| -rw-r--r-- | sci-astronomy/cpl/cpl-5.2.0-r1.ebuild | 6 |
3 files changed, 20 insertions, 5 deletions
diff --git a/sci-astronomy/cpl/ChangeLog b/sci-astronomy/cpl/ChangeLog index db1abbdb7a83..80a3a135dd67 100644 --- a/sci-astronomy/cpl/ChangeLog +++ b/sci-astronomy/cpl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-astronomy/cpl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.2 2010/09/06 10:56:26 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.3 2010/09/25 20:22:54 bicatali Exp $ + + 25 Sep 2010; Sébastien Fabbro <bicatali@gentoo.org> cpl-5.2.0-r1.ebuild: + Fixed configure script when cfitsio is not built with static-libs *cpl-5.2.0-r1 (06 Sep 2010) diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest index 85b7d3a158c2..8fcfcf2a90f8 100644 --- a/sci-astronomy/cpl/Manifest +++ b/sci-astronomy/cpl/Manifest @@ -1,4 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST cpl-5.2.0.tar.gz 1834948 RMD160 6286ed3243c41ac6ce995d97fe8b71f5ecda3cac SHA1 f7ad702230f91364c4b2512dbf0268c98735cc0d SHA256 617083b81d4029f2fb70710ab772ae0a1ed531806a8881c62dce7c522a62b6a0 -EBUILD cpl-5.2.0-r1.ebuild 1289 RMD160 f7032391035b71576906b7f3a01ea2f5180d4989 SHA1 69b1b1783102d92973e554272d0995d6d0fea29b SHA256 d183ba104674df14d84542b594773ca516cdbd29b723ff66c280902674678727 -MISC ChangeLog 1300 RMD160 dee4353d3a1124aee0d0de7f4dee9e3803051591 SHA1 55374dfc968a813d96a155b9aa24136c5e1b2f97 SHA256 1b0abf83020d38f53e70b7c8773103c29b8f7b199dc1bbff4cff5f17bc7a73e3 +EBUILD cpl-5.2.0-r1.ebuild 1396 RMD160 5a5f956f0a11fa344f7a7fda5a5b8abb3342ef15 SHA1 aabbd70a39a7571a19aad62d7e3ec68771e77cb7 SHA256 6f64ba16e5cd075d9076791352f3f1f3f4796d896548c908a8c2e8e9d4fd5316 +MISC ChangeLog 1443 RMD160 42684c15f47fc65949d85db05ccc9bd074cb4800 SHA1 dc05432fd14387ed1f0d1f34da0403a5a2e0fc2e SHA256 cfc4e909f24ca95c7008730c4a8c3890786e76e843f131d603506124fb092e0d MISC metadata.xml 969 RMD160 aa9f571697fc79e00a30108e266cc9256d71919f SHA1 b1b537b27754cf667b54ecaaa329e8e79282bf42 SHA256 0f9a401edae77796c82ba48c3b019e9198d7f308b3e78befbe5109112e3f881d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkyeWicACgkQ1ycZbhPLE2AaHwCfa0Z/L3TlQ8ntoP8eL6PD1+4t +pJgAniQmMvSFpewdDuu4jsakRW2VZ4pY +=5xc+ +-----END PGP SIGNATURE----- diff --git a/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild b/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild index 12205c4c6709..4a13d5424d59 100644 --- a/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild +++ b/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild,v 1.1 2010/09/06 10:56:26 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-5.2.0-r1.ebuild,v 1.2 2010/09/25 20:22:54 bicatali Exp $ EAPI=2 JAVA_PKG_OPT_USE=gasgano -inherit java-pkg-opt-2 +inherit eutils java-pkg-opt-2 DESCRIPTION="ESO common pipeline library for astronomical data reduction" HOMEPAGE="http://www.eso.org/sci/data-processing/software/cpl/" @@ -26,6 +26,8 @@ DEPEND="${RDEPEND} gasgano? ( >=virtual/jdk-1.5 )" src_configure() { + has_version sci-libs/cfitsio[static-libs] || \ + sed -i -e 's/libcfitsio.a/libcfitsio.so/' configure local myconf="--without-gasgano" use gasgano && \ myconf="--with-gasgano=/usr |