Fixed compile issues with gcc-4.3 (see bug #215570).

(Portage version: 2.1.4.4)

4 files changed, 38 insertions, 4 deletions

diff --git a/sci-mathematics/ginac/ChangeLog b/sci-mathematics/ginac/ChangeLog
index 28a502b27279..d8302e877b74 100644
--- a/sci-mathematics/ginac/ChangeLog
+++ b/sci-mathematics/ginac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/ginac
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.16 2008/01/11 09:54:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.17 2008/04/01 14:45:11 markusle Exp $
+
+  01 Apr 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/ginac-1.4.1-gcc4.3.patch, ginac-1.4.1.ebuild:
+  Fixed compile issues with gcc-4.3 (see bug #215570). Thanks much to
+  <spasswolf@web.de> for his patch.
 
 *ginac-1.4.1 (11 Jan 2008)
 
diff --git a/sci-mathematics/ginac/files/ginac-1.4.1-gcc4.3.patch b/sci-mathematics/ginac/files/ginac-1.4.1-gcc4.3.patch
new file mode 100644
index 000000000000..93d910dbbd05
--- /dev/null
+++ b/sci-mathematics/ginac/files/ginac-1.4.1-gcc4.3.patch
@@ -0,0 +1,21 @@
+diff -Naur ginac-1.4.1/ginac/numeric.cpp ginac-1.4.1.new/ginac/numeric.cpp
+--- ginac-1.4.1/ginac/numeric.cpp	2007-09-07 06:53:54.000000000 -0400
++++ ginac-1.4.1.new/ginac/numeric.cpp	2008-04-01 08:51:29.000000000 -0400
+@@ -408,7 +408,7 @@
+  * @sa http://www.ginac.de/pipermail/cln-list/2006-October/000248.html
+  */
+ template<>
+-static inline bool coerce<int, cln::cl_I>(int& dst, const cln::cl_I& arg) 
++inline bool coerce<int, cln::cl_I>(int& dst, const cln::cl_I& arg) 
+ {
+ 	static const cln::cl_I cl_max_int = 
+ 		(cln::cl_I)(long)(std::numeric_limits<int>::max());
+@@ -422,7 +422,7 @@
+ }
+ 
+ template<>
+-static inline bool coerce<unsigned int, cln::cl_I>(unsigned int& dst, const cln::cl_I& arg)
++inline bool coerce<unsigned int, cln::cl_I>(unsigned int& dst, const cln::cl_I& arg)
+ {
+ 	static const cln::cl_I cl_max_uint = 
+ 		(cln::cl_I)(unsigned long)(std::numeric_limits<unsigned int>::max());
diff --git a/sci-mathematics/ginac/ginac-1.3.7.ebuild b/sci-mathematics/ginac/ginac-1.3.7.ebuild
index eeb6ea2e75c2..8a38dc8b4ce3 100644
--- a/sci-mathematics/ginac/ginac-1.3.7.ebuild
+++ b/sci-mathematics/ginac/ginac-1.3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.3.7.ebuild,v 1.4 2007/10/23 19:22:17 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.3.7.ebuild,v 1.5 2008/04/01 14:45:11 markusle Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/ginac/ginac-1.4.1.ebuild b/sci-mathematics/ginac/ginac-1.4.1.ebuild
index 576c99805ed4..4b3d2044c33b 100644
--- a/sci-mathematics/ginac/ginac-1.4.1.ebuild
+++ b/sci-mathematics/ginac/ginac-1.4.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.4.1.ebuild,v 1.1 2008/01/11 09:54:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.4.1.ebuild,v 1.2 2008/04/01 14:45:11 markusle Exp $
+
+inherit eutils
 
 DESCRIPTION="C++ library and tools for symbolic calculations"
 SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/${P}.tar.bz2"
@@ -16,6 +18,12 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen media-gfx/transfig virtual/latex-base )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+}
+
 src_compile() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \