Fix build with GCC-4.5 wrt bug 334415. Thanks to Diego for report.

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

4 files changed, 44 insertions, 12 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 929fa4c9582a..c110243ca528 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.20 2010/07/04 19:57:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.21 2010/08/25 16:21:38 xarthisius Exp $
+
+  25 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> gdl-0.9_rc4.ebuild,
+  +files/gdl-0.9_rc4-gcc4.5.patch:
+  Fix build with GCC-4.5 wrt bug 334415. Thanks to Diego for report.
 
   04 Jul 2010; Justin Lecher <jlec@gentoo.org> -gdl-0.9_rc2.ebuild,
   -gdl-0.9_rc3.ebuild, gdl-0.9_rc4.ebuild, -files/gdl-0.9_rc1-gcc4.3.patch,
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 35ac5f7caec5..983daa6aa6bb 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -4,15 +4,18 @@ Hash: SHA1
 AUX gdl-0.9_rc2-gcc4.4.patch 372 RMD160 e1f5eed5e509981f5f408b0091eee25fac2ec913 SHA1 44fbcbb7c60ed9efd3145b983a7d8549a1b3a4be SHA256 57a1bab2e97953a7181c9da325c5d9fa17755568d2c4df1febbcc64035a11ac6
 AUX gdl-0.9_rc4-antlr.patch 1660 RMD160 29b275369d39e1ce53a8844c7cfeb2a897246220 SHA1 34d42ac6a2af794fac47ffa9578eae99b5f6cd63 SHA256 82f6211f9171438802372d7d1cd2fd141036bcc4abd8364e84a8b036c811f7d0
 AUX gdl-0.9_rc4-gcc4.3.patch 377 RMD160 b32e74d24fde6c37292b5a70450ad892a8ebbe46 SHA1 223bfc83e74f3ef788fd8e0c78f3cc82019834b4 SHA256 81d769b09bead8a103b85ff17083d3a8aac1b68b06db8d7cf2d2330787dd5f1c
+AUX gdl-0.9_rc4-gcc4.5.patch 756 RMD160 e9129082b199bf69e0ac06fbad268e4ffa02bb35 SHA1 98c2cfcf10d5bd38d4869ef13e78b2a484507b4f SHA256 4cf2cec2310285e76b563684f282f2cd6358e8942395170b051b64217ef3ff6b
 AUX gdl-0.9_rc4-wxwidgets.patch 2713 RMD160 66f4367194459e92261a99b9edfb63eccaf3a24a SHA1 9323d77de686f1ec41c891ce97962dc6c56278c3 SHA256 902d80ab95b22d5ba9f334289e2a8709e947815a301d3d3dc10918a138d5a86a
 DIST gdl-0.9rc4.tar.gz 1486747 RMD160 504f072d4dbf30403a2e9e0ed18223537619f01a SHA1 ffd133b9bc213613c89952f341defb447a87bf1d SHA256 b4b6c64c0d6b208d0a1c577986740308b388ef31b6960cf6c9cc93618b8b97b2
