Fix #534168

Package-Manager: portage-2.2.15/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

4 files changed, 189 insertions, 8 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 0de62ef1bc7a..4786f632a457 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.158 2015/01/05 16:30:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.159 2015/01/12 23:49:19 grozin Exp $
+
+  12 Jan 2015; Andrey Grozin <grozin@gentoo.org> gdal-1.11.1-r1.ebuild,
+  +files/gdal-1.11.1-swig-3.0.3.patch:
+  Fix #534168
 
   05 Jan 2015; Alexis Ballier <aballier@gentoo.org> gdal-1.11.1-r1.ebuild:
   keyword ~arm
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 955542156b1e..cc388ddfb423 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX gdal-1.10.0-ruby-makefile.patch 1468 SHA256 a07a8df543bc65dbb6871689287ef1bc831399a1090064a97c2e0f71c9f27a88 SHA512 ae2bd2c051f851533efd16efafd4fbf41906cdb64401e327220a09dd879e124e6483122ef618bec4fd6e9f9c8a5b0d7dd8362938d0a5ea788d77887e9a54de7b WHIRLPOOL 563004ce1a9920965c2b59aeca036fc04ba2df3e61685e7427879481591387eb6780d7a50d0a4c631df149beb4751d807462c0802a86a998cebc7116a3275875
+AUX gdal-1.11.1-swig-3.0.3.patch 4345 SHA256 972fe3f5893243e37a7e7a2ffe679d8187ce11f42d0119d1863fbdf0a22feb57 SHA512 843f99b3c62a8cefd87d49d53933646a9039f80d4be907317c36bba79f8f411ecf87b0269a22b9c787d51f6b0d6c1fcba5fa29b075362946c39ea840f86060b0 WHIRLPOOL 914f88e789dafe1366c49de8032a0ca0a1663952f3805bdf748f848d1fb3f0a82b4786a6ffb1f32ec5ce3f2cac36945e412cfc5cd0c1fc915099c5554ab47ce4
 AUX gdal-1.5.0-install_name.patch 1731 SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd SHA512 fa5ecc9e14cbfc282a41d0c55e328c2f56bd92d8fac1897d8e921d59c9705b1291eff66e7f6cf8a1305b2c5f044e0813d28affb398b715d9d207c31af341318e WHIRLPOOL f67a2f307c16d664af34fe26993e74c2a0d1a2b52d43176eb1f03fbd9523533906d1a7df34a0745927f46febdb60e6efe7291bf0e520e0d6c904bcbfe5be928f
 AUX gdal-1.5.0-soname.patch 483 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7 SHA512 c7c022524fd11de2137e15ec8dc31106887a2d23d583f61f1f9bab1d41a01e558faccc162166150c43903dbcaad14af65afd8ddc090670ebbd15dc57f05f228e WHIRLPOOL 7e2f17ea2c804fa7aded2fc8225091e84c44483c69cbb34818af3b38a7d580adf41daff250006778c6d3aea9175b2162e9add3956594b81eefd23689aed0de68
 AUX gdal-1.8.1-zlib_header_fix.patch 253 SHA256 019d7a858670aa4651b5c887db4f951d906fd3395e12f3f3a570295fcc171b89 SHA512 ee9a5fbef309dabe5014ca0a9e1cd32864af8a8939dd445782afd00c6e6aaf83ec5dcff5e0fd66c10661eafa41f4c5c178a4adfebd09964358127620d89b5f3b WHIRLPOOL 2e2147eb440d6a752676ec5c19656c2939584889478af8976e17c7a1e7ddcd318e3f280cf982abde89b09cbe71ea8134c34b88c4788e94b3b25548928c9ecd78
