Updated to new xerces-c interface, along with minor metadata update.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26.5 x86_64

4 files changed, 16 insertions, 9 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 3019801673e1..7d6e8d070d3f 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,12 @@
 # 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.49 2008/11/09 01:42:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.50 2008/11/10 23:30:30 nerdboy Exp $
+
+  10 Nov 2008; Steve Arnold <nerdboy@gentoo.org> metadata.xml,
+  gdal-1.5.3.ebuild:
+  Updated to new xerces-c interface, along with minor metadata update. Note
+  this version enables parallel makes, so if you experience random failures
+  try with -j1 and report if this fixes it.
 
   09 Nov 2008; Steve Arnold <nerdboy@gentoo.org>
   +files/gdal-1.5.2-xerces-64-bit.patch, gdal-1.5.2.ebuild:
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 1f9b20e758f9..4fd4f5346efb 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -24,6 +24,6 @@ EBUILD gdal-1.4.2.ebuild 4660 RMD160 437566fd4915ca05388e0fcd4c4ce6f63079b779 SH
 EBUILD gdal-1.5.0-r1.ebuild 6127 RMD160 3282266d87f529fc5f34874886547e0dc56528ff SHA1 ce429086a266ba00d04aa5f69a62cdd228aacf51 SHA256 c6458586043fbfd15de9b09640a6e12fa55a611dcbdf64a91922c297c3531df4
 EBUILD gdal-1.5.1.ebuild 6181 RMD160 fab38e35517ecb614fd06b25a01e6deb7f495cbd SHA1 cfb48b1ef59cb36f8d70e2d0638dfe553e641c7d SHA256 b5169d89b0f260cae069d41d36f5d69e700fcdf27b6172282458520b365f6acf
 EBUILD gdal-1.5.2.ebuild 6215 RMD160 8ed9fbc067bc5c6cc570e807f8050384346f3622 SHA1 8d6fedbefdfb3998023c535d286ebbb2f9204e33 SHA256 ad30ea56b6733e50a5d403b60c0f9a9142292eae8313abbc9804f91b60cee7ee
-EBUILD gdal-1.5.3.ebuild 6249 RMD160 47406c29487396bb8537e27e403a06b59b3a6ffe SHA1 00542405ae9b670877fa7a0376bca7d661391476 SHA256 95b31602f2d5c443b60a4f006263140a3425f3f8f64f6958ff095af70f603a31
-MISC ChangeLog 9855 RMD160 9a4966d8c16c9490b9c88fceec1a2c6319739176 SHA1 d45b8931f76a1b744f5b053f7ef5e36f255d7f21 SHA256 070d028d4d15b458ef7de1e951d48cc8a0565367f7c4f34bf7b4f8fedb39a360
-MISC metadata.xml 1095 RMD160 e9ab6c5ceb8ef386d4326eb312313103018e398a SHA1 3e8b74d446e173e748518326e5d0897a2e4e617c SHA256 df8f955ef191e8c794ca5ff540cb461365244623e373bca9c84783b92d473c07
+EBUILD gdal-1.5.3.ebuild 6296 RMD160 8a5bcc3e3b062d2785e44d8b844569d1e96acbb1 SHA1 d9c31669962aa88d99d3ff44f83edbb939f85eb4 SHA256 e9d10a5d9f718c985b6350eb2872a92d5aa5fe2ce3693a4c29951b7b77969284
+MISC ChangeLog 10136 RMD160 c935bef8d70d22f59e2f47312386242f54d9ee01 SHA1 06965f46634a4c6d28e8c3ae06298d8f1f0b38d9 SHA256 75316db464ac708f99ad2d675689640af589c4bab0bdc071d2a1033730ab9377
+MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/gdal-1.5.3.ebuild b/sci-libs/gdal/gdal-1.5.3.ebuild
index 26666f51b87d..66087deb7c52 100644
--- a/sci-libs/gdal/gdal-1.5.3.ebuild
+++ b/sci-libs/gdal/gdal-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1 2008/10/18 19:08:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild,v 1.2 2008/11/10 23:30:30 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -32,7 +32,7 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
 	fits? ( sci-libs/cfitsio )
 	ogdi? ( sci-libs/ogdi )
-	gml? ( =dev-libs/xerces-c-2.8* )
+	gml? ( >=dev-libs/xerces-c-3 )
 	hdf5? ( >=sci-libs/hdf5-1.6.4 )
 	postgres? ( virtual/postgresql-server )
 	|| (
@@ -74,7 +74,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
 	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
 	    "${FILESDIR}"/${PN}-1.5.0-makefile.patch \
-	    "${FILESDIR}"/${PN}-1.5.1-python-install.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..."
@@ -134,7 +135,7 @@ src_compile() {
 
 	# parallel makes fail on the ogr stuff (C++, what can I say?)
 	# also failing with gcc4 in libcsf
-	emake -j1 || die "emake failed"
+	emake || die "emake failed"
 
 	if useq python; then
 	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml
index fc4675c70207..89af4b719e33 100644
--- a/sci-libs/gdal/metadata.xml
+++ b/sci-libs/gdal/metadata.xml
@@ -17,7 +17,7 @@
   <flag name='geos'>Add support for geometry engine (<pkg>sci-libs/geos</pkg>
     </flag>
   <flag name='gml'>Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag>
-  <flag name='hdf'>Add support for the Hierarchical Data Format
+  <flag name='hdf'>Add support for the Hierarchical Data Format v. 4
     (<pkg>sci-libs/hdf</pkg>)</flag>
   <flag name='ogdi'>Enable support for the open geographic datastore interface
     (<pkg>sci-libs/ogdi</pkg>)</flag>