updated 1.5.2 for newer xerces-c interface prior to stablization

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

4 files changed, 66 insertions, 7 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 2c2e5eafb8ea..3019801673e1 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -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.48 2008/10/18 19:08:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.49 2008/11/09 01:42:16 nerdboy Exp $
+
+  09 Nov 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/gdal-1.5.2-xerces-64-bit.patch, gdal-1.5.2.ebuild:
+  Updated 1.5.2 for newer xerces-c interface prior to stablization
+  (a patched 1.5.3 will follow shortly).
 
 *gdal-1.5.3 (18 Oct 2008)
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 1600be9fb71e..1f9b20e758f9 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -9,6 +9,7 @@ AUX gdal-1.5.0-python-install.patch 481 RMD160 c618ad3238f6ed91740d148a87a068d00
 AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4 SHA1 8a98cc52bb1d74a1d45f72f8191cf322ee050682 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7
 AUX gdal-1.5.1-max-min.patch 4292 RMD160 299c1ff45e3586986d5177ced76c29f9c3f94b3a SHA1 b355c50408351af34ce51f3232bb3e577d7ce513 SHA256 b3238774b3bde6b7cfa289084313eea5b82e71f3ea08c68f9c70ed7af465a3df
 AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593
+AUX gdal-1.5.2-xerces-64-bit.patch 2002 RMD160 3e8386a5d4127881a299344c36f18e9848cafea7 SHA1 62b30b6a4e55dd46f1e985d445b6ace58d698f4f SHA256 419c2c4713ae72a617cbdb5433a69a7217bc99743e34e94430bbca8119b5c1cf
 AUX gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 SHA1 9cbba5ebf35e2ca90386e4ddcd53c47a748f4597 SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae
 DIST gdal-1.3.1.tar.gz 6856011 RMD160 5967608e6e1c9f0af8698fcffb58eab4dcdd518d SHA1 2783c4c0d2a83a34f4c5c6a8efe41e816ba396fb SHA256 4f8f3c462f9174e1dd99f7bfa2abe010aa129e04c08a242a3c63c1a9e5078753
 DIST gdal-1.3.2.tar.gz 7279872 RMD160 98c7f33bc3a57364e9ca15bf61d11d45f147b8ad SHA1 eda247dd96558ff79f843fb7b4393bf62cb01644 SHA256 00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
@@ -22,7 +23,7 @@ EBUILD gdal-1.3.2.ebuild 4789 RMD160 88e7bcf13b6b130b821a211cc3e121716546556e SH
 EBUILD gdal-1.4.2.ebuild 4660 RMD160 437566fd4915ca05388e0fcd4c4ce6f63079b779 SHA1 a74e39f5ce6946b623ea74a5a28b0133a1b071a8 SHA256 d021e6cc88f1b6a98c3422bfb43f463563c024d77666277a424a518901d07be1
 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 6170 RMD160 6b8699a23fa97e118dc940e4ffc114bc6dc6d1c1 SHA1 7173aef183be07952504a1d8316d844e6daa3a5b SHA256 7cb0a27d4260ed07195ac561d9ec04509b4d7d46cdcaf4cd3bd0131f29523dca
+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 9637 RMD160 84ef7b8f9a382958d3b006f0dfe2e72b65698733 SHA1 f86045c9a51ddf11b26afc82a1c634f182bd0bf6 SHA256 65ec9b0944933f54d961f2b05e79e04163b190e8d83644656edfb9f114f27fe3
+MISC ChangeLog 9855 RMD160 9a4966d8c16c9490b9c88fceec1a2c6319739176 SHA1 d45b8931f76a1b744f5b053f7ef5e36f255d7f21 SHA256 070d028d4d15b458ef7de1e951d48cc8a0565367f7c4f34bf7b4f8fedb39a360
 MISC metadata.xml 1095 RMD160 e9ab6c5ceb8ef386d4326eb312313103018e398a SHA1 3e8b74d446e173e748518326e5d0897a2e4e617c SHA256 df8f955ef191e8c794ca5ff540cb461365244623e373bca9c84783b92d473c07
