Gentoo Logo

About | Projects | Docs | Forums | Lists | Bugs | Get Gentoo! | Support | Planet | Wiki

Gentoo Spaceship
Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Steve Arnold (nerdboy)" <nerdboy@g.o>
Subject: gentoo-x86 commit in sci-libs/gdal: gdal-1.5.2.ebuild ChangeLog gdal-1.5.3.ebuild
Date: Wed, 18 Feb 2009 04:03:47 +0000 
nerdboy     09/02/18 04:03:47

  Modified:             gdal-1.5.2.ebuild ChangeLog gdal-1.5.3.ebuild
  Log:
  updated pkg_setup logic to more explicitly handle hdf4 vs. netcdf
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  sci-libs/gdal/gdal-1.5.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild?r1=1.6&r2=1.7

Index: gdal-1.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdal-1.5.2.ebuild	25 Dec 2008 13:40:29 -0000	1.6
+++ gdal-1.5.2.ebuild	18 Feb 2009 04:03:47 -0000	1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.6 2008/12/25 13:40:29 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.7 2009/02/18 04:03:47 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -58,6 +58,23 @@
 	    elog "User-specified configure options are not set."
 	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
 	fi
+
+	if useq hdf; then
+	    einfo	"Checking if HDF4 is compiled with szip..."
+	    if built_with_use sci-libs/hdf szip ; then
+		einfo	"Found HDF4 compiled with szip. Nice."
+	    else
+		ewarn 	"HDF4 (sci-libs/hdf) must be compiled with the szip USE flag!"
+		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
+		die 	"HDF4 not merged with szip use flag"
+	    fi
+
+	    if 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
+	fi
 }
 
 src_unpack() {
@@ -72,17 +89,6 @@
 	    "${FILESDIR}"/${PN}-1.5.0-makefile.patch \
 	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
 	    "${FILESDIR}"/${P}-xerces-64-bit.patch
-
-	if useq netcdf && useq hdf; then
-	    einfo	"Checking if HDF4 is compiled with szip..."
-	    if built_with_use sci-libs/hdf szip ; then
-		einfo	"Found HDF4 compiled with szip. Nice."
-	    else
-		ewarn 	"HDF4 (sci-libs/hdf) must be compiled with the szip USE flag!"
-		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
-		die 	"HDF4 not merged with szip use flag"
-	    fi
-	fi
 }
 
 src_compile() {



1.54                 sci-libs/gdal/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.53&r2=1.54

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog	25 Dec 2008 13:40:29 -0000	1.53
+++ ChangeLog	18 Feb 2009 04:03:47 -0000	1.54
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.53 2008/12/25 13:40:29 bluebird Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.54 2009/02/18 04:03:47 nerdboy Exp $
+
+  18 Feb 2009; Steve Arnold <nerdboy@g.o> gdal-1.5.3.ebuild,
+  gdal-1.5.2.ebuild:
+  Updated pkg_setup logic to more explicitly handle hdf4 vs. netcdf;
+  should fix bugs #256423 and #238999.
 
   25 Dec 2008; Friedrich Oslage <bluebird@g.o> gdal-1.5.2.ebuild:
   Stable on sparc, bug #241500



1.3                  sci-libs/gdal/gdal-1.5.3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild?r1=1.2&r2=1.3

Index: gdal-1.5.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdal-1.5.3.ebuild	10 Nov 2008 23:30:30 -0000	1.2
+++ gdal-1.5.3.ebuild	18 Feb 2009 04:03:47 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild,v 1.2 2008/11/10 23:30:30 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild,v 1.3 2009/02/18 04:03:47 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -62,6 +62,23 @@
 	    elog "User-specified configure options are not set."
 	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
 	fi
+
+	if useq hdf; then
+	    einfo	"Checking if HDF4 is compiled with szip..."
+	    if built_with_use sci-libs/hdf szip ; then
+		einfo	"Found HDF4 compiled with szip. Nice."
+	    else
+		ewarn 	"HDF4 (sci-libs/hdf) must be compiled with the szip USE flag!"
+		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
+		die 	"HDF4 not merged with szip use flag"
+	    fi
+
+	    if 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
+	fi
 }
 
 src_unpack() {
@@ -76,17 +93,6 @@
 	    "${FILESDIR}"/${PN}-1.5.0-makefile.patch \
 	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
 	    "${FILESDIR}"/${PN}-1.5.2-xerces-64-bit.patch
-
-	if useq netcdf && useq hdf; then
-	    einfo	"Checking if HDF4 is compiled with szip..."
-	    if built_with_use sci-libs/hdf szip ; then
-		einfo	"Found HDF4 compiled with szip. Nice."
-	    else
-		ewarn 	"HDF4 (sci-libs/hdf) must be compiled with the szip USE flag!"
-		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
-		die 	"HDF4 not merged with szip use flag"
-	    fi
-	fi
 }
 
 src_compile() {
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in sys-devel/kgcc64: ChangeLog kgcc64-4.3.3.ebuild
Next by thread:
gentoo-x86 commit in games-mud/tintin: tintin-1.98.8.ebuild tintin-1.98.9.ebuild Manifest
Previous by date:
gentoo-x86 commit in sys-devel/kgcc64: ChangeLog kgcc64-4.3.3.ebuild
Next by date:
gentoo-x86 commit in games-mud/tintin: tintin-1.98.8.ebuild tintin-1.98.9.ebuild Manifest


Updated Jan 26, 2011

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.