-EBUILD gdl-0.9_rc4.ebuild 2758 RMD160 5959149b06c62e3ae6cbc02f02f0639695a657ef SHA1 9486dac803f55fbdef8996165d1c242d48c1aab8 SHA256 2e2a167d4cde23f18e8d336290625a38b854b5bc5d826c1c2d703face790738a
-MISC ChangeLog 4607 RMD160 a66a223aaa2e1b0647b4feb5d378536297b8e29f SHA1 70c30bd423df396dda4e44be5a69b70393530d4f SHA256 5fb351d07c0bed3983fab3b25ccaaf1b0a33b8c46c45b93175af8535bea5febf
+EBUILD gdl-0.9_rc4.ebuild 2788 RMD160 9fd445dea40b9f405fa026ad09dfcb81109409da SHA1 1e65199e4f9c0732ffea4173c6fd49cc9950e315 SHA256 e06a10def940d675d0eaae7843a332f0fe06b796ebef21705b1b1d75e47d207b
+MISC ChangeLog 4792 RMD160 4fca4128e027460d30d45b6e1dba65d5844b7fa2 SHA1 7de65815bda932ea3d991e655e67a1a1b66c1e41 SHA256 d1bd4b59430cef2db38ed785e1749962180f3febd8e6e8cf8392e96dd4201e81
 MISC metadata.xml 632 RMD160 0426399f3337be71e1bb6f3ff54d2e78e1a27cdb SHA1 e9cea925da8e0a89020d35a0fe5ca285bde877f5 SHA256 b575202c0cd320efee3a0f37050f0dd960214c1f971d5b0a917d4c48dc81eb94
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkww560ACgkQgAnW8HDreRbfNwCgvjee6578S6FY4pD8q0Ay9Zlv
-c0sAn3wOvH9/sPfIocTQP/VtGPKu/e1Q
-=WmJa
+iJwEAQECAAYFAkx1QxwACgkQIiMqcbOVdxTonwP9GMFVnfb1e5Hbdh3dV2GmN6sY
+ubGdiG9I6zWO2sRi/ZPyf0hs+UVkCzS2hpCLI2CYIVgCIKHABYlmpjvJ5axfiUcT
+W/XRw4Qnh6q/uql/rPBHsFb1PeXeHIik8JTJbwluPN/8hCPSNZHuxdoEcfTV1Clx
+Jurg0McOlgCu6o56JOs=
+=Uzsu
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch b/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch
new file mode 100644
index 000000000000..845f2dff1bf1
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch
@@ -0,0 +1,24 @@
+Fix build with GCC-4.5
+
+http://gnudatalanguage.cvs.sourceforge.net/viewvc/gnudatalanguage/gdl/src/math_utl.hpp?r1=1.4&r2=1.5&view=patch
+http://bugs.gentoo.org/show_bug.cgi?id=334415
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564994
+
+--- src/math_utl.hpp
++++ src/math_utl.hpp
+@@ -22,11 +22,12 @@
+ 
+ //#define ABS(xxx) (( xxx > -xxx)?(xxx):(-xxx))
+ 
+-template< typename T>
+-inline T abs( T a) { return (a>=T(0))?a:-a;}
+-
+ namespace lib {
+ 
++  // SA: needs to be inside a namespace for GCC 4.5
++  template< typename T>
++  inline T abs( T a) { return (a>=T(0))?a:-a;}
++
+ //   int trans513(char *, int, int, int, DType);
+ //   int transpose(char *, SizeT, SizeT [], SizeT, DType);
+ //   int transpose_perm(char *, SizeT, SizeT [], SizeT, DType, long []);
diff --git a/dev-lang/gdl/gdl-0.9_rc4.ebuild b/dev-lang/gdl/gdl-0.9_rc4.ebuild
index 9db4cb8e9d48..2bb051e86f13 100644
--- a/dev-lang/gdl/gdl-0.9_rc4.ebuild
+++ b/dev-lang/gdl/gdl-0.9_rc4.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/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.6 2010/07/04 19:57:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.7 2010/08/25 16:21:38 xarthisius Exp $
 
 EAPI="2"
 
@@ -42,10 +42,11 @@ pkg_setup() {
 
 src_prepare() {
 	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-	epatch "${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-	epatch "${FILESDIR}"/${P}-antlr.patch
-	epatch "${FILESDIR}"/${P}-wxwidgets.patch
+	epatch "${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch \
+		"${FILESDIR}"/${P}-gcc4.3.patch \
+		"${FILESDIR}"/${P}-antlr.patch \
+		"${FILESDIR}"/${P}-wxwidgets.patch \
+		"${FILESDIR}"/${P}-gcc4.5.patch
 
 	# we need to blow away the directory with antlr
 	# otherwise the build system picks up bogus