diff --git a/sci-libs/gdal/files/gdal-1.5.2-xerces-64-bit.patch b/sci-libs/gdal/files/gdal-1.5.2-xerces-64-bit.patch
new file mode 100644
index 000000000000..be0a2b47e161
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.2-xerces-64-bit.patch
@@ -0,0 +1,52 @@
+Index: ogr/ogrsf_frmts/ili/iom/iom_utilities.cpp
+===================================================================
+--- ogr/ogrsf_frmts/ili/iom/iom_utilities.cpp	(révision 15504)
++++ ogr/ogrsf_frmts/ili/iom/iom_utilities.cpp	(copie de travail)
+@@ -168,33 +168,33 @@
+ */
+ char *iom_toUTF8(const XMLCh *src)
+ {
+-	unsigned int srcLen=XMLString::stringLen(src);
+-	int destLen=srcLen+10;
+-	char *dest;
+-	dest=dbgnew char[destLen+1];
+-	unsigned int eaten;
+-	unsigned int endDest;
+-	endDest=utf8_transcoder->transcodeTo(src,srcLen,(unsigned char *)dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
++	XMLSize_t srcLen=XMLString::stringLen(src);
++	XMLSize_t destLen=srcLen+10;
++	XMLByte *dest;
++	dest=dbgnew XMLByte[destLen+1];
++	XMLSize_t eaten;
++	XMLSize_t endDest;
++	endDest=utf8_transcoder->transcodeTo(src,srcLen,dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
+ 	while(eaten<srcLen){
+ 		delete[] dest;
+ 		destLen=destLen+srcLen-eaten+10;
+-		dest=dbgnew char[destLen+1];
+-		endDest=utf8_transcoder->transcodeTo(src,srcLen,(unsigned char *)dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
++		dest=dbgnew XMLByte[destLen+1];
++		endDest=utf8_transcoder->transcodeTo(src,srcLen,dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
+ 	}
+ 	dest[endDest]=0;
+-	return dest;
++	return (char*)dest; /* should be a unsigned char* == XMLByte* instead */
+ }
+ 
+ /** transcode an utf8 encoded string to a xerces unicode one.
+ */
+ XMLCh *iom_fromUTF8(const char *src)
+ {
+-	int srcLen=XMLString::stringLen(src);
+-	int destLen=srcLen;
++	XMLSize_t srcLen=XMLString::stringLen(src);
++	XMLSize_t destLen=srcLen;
+ 	XMLCh *dest=dbgnew XMLCh[destLen+1];
+ 	unsigned char *charSizes=dbgnew unsigned char[destLen];
+-	unsigned int eaten;
+-	unsigned int endDest=utf8_transcoder->transcodeFrom((unsigned char *)src,srcLen,dest,destLen,eaten,charSizes);
++	XMLSize_t eaten;
++	XMLSize_t endDest=utf8_transcoder->transcodeFrom((const XMLByte *)src,srcLen,dest,destLen,eaten,charSizes);
+ 	dest[endDest]=0;
+ 	delete[] charSizes;
+ 	return dest;
diff --git a/sci-libs/gdal/gdal-1.5.2.ebuild b/sci-libs/gdal/gdal-1.5.2.ebuild
index 7ba9dd0ef97a..6327e2b0ffdb 100644
--- a/sci-libs/gdal/gdal-1.5.2.ebuild
+++ b/sci-libs/gdal/gdal-1.5.2.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.2.ebuild,v 1.3 2008/10/18 19:08:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.4 2008/11/09 01:42:16 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 # need to get these arches updated on several libs first
 #KEYWORDS="~alpha ~hppa"
 
@@ -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 )
 	|| (
@@ -70,7 +70,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}"/${P}-xerces-64-bit.patch
 
 	if useq netcdf && useq hdf; then
 	    einfo	"Checking if HDF4 is compiled with szip..."