Backported patch from upstream for swig 1.3.39 (fixes bug #266251).

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

4 files changed, 35 insertions, 4 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 3dd8d83dfcba..6630cbf095d4 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.56 2009/04/11 17:07:01 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.57 2009/04/25 06:08:09 nerdboy Exp $
+
+*gdal-1.6.0-r1 (25 Apr 2009)
+
+  25 Apr 2009; Steve Arnold <nerdboy@gentoo.org>
+  +files/gdal-1.6.0-swig-fix.patch, -gdal-1.6.0.ebuild,
+  +gdal-1.6.0-r1.ebuild:
+  Backported patch from upstream for swig 1.3.39 (fixes bug #266251) support
+  for all supported bindings.
 
 *gdal-1.6.0 (11 Apr 2009)
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index b05b158c5232..d177622dfb70 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -10,6 +10,7 @@ AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4
 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-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
 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
@@ -26,6 +27,6 @@ EBUILD gdal-1.5.0-r1.ebuild 6127 RMD160 3282266d87f529fc5f34874886547e0dc56528ff
 EBUILD gdal-1.5.1.ebuild 6181 RMD160 fab38e35517ecb614fd06b25a01e6deb7f495cbd SHA1 cfb48b1ef59cb36f8d70e2d0638dfe553e641c7d SHA256 b5169d89b0f260cae069d41d36f5d69e700fcdf27b6172282458520b365f6acf
 EBUILD gdal-1.5.2.ebuild 6420 RMD160 8647e5beb496b3fca5e3616cb7839f749fc2f85a SHA1 ea96e14b1ddf131f075e9c06d61b3d2d98a831b9 SHA256 2e74fe78c00fb02cd61bcc484493f9ec069ad86676b7bca0dfe50f9c5c0164a4
 EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SHA1 b810791d98d84867812cd6700558b00cf32ce03d SHA256 995c6f2b68fd78234580d7612f720ad6d3dc398dec707c65236c17cfcd1b322f
-EBUILD gdal-1.6.0.ebuild 6458 RMD160 cf64645b1628f9a31ef9c1e65dd03ba8ca76fe25 SHA1 f74b6583a1e1f4005fff28466155fb10f344c747 SHA256 ad9e64beb369d54e42b8b427eae062a63d6900cd05a8f88af11999978b473c23
-MISC ChangeLog 11180 RMD160 a0c4112d62e7780265f69942abb8030fd2b42a54 SHA1 a09c63aece946030035335dfde3bc8c9fe47ac6a SHA256 faa7ea382a5d95e1aec8de581d01575fb4ec2031e76d00219d1589828927af2e
+EBUILD gdal-1.6.0-r1.ebuild 6544 RMD160 5a1341a5c0458249dbd5f7ff5412776c7dfc6c00 SHA1 c21106d24615110821f9818e1aff86413a3f5aec SHA256 74af1e59daa5d0bd966df71adbff0fe7125f43401401c690d69fa0422ccf5556
+MISC ChangeLog 11448 RMD160 8ed3db4473742b09d563e7d476f074f82a5e3b24 SHA1 c1138e482286ef276e065f3663a976bee3a49c39 SHA256 4ce2501c5d322eea8dfb45faf517441c831145b403852d695f763b3746de9ce6
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch b/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch
new file mode 100644
index 000000000000..38c94da52f76
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch
@@ -0,0 +1,20 @@
+--- swig/include/gdal.i.orig	2009-04-24 21:55:06.315863023 -0700
++++ swig/include/gdal.i	2009-04-24 22:10:28.806611326 -0700
+@@ -176,6 +176,17 @@
+ %include "gdal_typemaps.i"
+ #endif
+ 
++/* Default memberin typemaps required to support SWIG 1.3.39 and above */
++%typemap(memberin) char *Info %{
++/* char* Info memberin typemap */
++$1;
++%}
++
++%typemap(memberin) char *Id %{
++/* char* Info memberin typemap */
++$1;
++%}
++
+ //************************************************************************
+ //
+ // Define the exposed CPL functions.
diff --git a/sci-libs/gdal/gdal-1.6.0.ebuild b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
index 20dd20b8e026..bc97bf9f1573 100644
--- a/sci-libs/gdal/gdal-1.6.0.ebuild
+++ b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6.0.ebuild,v 1.1 2009/04/11 17:07:01 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.1 2009/04/25 06:08:09 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -74,6 +74,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
 	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
 	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
+	    "${FILESDIR}"/${P}-ruby-make.patch \
+	    "${FILESDIR}"/${P}-swig-fix.patch \
 	    || die "sed failed"
 
 	if useq hdf; then