Upate to fix linking failitures. Tiff is harddep so dont useflag it.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 24 insertions, 11 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/Manifest b/sci-libs/gdal/Manifest
index ac3f52f99e41..533c03f74386 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.7.2-ruby_cflags.patch 1161 RMD160 5635b016c18a54a45e4f9410028f0a4596b52e5b SHA1 42389f01f14ba57a6337a9a1cdbe889c9fc34d61 SHA256 8a943b69b200e8b926e2ed9ad1861a152731bb829459f402a8024e1137eed754
 AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
 AUX gdal-1.5.0-install_name.patch 1731 RMD160 9e6d9d2a8a14bf01de242d889140369d083fd7c4 SHA1 4c46ebb1bb7d5f5ca2f1079e6ad1a1230ef698ef SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd
@@ -16,6 +19,13 @@ DIST gdal-1.7.2.tar.gz 7755378 RMD160 a3f7950798448d8179f899dc095a83e23dcc269b S
 EBUILD gdal-1.6.1.ebuild 6207 RMD160 bc770f30e3fc7a2730593301493e5131887f96cf SHA1 fa00e68b0db2889ff4f41485577c73aea4c1902d SHA256 f42f23039752836249fbd420e7be8d1261b31dd8f62189a38e0e6cb030deff93
 EBUILD gdal-1.6.3-r1.ebuild 6953 RMD160 ebddd7e18664123f25311ab30c3a81ffbc8fbed0 SHA1 3e9f9ea851f0e1a818339249c1c7cc03f2f6ce41 SHA256 e0203d2a2e49adcb982c4cdc05520816af0e5ebd7a15edfb55275f4ec86e189f
 EBUILD gdal-1.7.1-r1.ebuild 7451 RMD160 52f641bb8f071b89cc735f10b88ec238ad3d3376 SHA1 3cdbf9facf1f1cb7aec01663741c8cb261fc5b2b SHA256 9fbda91f15606d33a0fcd2e421925b965800e78bcde3f15816965b2edb6202cd
-EBUILD gdal-1.7.2.ebuild 6035 RMD160 13f1fac86c92a228e1084d959ac6e804a73ba1fd SHA1 6056ccaec33e7729efa3f21b7edda861a1b6d609 SHA256 65593e0b53c36364d46a5212630530d6e956e399000c593395fa16346a9c6218
-MISC ChangeLog 17501 RMD160 7e50d4b745e4b6cc7ca6dad2fa4fd0b865a11dff SHA1 d7c2d9636753696f1977f049fa0bd589c2e0c0dd SHA256 9928de201de7686d803a6c33ee564409fd3acc575ee9a0c1e73683f7b3eb3b1a
+EBUILD gdal-1.7.2.ebuild 6040 RMD160 fd64eee2514930909070ae3f2f5073dac495e1c1 SHA1 3a7de3e30866eb24129bcd65dd5acee252f0b7f1 SHA256 a55672bfc4c66365b1be46bb12d563961b2e92cfc08dee5b536307d8d35871bd
+MISC ChangeLog 17647 RMD160 6d8c483095a07f0f9c81f0481c5d50872e855aca SHA1 9623280f90bf87ffba63882d779c1b2aeee91824 SHA256 d34961082e25a0c2eae0fb8acae189a03ce8e65fb34581ddc0a6e4093b978e71
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxUJo4ACgkQHB6c3gNBRYfj8wCghZrem8KSik36BtZmU8u/eCnU
+jBQAoJ5rDIGWCvQpBBxjPbtE7kFaIYDU
+=tSQW
+-----END PGP SIGNATURE-----
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) \