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

Package-Manager: portage-2.1.4.4

5 files changed, 42 insertions, 7 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/Manifest b/sci-mathematics/ginac/Manifest
index 4ff8ffdbbd45..c5c48c82af35 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,6 +1,7 @@
+AUX ginac-1.4.1-gcc4.3.patch 902 RMD160 de2c683802e77277679b1ea2ee5dfae5278d247d SHA1 6bddc2865eb1353bb304718a7392c252ff4aa256 SHA256 7c507525ba2b16a042783df797f8d3a356bfd442b2b97ba4b8fa588f3e949c9c
 DIST ginac-1.3.7.tar.bz2 793441 RMD160 04ce8fce6e7aba29835a5a8d925b2a6ea630d9cc SHA1 5c6d4ebe3d80de835a456cb8e0853ece0847df26 SHA256 a550af7f970ce93651b63951b0a1d013f264204cd82774d0984c7b5f89c8815a
 DIST ginac-1.4.1.tar.bz2 918853 RMD160 d8176a01d8fead372b8427c1bc7f67aca143a17a SHA1 5120bc8fcf43c42e3b49b66d0bebef26e5c697bb SHA256 f1e673b8c411afa3f35062b0f266eb4aeeabebe5126175d311794f9bd8a2c7c8
-EBUILD ginac-1.3.7.ebuild 576 RMD160 35a8548c15919503dccca481a7103ec224a1fbc5 SHA1 36e4237d249322e556925d9f52d4bea513db9813 SHA256 1f6d772065c97f47d3ee6f7ce1f04e3fc008e7b94b7048da4a0635dc3fb5df09
-EBUILD ginac-1.4.1.ebuild 1078 RMD160 979a1883fba3dfe05905cde341a6a44f7853e26a SHA1 1916e4fb27803d777d943e7a17d664b56bdbeaca SHA256 91d8dd3b1ef38dbcf7858e24d6f2f2f411b11f5bce0dc4b43e573848435edb4f
-MISC ChangeLog 3474 RMD160 41c9b7ca2099ce5169c21ce2af3693c9310ca313 SHA1 7a9337b1048c1aceb940c21a429188716bfa9e85 SHA256 f2955d6e9ff087d8d4453e437649d0a874dd3232cb2a5450310dde57f079fc27
+EBUILD ginac-1.3.7.ebuild 580 RMD160 52471984e197c41b55c308d337c2d32a132454e2 SHA1 f658a36200acc824e71345447a14e994152fd43c SHA256 83e220e3dfcae96d3aa716c07f93d4e1a0f1c140e97cb09ca9f519451cec6dd4
+EBUILD ginac-1.4.1.ebuild 1176 RMD160 f87fe7ed2510c56a176b91d869d76574a8633940 SHA1 729b011ac6864d325c63dc07f3d9743f90800d13 SHA256 d41cd003b492495c19f6828ef2c5b6d58c31c4dae4d2388f33f5fc948c533924
+MISC ChangeLog 3689 RMD160 f54f3e4e1a062ff13a8f34aa12a055851f1866f6 SHA1 e886d8f8f505ecbdf5af8b4d3c7f77cf25f2e1a2 SHA256 a5351f41d626dc10a65324cf7020b84a51489a43dab7e2f8c89aa9d45ca8f262
 MISC metadata.xml 582 RMD160 0f0b60e373c8fee0efbebb7b7fd2420e2052082e SHA1 7e2a04c2da42292f37e33d06fc2e15305687bcdf SHA256 a68adc59dd6641c75f663a7be278804746fc15f64707b2570ed88918c6f9ff33
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} \