4 files changed, 80 insertions, 7 deletions
diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 36d9591dba52..fbecd70351ac 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.29 2008/05/29 17:51:17 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.30 2008/07/02 16:51:29 bicatali Exp $
+
+  02 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/geos-2.2.3-gcc43.patch, geos-2.2.3.ebuild:
+  Added gcc-4.3 patch for geos-2.2.3 (bug #227707)
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> geos-2.2.1.ebuild,
   geos-2.2.3.ebuild:
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index bca5b9ec24ec..188b42013f73 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX geos-2.2.1-gcc-41.patch 2888 RMD160 579e1c58ed74c66c75fbb01de9e397d277804cd8 SHA1 9ccd6b1a5485ce710b499c4eb40c5a8e3c131001 SHA256 f43992b255f32ec816e84684cf4d9c0d1381dd51a4dee87b756fc2bca193c030
+AUX geos-2.2.3-gcc43.patch 1832 RMD160 6051db64dd2de9a5da44204f7a8b27440fc930a5 SHA1 5aaf43d2c27ad02b56c072b45a05b940e842663b SHA256 c207803a9719c85011e58a2b9aec3965bcccc8a0cafa7e68cd4a5e59acbfbb4a
 AUX geos-2.2.3-python-shared.patch 536 RMD160 3dc56f244988f165898ea76974f4d21218fcdd00 SHA1 c5db575b04bc2d6e35317284ba1f028d8ce5dc4d SHA256 c3a1a71c73975c65686b389333a5e80fb33b119f0e98fe11374c33999ada50df
 AUX geos-2.2.3-swig.patch 1505 RMD160 56801a93aaf6ddedfd97efb2eeadb04361a5adfd SHA1 9138909c61943ac00a7c89ee2e999f544f137866 SHA256 871e86801a64bbb6b5fbafa8bed23e6f9fa513f0a5d88f919aaedb64219961ce
 AUX geos-3.0.0-gcc43.patch 3764 RMD160 8ff07118ac9b12ba3ec644700e5312dc9405a50b SHA1 ce0857415469ccb519ee94bce0f7ede2f5ed3de2 SHA256 993cae213c49abba58f1cdf4eacf2a3b97b36b522e2c6dfa5c93ad1193016be8
@@ -10,14 +11,14 @@ DIST geos-2.2.1.tar.bz2 533286 RMD160 f3ea1cbf3cf6c107acc9e0b43d77a0dbf0b65b25 S
 DIST geos-2.2.3.tar.bz2 554802 RMD160 968de157f96f41aa71d5ef7c28c7186e8db0939e SHA1 c5da21829255e3625f7c2482c9220234cc5d9f90 SHA256 c781f0973dcfac7a4a3a4da1e7dbf49c5cd549f8841a3c4cd8f8feaa50b408a7
 DIST geos-3.0.0.tar.bz2 1091475 RMD160 195fb24de2f67d515f629f1dcb3dccec7711bdac SHA1 71090220351c8ae7bb147d74145fa5daf83e3c26 SHA256 baa86c5125a349504e3890312e68ab3bf3601489cefe9ceb9f659e34bbe5eb4f
 EBUILD geos-2.2.1.ebuild 1430 RMD160 8e63ade6bc905a46112de26db5c8129277bd7fb0 SHA1 0c5c68089d3d0ca7351e1260001edeebb94aa9b4 SHA256 7bf213cef09ec8701436b9745703ff8483e254a80763f102a7f88ae3bdcd2811
-EBUILD geos-2.2.3.ebuild 2879 RMD160 38c1ee4082353cc5d7e2528a5e8c7d5a4a17186f SHA1 ae8f81b1cfdfd8ad6db9b64f2941bc77a81f9693 SHA256 84c1630815b09343e3ccaed2d018c2a92d3098cab96aa1286b907830219d1155
+EBUILD geos-2.2.3.ebuild 2919 RMD160 af9502c821e144563acc963b23c71887686a7342 SHA1 554ca47c24c5f94a7208fa2c10dbd59e01418cd3 SHA256 077b4c6a559f03f496a2bb399266ed357e3c04636e62e9d501a404bb1a2fa924
 EBUILD geos-3.0.0.ebuild 1268 RMD160 f6395809c3570a08366d2b46a98493fe20f5f678 SHA1 8c6d19bf4deff9146c2fb2bf59775fe98f6f66a4 SHA256 a4648bd011272b95475ac94c7c0d75a5cc606ea25e61611a3ccea33fa1600dc9
-MISC ChangeLog 5316 RMD160 a73ef28b5cf819f1f0a3c15f059899d74e201184 SHA1 8c8d73a19cb1a8c4c449a89c8e993ab1c4792041 SHA256 138cfc2ea2d89921293be52fc3f94fa741659bab3ca4ab335b0436d623da2923
+MISC ChangeLog 5476 RMD160 1aacbe24fa8f8e90ffa7ffc482f4cf5b4958cf50 SHA1 e9e867a4df36be54c61fb80185e41edb6d512fa5 SHA256 efa6be26aa8b6abfd1a571ae3345e36e563ba5cd7a846490a6ea4f57d31d20b4
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+7RgACgkQQU4yORhF8iC5DwCgn1SogssPOyWDlvZEQskGFMAF
-Cf0AnRNCj+W3gjp8KKd421evIxo3tkX1
-=L8Vx
+iEYEARECAAYFAkhrshoACgkQ1ycZbhPLE2AGCgCgmzrJQSsyeHfMvC0tsNzSHFHS
+0wIAnjhab5ywI4pxWFqEDRxbPouIy0WK
+=g+Ps
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/geos/files/geos-2.2.3-gcc43.patch b/sci-libs/geos/files/geos-2.2.3-gcc43.patch
new file mode 100644
index 000000000000..88605a046f28
--- /dev/null
+++ b/sci-libs/geos/files/geos-2.2.3-gcc43.patch
@@ -0,0 +1,67 @@
+--- ./source/capi/geos_c.cpp.orig	2008-07-02 17:37:37.000000000 +0100
++++ ./source/capi/geos_c.cpp	2008-07-02 17:37:58.000000000 +0100
+@@ -15,8 +15,8 @@
+  *
+  ***********************************************************************/
+ 
+-#include <stdio.h>
+-
++#include <cstdio>
++#include <cstring>
+ #include <string>
+ #include <iostream>
+ #include <sstream>
+--- ./source/index/quadtree/DoubleBits.cpp.orig	2008-07-02 17:31:56.000000000 +0100
++++ ./source/index/quadtree/DoubleBits.cpp	2008-07-02 17:32:57.000000000 +0100
+@@ -15,6 +15,7 @@
+ 
+ #include <geos/indexQuadtree.h>
+ #include <geos/util.h>
++#include <cstring>
+ 
+ namespace geos {
+ 
+--- ./source/io/markup/MarkupSTL.cpp.orig	2008-07-02 17:39:57.000000000 +0100
++++ ./source/io/markup/MarkupSTL.cpp	2008-07-02 17:41:38.000000000 +0100
+@@ -6,8 +6,10 @@
+ // Use in commercial applications requires written permission
+ // This software is provided "as is", with no warranty.
+ 
++#include <cstring>
+ #include "MarkupSTL.h"
+-#include <stdio.h>
++#include <cstdio>
++
+ 
+ using namespace std;
+ 
+--- ./source/io/StringTokenizer.cpp.orig	2008-07-02 17:33:49.000000000 +0100
++++ ./source/io/StringTokenizer.cpp	2008-07-02 17:34:22.000000000 +0100
+@@ -36,6 +36,7 @@
+ 
+ 
+ #include <geos/io.h>
++#include <cstring>
+ 
+ namespace geos {
+ 
+--- ./source/io/ByteOrderValues.cpp.orig	2008-07-02 17:34:48.000000000 +0100
++++ ./source/io/ByteOrderValues.cpp	2008-07-02 17:35:23.000000000 +0100
+@@ -16,6 +16,7 @@
+ 
+ #include <geos/io.h>
+ #include <geos/util.h>
++#include <cstring>
+ 
+ namespace geos {
+ 
+--- ./source/test/XMLTester.cpp.orig	2008-07-02 17:38:47.000000000 +0100
++++ ./source/test/XMLTester.cpp	2008-07-02 17:39:10.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <cassert>
+ #include <cctype>
+ #include <cstdlib>
++#include <cstring>
+ #include <fstream>
+ #include <functional>
+ #include <iostream>
diff --git a/sci-libs/geos/geos-2.2.3.ebuild b/sci-libs/geos/geos-2.2.3.ebuild
index d2395aa06956..06b2bdd37c2a 100644
--- a/sci-libs/geos/geos-2.2.3.ebuild
+++ b/sci-libs/geos/geos-2.2.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/geos/geos-2.2.3.ebuild,v 1.6 2008/05/29 17:51:17 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.3.ebuild,v 1.7 2008/07/02 16:51:29 bicatali Exp $
 
 USE_RUBY="ruby18"
 RUBY_OPTIONAL="yes"
@@ -28,6 +28,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-swig.patch"
 	epatch "${FILESDIR}/${P}-python-shared.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 }
 
 src_compile() {