[gentoo-commits] gentoo-x86 commit in sci-libs/gdal: ChangeLog gdal-1.6.3-r1.ebuild

["Steve Arnold (nerdboy)" <nerdboy@gentoo.org>]

nerdboy     10/05/17 03:34:26

  Modified:             ChangeLog gdal-1.6.3-r1.ebuild
  Log:
  Updated hdf4 and netcdf handling per request (see bug 315659).
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.81                 sci-libs/gdal/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.80&r2=1.81

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog	30 Apr 2010 08:18:41 -0000	1.80
+++ ChangeLog	17 May 2010 03:34:26 -0000	1.81
@@ -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.



1.5                  sci-libs/gdal/gdal-1.6.3-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild?r1=1.4&r2=1.5

Index: gdal-1.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdal-1.6.3-r1.ebuild	17 Apr 2010 18:10:47 -0000	1.4
+++ gdal-1.6.3-r1.ebuild	17 May 2010 03:34:26 -0000	1.5
@@ -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 @@
 	[[ ${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 @@
 	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