@@ -12,14 +13,26 @@ DIST gdal-1.11.1.tar.gz 10731242 SHA256 f46b5944a8cabc8516673f231f466131cdfd2cdc
 DIST gdal-1.9.2.tar.gz 9495381 SHA256 9f3b9ae968eaa8d06ee5448e5b65e7bfa940e2e345282a29d95275421f36c688 SHA512 d93cd5fb16a3728a1f545bc6ceeb61bf41e011619b9290ed51eb5fc2d99e3c0f5733bfc6b3444ad2991e462c87c1088247e3fbb92d880701d48790125647b423 WHIRLPOOL 87f31c12ac5c4e18b4a7b9c416144b32c6d862ddba7688d5317582c797f8a637e37192cbb74406b6a71a672a4c53d3c71505ba024405911008e7b863881c9b8c
 EBUILD gdal-1.10.0-r1.ebuild 7459 SHA256 49b93cba43a37d0df1cbadbd13c40c0cad5f99f67a194ed8a41dea8d0bbd9b63 SHA512 d7306cbb19627ad8261ce7d2c85bdf4c51482f6da35490779ea7a6a28f10a157a72f1257cd66592b1b4cba710094ff0643fe5bba52e49228bed608e7a5de275b WHIRLPOOL d313bf4a5f280fdc926b67f451dda6de228396300fabeb5320d52ea841890c5867d176a11457bf65915588ba1870e7751ebd2f288da8615cf7564e790d98ca25
 EBUILD gdal-1.10.1.ebuild 8593 SHA256 64e24415357329ab046861bce437b5ff12d568e42c20caeb9bca3c3bf037f4d7 SHA512 640e9e73464311d8e77c896c468b25443ece3fb8f2c14851d9a6a6f8f8b1b4bef3a8d9a09d0cf7478806923375ec88a16b6a31a606391ecc4adbbd0c196b26d7 WHIRLPOOL 62318e511c695d9024dce2701f9e1ecc22e15f537eb63dd6dd3eec66e2804e8cbe166f9bbf350e77b46816872b3925f25431407e2afdb6dbd214f6cacfebccc0
-EBUILD gdal-1.11.1-r1.ebuild 8667 SHA256 487c4968c39486f248242b1b2cdc4122967c693b52e6221479b74f9faebbdddb SHA512 cebabe6142132f50e819c87795c606d6661600adbdf48e4e81a590ad54d18dbadaa6ded4c3075df86fa05e0c67a92e76adb619f006b224c03c4a5f2ce9ac8133 WHIRLPOOL 5a65db9b90d15763847647ec04394ff90f092c98e818a92b1e8ac6b057af130175f041048e1306c648f7d64498834cce2c3128a2dbf904e6942dec89b3390ff2
+EBUILD gdal-1.11.1-r1.ebuild 8758 SHA256 2bb5159fff177d0fa17370cd91d4999c3b79f9c383476f6bc041fcd4ebc6c9dc SHA512 11ec4dcf4480951238526c308cb14d1d8cd809416573a34fc156d70031412a48c40ebfe04941b456258848132a807d62ae3ef3bb9facb20c17e89534b486ad64 WHIRLPOOL ce22e5bd274d400ca32f8663da165cded8c33a5ae334040195a947d07af1148eb6624f5a5e562acf2e8d763af7205503b3f18311961576466afeb1fe5cd99c34
 EBUILD gdal-1.9.2.ebuild 7443 SHA256 37315ef6aa36506bebac766463910db62bfa3974d0fcb072a1db98bc2742c669 SHA512 9eb2a170a9651d42728d1162e73e18a40fafe57d8ed8e7d61a726cf80afecbeb361c80f99044803fff976f841f9c70baea1c7c943b70513133296a9b5efd4f37 WHIRLPOOL 32ee3435b15e3caa830e49eba52fe36bbd2c5ffded86cc1c22670242c0ae5780663ae867d37677ba0b44ba1d4bdb0c11b6a6ae7315483b046b6e7c6b371d1cf4
-MISC ChangeLog 29443 SHA256 0ce9528f12bbe09efc233980cf1912b94ab383fe178393d784d4c41e6c424fa6 SHA512 9fbbae5bad785e69ef7da7d08dd6e02c08b33569548756f7dab6de34cc8b967690f6aeb6508fa48fb7a6887c1d4237d6e023449fd8e3e9d0e8c002886352f02c WHIRLPOOL 2459ea6079b1ffd68418ef7befa13e7cac01c4691df1757713cc26d7b79c724c895154cea100f244cfb7f098fa2c922265fe1dc1ef515c5c955566e52fbf5a56
+MISC ChangeLog 29567 SHA256 1056b0de4296ea76ac0fa7d0e9ab4b818cb6b018797a39c0a8610a91be806738 SHA512 bb26ff665e84421b1b3e022a8bf2d00f5937a66e874887542e8fd96eca0800c6a3531c9a17dec533752e6844df07fa88b194f0df219afb8d67723e6f4a9270b1 WHIRLPOOL 5dc3dcb6c354527ed7b00db3cb265a1a9ffc8726c23721d449ca88f3f4c7879d025986dcf34f0ea7041ee8b6cde38563d97e7014717ee9db064de6a4a5cf6124
 MISC metadata.xml 1358 SHA256 25a3063ee14c6c99706a045b00ca2c93ab49b2f595759be6d85c0eb5ee20bc53 SHA512 82f014319806fa20e404244780bedf0fdcb5bf8c070d3758095c23d62a1fbb0bb712222cbaaea1101940b06c8ea6b1a588dc3a9815f5f8e2d7342fa08243a9cc WHIRLPOOL 5e964a8c85ab7ce5820a35043d13e7c6535f5cd13d16c95d635fc7c735a9366994ce9b843f72db801777b689562e94183227c57504ddc33d0afc6e182e15ec96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSqvDQACgkQvFcC4BYPU0oYGwCeKbLH4DENL//zP0cJ5Cb+/f2d
