summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2010-09-25 20:22:54 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2010-09-25 20:22:54 +0000
commitfb13373b6c676950918ee8ec85be711127c607cb (patch)
tree5b0eb7306b56952d7e3b43e9371596014c7772d7 /sci-astronomy/cpl
parentVersion bump, including kchart and kformula in koffice-libs (diff)
downloadgentoo-2-fb13373b6c676950918ee8ec85be711127c607cb.tar.gz
gentoo-2-fb13373b6c676950918ee8ec85be711127c607cb.tar.bz2
gentoo-2-fb13373b6c676950918ee8ec85be711127c607cb.zip
Fixed configure script when cfitsio is not built with static-libs
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'sci-astronomy/cpl')
-rw-r--r--sci-astronomy/cpl/ChangeLog5
-rw-r--r--sci-astronomy/cpl/cpl-5.2.0-r1.ebuild6
2 files changed, 8 insertions, 3 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/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