Fix compilation on Solaris using GCC 4.6

Package-Manager: portage-2.2.01.20430-prefix/cvs/SunOS i386

4 files changed, 34 insertions, 5 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index a4f7d18ff9d1..cb7b5c91ecd6 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.61 2012/02/20 15:27:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.62 2012/05/06 17:45:16 grobian Exp $
+
+  06 May 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/3.3.2-solaris-isnan.patch, geos-3.3.2.ebuild:
+  Fix compilation on Solaris using GCC 4.6
 
   20 Feb 2012; Patrick Lauer <patrick@gentoo.org> geos-3.2.2.ebuild,
   geos-3.3.2.ebuild:
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index dc227a12aad7..c60367b1305d 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.2.0-darwin.patch 645 RMD160 71b22283eb9d95c41f2e05c9a390dbbca217d73d SHA1 5aca4d9caeb6e4927667b562c6d43a65ea79b977 SHA256 e8c48222af03a8e029ecfa8ceb4634c9baeee13a628d64ba7cb5dc7b1b1dfa9f
 AUX 3.2.0-multipy.patch 276 RMD160 a0cff4e5b14c1ed84d70860fd1a7c41efeea6e72 SHA1 55e25a3a89bbbaf8eaf1814f10f13b36597e1d94 SHA256 b2f1d11f953c456cad975afcb78a27005eb025e1beae2621c92cb139b44fef8c
 AUX 3.2.0-python.patch 2121 RMD160 30628f797473067ad5feb25bd6e603bc39675e94 SHA1 adf6a6ed4398925bbaf9c401f0941f4de6a6adb0 SHA256 f8f82605f85de7a189b2272db26c6b78d78eaafccb8a3ed2662d3dce922b1235
 AUX 3.2.0-swig2.0.patch 1056 RMD160 40f4b89cec57d1db7907679ff28b967c5702b7c4 SHA1 419117b2af0759af9bf9041e76d83ad6e6f6fee7 SHA256 b322b53240760a120fb813e263c9358adc11682d99ea13c502309282fff4eb49
 AUX 3.2.2-disable_static_modules.patch 1171 RMD160 96175e5f23e26b36c935ca6b64084012c4dbb162 SHA1 02f6c861f0cfe4765c8be890237cbf28fdbc18ee SHA256 06a05800709b1daf67952cbe7c69aaf67bb66199e2e08b11c9568b1b894f8acd
 AUX 3.2.2-gcc46.patch 6922 RMD160 48a25930dc1745be106699c69868cec3204a700d SHA1 ca68cadc11397e74a5acd11ead28702e69f7e44a SHA256 ee2f1cc05f8c734f0dee64d0f36623be28ac39ac734914fc323b841c559387dd
+AUX 3.3.2-solaris-isnan.patch 359 RMD160 faf29ecd8bd96303096ea73b15898bc0e06fb9b6 SHA1 e6ff90026e2b23c626b6932859ce861979fecb2c SHA256 1886913b14a167c893d801d98f62425c1ef4da2f93341cd384ecf082d3fc36fc
 DIST geos-3.2.2.tar.bz2 1664073 RMD160 95342be083175f38c8c87b5682271253320f3d60 SHA1 6917d6d1d4e79f58d9f931bf351024709fabbc5a SHA256 24df7c2119936fe0bcaa66e0b05aa28a875e373095cc05ee7eff404330e3211c
 DIST geos-3.3.2.tar.bz2 1852080 RMD160 168e12e29c3d7a9408753f19397440f20d321715 SHA1 942b0bbc61a059bd5269fddd4c0b44a508670cb3 SHA256 ec64d3a92540a1618aa3b91dc1235caae1c370ec23afd59a2734062bf182ed5b
 EBUILD geos-3.2.2.ebuild 2615 RMD160 e9172cc05032b51d05b62268799d280f32b6c2de SHA1 bb0074cafcc11a13d47cf5d2caa633bf1c0aad29 SHA256 783d2af24cbaabb815288dcd209b9a2436150ce26aa5cb976a7502bbf3f66942
-EBUILD geos-3.3.2.ebuild 2338 RMD160 547afcbe2bf2fbaa13d9af0920a9e49e0f5f1586 SHA1 0911a97ae97265cd435a68a8b2c7983b6e6ce39b SHA256 e4cba737c445d1aed311082987931c1e77aee3b5050576239a6d40d66750d656
-MISC ChangeLog 10249 RMD160 87f41d8efc52775393387ce11520f082036e2f5c SHA1 9232d65190905202ed129191659041a1a5378124 SHA256 dc38214fa080fbd29aeb17be593e901d123c77e6a6268ec107cc43d0ba4dc995
+EBUILD geos-3.3.2.ebuild 2382 RMD160 e650a7c7a00862a583fb9483ca9a307ed7a5de81 SHA1 962e709e6af69f4a58d8549fd8c1c6c93cfe2a55 SHA256 60e2e21236b0278354186c0d322852790932a0be3ea4cc139d8e023d885d357e
+MISC ChangeLog 10399 RMD160 47e4d853292068e6c469dce20d3f43455c8d7e43 SHA1 27b6b6f5e1434245b524ac0fa83cbc8cd4881433 SHA256 a01202cfb1b8ef4395f270f5998d1fcfc6797c17b83349d2ca8ee41a799a03f1
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (SunOS)
+
+iEYEARECAAYFAk+muLEACgkQX3X2B8XHTomFcQCeJrkGdwSmXV9ymJCZqvz+YoFu
+R2QAniCgRUaHiwFqz/4QZnwdN+82TGL9
+=yAhF
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/geos/files/3.3.2-solaris-isnan.patch b/sci-libs/geos/files/3.3.2-solaris-isnan.patch
new file mode 100644
index 000000000000..04dc131e7df3
--- /dev/null
+++ b/sci-libs/geos/files/3.3.2-solaris-isnan.patch
@@ -0,0 +1,13 @@
+--- include/geos/platform.h.in
++++ include/geos/platform.h.in
+@@ -97,8 +97,9 @@
+    // It does leave a version in std.
+ #  define ISNAN(x) (std::isnan(x))
+ # elif defined(__sun) || defined(__sun__)
++#  define _XOPEN_SOURCE 600  // force iso/math_c99
+ #  include <math.h>
+-#  define ISNAN(x) (::isnan(x))
++#  define ISNAN(x) (std::isnan(x))
+ # endif
+ #endif
+ 
diff --git a/sci-libs/geos/geos-3.3.2.ebuild b/sci-libs/geos/geos-3.3.2.ebuild
index 1dcce258128b..222a20483687 100644
--- a/sci-libs/geos/geos-3.3.2.ebuild
+++ b/sci-libs/geos/geos-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.2.ebuild,v 1.2 2012/02/20 15:27:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.2.ebuild,v 1.3 2012/05/06 17:45:16 grobian Exp $
 
 EAPI=4
 
@@ -33,7 +33,8 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/3.2.0-python.patch \
-		"${FILESDIR}"/3.2.0-darwin.patch
+		"${FILESDIR}"/3.2.0-darwin.patch \
+		"${FILESDIR}"/3.3.2-solaris-isnan.patch
 	eautoreconf
 	echo "#!${EPREFIX}/bin/bash" > py-compile
 }