summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-07-31 13:35:36 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-07-31 13:35:36 +0000
commit50f21a5a7e84d7bac981246ed4f211a6268af4ef (patch)
treef22fc65512b59a5a128bcff31131629522ecff3e /sci-libs/gdal
parentamd64 stable, bug 327803 (diff)
downloadgentoo-2-50f21a5a7e84d7bac981246ed4f211a6268af4ef.tar.gz
gentoo-2-50f21a5a7e84d7bac981246ed4f211a6268af4ef.tar.bz2
gentoo-2-50f21a5a7e84d7bac981246ed4f211a6268af4ef.zip
Upate to fix linking failitures. Tiff is harddep so dont useflag it.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/gdal')
-rw-r--r--sci-libs/gdal/ChangeLog5
-rw-r--r--sci-libs/gdal/gdal-1.7.2.ebuild16
2 files changed, 12 insertions, 9 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 22ca7d6af780..51c018459eb1 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/gdal
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.92 2010/07/30 12:27:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.93 2010/07/31 13:35:36 scarabeus Exp $
+
+ 31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild:
+ Upate to fix linking failitures. Tiff is harddep so dont useflag it.
*gdal-1.7.2 (30 Jul 2010)
diff --git a/sci-libs/gdal/gdal-1.7.2.ebuild b/sci-libs/gdal/gdal-1.7.2.ebuild
index 6cabc80bf1c9..72ee4821aa95 100644
--- a/sci-libs/gdal/gdal-1.7.2.ebuild
+++ b/sci-libs/gdal/gdal-1.7.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.1 2010/07/30 12:27:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.2 2010/07/31 13:35:36 scarabeus Exp $
EAPI="3"
@@ -18,10 +18,12 @@ SLOT="0"
LICENSE="MIT"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-linux ~x86-macos"
-IUSE="curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pam perl png postgres python ruby sqlite tiff threads"
+IUSE="curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pam perl png postgres python ruby sqlite threads"
RDEPEND="
dev-libs/expat
+ >=media-libs/tiff-4.0.0_beta6
+ sci-libs/libgeotiff
sys-libs/zlib
curl? ( net-misc/curl )
ecwj2k? ( sci-libs/libecwj2 )
@@ -48,10 +50,6 @@ RDEPEND="
python? ( dev-python/numpy )
ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
sqlite? ( >=dev-db/sqlite-3 )
- tiff? (
- >=media-libs/tiff-4.0.0_beta6
- sci-libs/libgeotiff
- )
"
DEPEND="${RDEPEND}
@@ -96,6 +94,7 @@ src_configure() {
# bsb - legal issues
# oracle - disabled, i dont have and can't test
# ingres - same story as oracle oci
+ # tiff is a hard dep
econf \
--enable-shared \
--disable-static \
@@ -117,10 +116,13 @@ src_configure() {
--without-epsilon \
--without-idb \
--without-sde \
+ --without-libtool \
--with-libz="${EPREFIX}/usr/" \
--with-ogr \
--with-grib \
--with-vfk \
+ --with-libtiff \
+ --with-geotiff \
$(use_enable debug) \
$(use_with postgres pg) \
$(use_with fits cfitsio) \
@@ -128,8 +130,6 @@ src_configure() {
$(use_with png) \
$(use_with jpeg) \
$(use_with jpeg pcidsk) \
- $(use_with tiff libtiff) \
- $(use_with tiff geotiff) \
$(use_with gif) \
$(use_with ogdi ogdi "${EPREFIX}"/usr) \
$(use_with hdf5) \