Fix build with swig-2.0 wrt bug 325725. Thanks to Juergen Rose <rose@rz.uni-potsdam.de> for reporting

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 48 insertions, 5 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index a1d2d10606f3..8220fba452e9 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.44 2010/06/26 15:33:18 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.45 2010/06/26 18:11:29 xarthisius Exp $
+
+  26 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/3.2.0-swig2.0.patch, geos-3.2.0-r1.ebuild:
+  Fix build with swig-2.0 wrt bug 325725. Thanks to Juergen Rose
+  <rose@rz.uni-potsdam.de> for reporting
 
   26 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   geos-3.2.0-r1.ebuild:
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 023902b82982..c9168af4b11a 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.2.0-multipy.patch 276 RMD160 a0cff4e5b14c1ed84d70860fd1a7c41efeea6e72 SHA1 55e25a3a89bbbaf8eaf1814f10f13b36597e1d94 SHA256 b2f1d11f953c456cad975afcb78a27005eb025e1beae2621c92cb139b44fef8c
+AUX 3.2.0-swig2.0.patch 1056 RMD160 40f4b89cec57d1db7907679ff28b967c5702b7c4 SHA1 419117b2af0759af9bf9041e76d83ad6e6f6fee7 SHA256 b322b53240760a120fb813e263c9358adc11682d99ea13c502309282fff4eb49
 AUX geos-3.1.1-missing-includes.patch 662 RMD160 8675c18376128d77c4a3c567bac38445f9e2fa5f SHA1 7a5077c737045aeff9ff5d4768284c103bd97615 SHA256 89f31ac87cc1d610317338c0eea1746f05ae9a98e88c8994dcb4ee7c81c2c61e
 DIST geos-3.1.1.tar.bz2 1170244 RMD160 a3254a7a8cdfccaefaa2f438577f4ebd0c8929ac SHA1 cafb76a3e5fbcd7d9588d3fdcec8fa4fcd8b9fa4 SHA256 e93f6f3cf10af33bff2289046c66d8569ca4afc26e64c16ff067b70899cbc5d5
 DIST geos-3.2.0.tar.bz2 1627924 RMD160 cdbd10d524164cd11b73a3af39ce15d021dfcaef SHA1 e6925763fb06fa6a7f358ede49bb89f96535b3ef SHA256 0a43b76429fd94fd572d79869f3ca5acdf44a9fa73844aa655016f09aaa1e6c7
 EBUILD geos-3.1.1.ebuild 1281 RMD160 cb393f3abdab15786ab4d5798ac4298182dfa6bd SHA1 aeefa9f0a16c37caac8b9db7332489b1c54b6d45 SHA256 298aaee394248b3f62640e9217ae13cd446455afea94fca977f4292029c7b044
-EBUILD geos-3.2.0-r1.ebuild 2090 RMD160 077be70170866a8c47fdcb3a5321cf681cfb2aca SHA1 d0b9ad87899ce4fbee1f3b44bb25928b777917b1 SHA256 9f77e0611c0e4a61a0c1eb4843cbfd7d018d4ff71aac37187f7f94f3fbf8cdf0
+EBUILD geos-3.2.0-r1.ebuild 2130 RMD160 72829998c2307a1b1911bdce18e96b8647591808 SHA1 809f8751d8bf6036b7cca2fb1126523c9a11e471 SHA256 06ca4e63fff1511701f1df3143db599fcba93dd1e0e0ba7757978e6592a2a467
 EBUILD geos-3.2.0.ebuild 1381 RMD160 68ab7367728165f713b182c272d962adc2f51042 SHA1 9671347677898b648d80dfca3d8387f89e90f975 SHA256 d8ca2b913d9a0d4eed724e583dbdfea15703f247b67e72d29861e2a152a127c2
-MISC ChangeLog 7739 RMD160 d803cf02c05f24035f76856281780991ca6f971b SHA1 6846d5c5176e1ede4b9c02122f5cbaf03faeb96e SHA256 44f5ec0ca28ed38203679e9d913d32e7d4d9f919d63bb0e7b7ff48568fe74034
+MISC ChangeLog 7954 RMD160 90e36826bc4fc1d04004123259cb1d57a7ec78b8 SHA1 63ef496d57cb99ed5575d4bc15f5722fe8be4a4f SHA256 331f884aa472141f8e0ccdc62c680d081ddeaeff6ae6e7f83ff5347f7e969eec
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwmQtsACgkQIiMqcbOVdxQb8AP/aevOAGIW3AtNskNR63K90JF2
+Yun7LwBrSrnIfEheCPXk/e8aJ7aZutV1D5OIJy0bYslEhW34YJSOvtuvQV/3ZnIx
+jatzT7kRCVUefd9Fu2QAlC8qJS0WurV2KekwLG2nfI+nabCiaT8pfMbK14nDP0Ay
+3sC6bBOjxaFW6VfDgbI=
+=cfDp
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/geos/files/3.2.0-swig2.0.patch b/sci-libs/geos/files/3.2.0-swig2.0.patch
new file mode 100644
index 000000000000..ac0aaed0b225
--- /dev/null
+++ b/sci-libs/geos/files/3.2.0-swig2.0.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/325725
+
+--- macros/ac_pkg_swig.m4
++++ macros/ac_pkg_swig.m4
+@@ -25,4 +25,7 @@
+ dnl @version 2004-09-20
+ dnl @license GPLWithACException
++dnl
++dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
++dnl
+ 
+ AC_DEFUN([AC_PROG_SWIG],[
+@@ -68,7 +71,7 @@
+                                 [available_patch=0]
+                         fi
+-                        if test $available_major -ne $required_major \
+-                                -o $available_minor -ne $required_minor \
+-                                -o $available_patch -lt $required_patch ; then
++			[required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch]`
++			[available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]`
++                        if test $available_full -lt $required_full; then
+                                 AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                 SWIG=''
+
diff --git a/sci-libs/geos/geos-3.2.0-r1.ebuild b/sci-libs/geos/geos-3.2.0-r1.ebuild
index 57aaf2c12241..386acf97e0f5 100644
--- a/sci-libs/geos/geos-3.2.0-r1.ebuild
+++ b/sci-libs/geos/geos-3.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.2 2010/06/26 15:33:18 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.3 2010/06/26 18:11:29 xarthisius Exp $
 
 EAPI=2
 
@@ -32,7 +32,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-multipy.patch
+	epatch "${FILESDIR}"/${PV}-multipy.patch \
+		"${FILESDIR}"/${PV}-swig2.0.patch
 	eautoreconf
 	echo "#!/bin/bash" > py-compile
 }