Updated hdf4 and netcdf handling per request (see bug 315659).

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

3 files changed, 21 insertions, 24 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 9cdf90c0094f..0d7838346181 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.80 2010/04/30 08:18:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.81 2010/05/17 03:34:26 nerdboy Exp $
+
+  17 May 2010; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.3-r1.ebuild:
+  Updated hdf4 and netcdf handling per request (see bug 315659).
 
   30 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.1-r1.ebuild:
   Fix linking. Per bug #314047.
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e4cfbfb9e3b6..645594474892 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 AUX gdal-1.5.0-makefile.patch 894 RMD160 955b2ac69f6d8477cc26ae1321ddc0d92e88fb90 SHA1 02ee0ac5351c2c83a848f7f9db646dcc19937123 SHA256 cd40c5f77c9f5d2a78a880a83d09656eacfe3437e8be7bfb13559a5e3fd9ee58
@@ -23,15 +20,8 @@ EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SH
 EBUILD gdal-1.6.0-r1.ebuild 6653 RMD160 271dc8fb8ac3b8941a008f5459fe5c9264060f51 SHA1 5f5d5179d95a9c69e888641276d5202f0061782c SHA256 ca12c8f828064b7a6a5340a97a495799d767df095a3fbe9db39e4e656ebf2142
 EBUILD gdal-1.6.1.ebuild 6261 RMD160 6b4d7360e237785bfcefa449ea9d25d14c2787cf SHA1 fb1333c67f56a6f5a12c549ed18bdc502d3cd9f0 SHA256 5b9e0280223437d8dbcfc3fba4a40e74635d59e329fc579717393972a15f66a3
 EBUILD gdal-1.6.2.ebuild 6258 RMD160 5a856ad8e38455c0a7acca0806f402b29720f5d1 SHA1 a749df11026604e81d3061f3be0e19e39895d4a0 SHA256 2e51a26f67ae3e1ace3911b3461586e5a95fd0b7f442b514d89ffa6619cd5aab
-EBUILD gdal-1.6.3-r1.ebuild 6634 RMD160 38c0b0bae945da9e94e31623465e0ef8ae31f1ab SHA1 110acc5f90605b040a999218ed05cb5f8485ba8d SHA256 e43b7a42c8e640c098033bd09411a01327c9649bebd4ab570aa296cb9255ab6d
+EBUILD gdal-1.6.3-r1.ebuild 6725 RMD160 ce11e35cbeb5e36195a1052dab2030250aeb7883 SHA1 355d3b08782245062e5b8cf086872bd8bc2a67ac SHA256 2bc9c59c630b5dcf76d1ea45b6a22347fc1951d675d4a44a1ad51b69a1993a25
 EBUILD gdal-1.6.3.ebuild 6422 RMD160 cf47cde7626034a9b12f5edda669bb49b2640ca0 SHA1 e311209140f40a9ab70df9783c44fcd998045c55 SHA256 1a02068a8c9ba47f2bed2c17a2db4e846a599ae176ee34d8dc14535a9e1b519c
 EBUILD gdal-1.7.1-r1.ebuild 7472 RMD160 ef6655194778128f0515f91534f14cd1fd46d0d5 SHA1 83e2642ddb277ce40011a7dc1546c6785f27369a SHA256 3e97be63ae2447534f86fdcb2676c9ee5c5b801e4a0b69f0bd0c6797f2e49c95
-MISC ChangeLog 15683 RMD160 9e78232184c134d2962a5342bb7eccd894c53d6d SHA1 064845b6a481f596a96091f8cb75e0cec2eaedca SHA256 eb25a3037f7f7e6b6b2de075f2c79c197e21d21e5e5a7dda525249b7efa83f2d
+MISC ChangeLog 15818 RMD160 51dc56dcdcfc08b5629e43c17f5dbbb58d0f57a6 SHA1 3a5625aeee171ade0a617f2908ac0fbc89735419 SHA256 fc548c3d916557266a144491294bd6d58d2f9b7295e28c82478138c754933964
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvakmAACgkQHB6c3gNBRYfUSgCaAsqN5v4YkBuD4xHmJLZIuyZt
-BS4An1YNqiSHZgk5g/WViqXaQaaBcO5T
-=y/4B
------END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.6.3-r1.ebuild b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
index def48ab72a3b..036a97ec01b5 100644
--- a/sci-libs/gdal/gdal-1.6.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.3-r1.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.6.3-r1.ebuild,v 1.4 2010/04/17 18:10:47 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.5 2010/05/17 03:34:26 nerdboy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.5"
@@ -83,12 +83,6 @@ src_prepare() {
 	[[ ${CHOST} == *-darwin* ]] \
 		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
 		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
-	if useq hdf && useq netcdf; then
-		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
-		ewarn "common; HDF5 is now the preferred choice for HDF data."
-		die "Please disable either the hdf or netcdf use flag."
-	fi
 }
 
 src_configure() {
@@ -99,13 +93,23 @@ src_configure() {
 	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
 		--with-libgrass=no --without-libtool --with-expat=${EPREFIX}/usr"
 
+	if useq hdf && useq netcdf; then
+		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
+		ewarn "common; HDF5 is now the preferred choice for HDF data."
+		ewarn "Disabling hdf4 in favor of NetCDF..."
+		use_conf="--with-netcdf --with-hdf4=no"
+	elif useq hdf && ! useq netcdf; then
+		use_conf="--with-netcdf=no --with-hdf4"
+	else
+		$(use_with netcdf)
+	fi
+
 	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
+	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
 	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
 	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
-	    $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \
-	    $(use_with sqlite sqlite3 ="${EPREFIX}"/usr) $(use_with jpeg2k jasper) $(use_with odbc) \
-	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
-	    $(use_enable debug)"
+	    $(use_with sqlite sqlite3 ="${EPREFIX}"/usr) $(use_with geos) \
+	    $(use_with jpeg2k jasper) $(use_with odbc) $(use_enable debug)"
 
 	# It can't find this
 	if useq ogdi ; then