-W70An1jAoTnECOmXoVrNq2lf53QqCzUR
-=i/tc
+iQJ8BAEBCABmBQJUtFuQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2M2BcP/2aXDpUHwLEE+DJKm2H1FiiP
+WPvxrHWqzpl9SfNjU5Ng3q9pXvIgP32FbXjyb1KZ87ImGl+1zFuyq+qPm5smZxNV
+WW1L7c3hlQO61moHM2K8j6/p5nQ1shX0BdxgqqiEpSiET9f3zMy4Y5+VB01bw1FT
+U3zTIqVBORaTJabYaxJ1tuWSlTsb5OGc7dfubyBPQOr9p7jTTAS8r0PHpZrc4iBv
+IgpzpeamkVFi5COCSyf9E1pFVyRkRMmYYXCr06GJOl2q8rvcodJiSHaogNri3VuA
+p4/wqG8PzCfIaq9s43mY31x/LOvfNOw7uSLPBkCsqxyA1yB6uNoF1aulzyIg94YQ
+7zkyvI5JQLstuBGTATP0Tm9xY65GVr0W/KcRiv1s5brOtiNa75wVlrKJel548KXB
+W5ejva6jASizGHnUl9py+sCv5Cybf1Ij6K4+VYtlMAQHKUGthcwJSmIl/0/vW+tr
+u5QlMChGnzUz7piTNuj0CWPbWYyXUYQtJ6KeUqxODZUjtCYvMJs5JKOLkbcPG7RR
+JTjhTz0BIWcB9r9i31iZYpW32WU9Fyw32IChlsko55ZWkNmbqwv9qeg3ZnRlHcFg
+pysk7sZg1pW3MAfCEC4DwW6zNgdDtRYAExSjpUVU6Soo5qhmmuyvhrauiu4uWrzL
+TZQiYlJe044YKCuaY8kY
+=l2Xl
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/files/gdal-1.11.1-swig-3.0.3.patch b/sci-libs/gdal/files/gdal-1.11.1-swig-3.0.3.patch
new file mode 100644
index 000000000000..c6b8240b8ebf
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.11.1-swig-3.0.3.patch
@@ -0,0 +1,161 @@
+svn diff -c 28298 https://svn.osgeo.org/gdal/branches/1.11
+r28298 | rouault | 2015-01-06 10:03:37 +0100 (Di, 06 Jan 2015) | 1 line
+Python bindings: fix processing error of ogr_python.i with SWIG 3 (#5795)
+http://trac.osgeo.org/gdal/ticket/5795#comment:3
+https://bugs.gentoo.org/534168
+
+Index: gdal/swig/python/osgeo/ogr.py
+===================================================================
+--- gdal/swig/python/osgeo/ogr.py	(revision 28297)
++++ gdal/swig/python/osgeo/ogr.py	(revision 28298)
+@@ -2025,12 +2025,12 @@
+         """Returns the number of features in the layer"""
+         return self.GetFeatureCount()
+ 
+-
+-
++    # To avoid __len__ being called when testing boolean value
++    # which can have side effects (#4758)
+     def __nonzero__(self):
+         return True
+ 
+-
++    # For Python 3 compat
+     __bool__ = __nonzero__
+ 
+     def __getitem__(self, value):
+@@ -2041,9 +2041,9 @@
+             import sys
+             output = []
+             if value.stop == sys.maxint:
+-                
+-                
+-                
++                #for an unending slice, sys.maxint is used
++                #We need to stop before that or GDAL will write an
++                ##error to stdout
+                 stop = len(self) - 1
+             else:
+                 stop = value.stop
+@@ -2944,8 +2944,8 @@
+     def __copy__(self):
+         return self.Clone()
+ 
+-
+-
++    # This makes it possible to fetch fields in the form "feature.area". 
++    # This has some risk of name collisions.
+     def __getattr__(self, key):
+         """Returns the values of fields by the given name"""
+         if key == 'this':
+@@ -2961,8 +2961,8 @@
+         else:
+             return self.GetField(idx)
+ 
+-
+-
++    # This makes it possible to set fields in the form "feature.area". 
++    # This has some risk of name collisions.
+     def __setattr__(self, key, value):
+         """Set the values of fields by the given name"""
+         if key == 'this' or key == 'thisown':
+@@ -2978,7 +2978,7 @@
+                 else:
+                     self.__dict__[key] = value
+ 
+-
++    # This makes it possible to fetch fields in the form "feature['area']". 
+     def __getitem__(self, key):
+         """Returns the values of fields by the given name / field_index"""
+         if isinstance(key, str):
+@@ -2993,7 +2993,7 @@
+         else:
+             return self.GetField(fld_index)
+ 
+-
++    # This makes it possible to set fields in the form "feature['area'] = 123". 
+     def __setitem__(self, key, value):
+         """Returns the value of a field by field name / index"""
+         if isinstance(key, str):
+@@ -3026,9 +3026,9 @@
+             return self.GetFieldAsIntegerList(fld_index)
+         if fld_type == OFTRealList:
+             return self.GetFieldAsDoubleList(fld_index)
+-        
+-        
+-        
++        ## if fld_type == OFTDateTime or fld_type == OFTDate or fld_type == OFTTime:
++        #     return self.GetFieldAsDate(fld_index)
++        # default to returning as a string.  Should we add more types?
+         return self.GetFieldAsString(fld_index)
+ 
+     def SetField2(self, fld_index, value):
+Index: gdal/swig/include/python/ogr_python.i
+===================================================================
+--- gdal/swig/include/python/ogr_python.i	(revision 28297)
++++ gdal/swig/include/python/ogr_python.i	(revision 28298)
+@@ -111,7 +111,7 @@
+ }
+ 
+ %extend OGRLayerShadow {
+-  %pythoncode {
++  %pythoncode %{
+     def Reference(self):
+       "For backwards compatibility only."
+       pass
+@@ -183,12 +183,12 @@
+         return output
+     schema = property(schema)
+ 
+-  }
++  %}
+ 
+ }
+ 
+ %extend OGRFeatureShadow {
+-  %pythoncode {
++  %pythoncode %{
+     def Reference(self):
+       pass
+ 
+@@ -383,12 +383,12 @@
+         return output
+ 
+ 
+-}
++%}
+ 
+ }
+ 
+ %extend OGRGeometryShadow {
+-%pythoncode {
++%pythoncode %{
+   def Destroy(self):
+     self.__swig_destroy__(self) 
+     self.__del__()
+@@ -416,8 +416,8 @@
+           return subgeom
+       else:
+           raise StopIteration
++%}
+ }
+-}
+ 
+ 
+ %extend OGRFieldDefnShadow {
+@@ -449,13 +449,13 @@
+ }
+ 
+ %extend OGRFieldDefnShadow {
+-%pythoncode {
++%pythoncode %{
+   def Destroy(self):
+     "Once called, self has effectively been destroyed.  Do not access. For backwards compatiblity only"
+     _ogr.delete_FieldDefn( self )
+     self.thisown = 0
++%}
+ }
+-}
+ 
+ %import typemaps_python.i
+ 
diff --git a/sci-libs/gdal/gdal-1.11.1-r1.ebuild b/sci-libs/gdal/gdal-1.11.1-r1.ebuild
index b2cf8f51da0e..9fff0a2bcfe1 100644
--- a/sci-libs/gdal/gdal-1.11.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r1.ebuild,v 1.7 2015/01/05 16:30:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r1.ebuild,v 1.8 2015/01/12 23:49:19 grozin Exp $
 
 EAPI=5
 
@@ -119,6 +119,9 @@ src_prepare() {
 		-e 's:^ar:$(AR):g' \
 		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
 
+	# Fix swig-3.0.3 problem (bug #534168)
+	epatch "${FILESDIR}"/${PN}-1.11.1-swig-3.0.3.patch
+
 	tc-export AR RANLIB
 
 	eautoreconf