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

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

4 files changed, 26 insertions, 14 deletions

diff --git a/sci-mathematics/ginac/ChangeLog b/sci-mathematics/ginac/ChangeLog
index f8e3c3486dba..cbd045659860 100644
--- a/sci-mathematics/ginac/ChangeLog
+++ b/sci-mathematics/ginac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/ginac
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.45 2010/04/09 01:34:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.46 2010/05/25 16:48:12 xarthisius Exp $
+
+  25 May 2010; Kacper Kowalik <xarthisius@gentoo.org> ginac-1.5.7.ebuild,
+  +files/ginac-1.5.7-gcc45.patch:
+  Fix build with GCC-4.5 wrt bug 321411. Thanks Diego for report
 
 *ginac-1.5.7 (09 Apr 2010)
 
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 03f88d13c038..ef32fef2f38d 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ginac-1.5.1-pkgconfig.patch 340 RMD160 afa493de555a86c2aa2eff7251b8da272ed58c22 SHA1 f1418d8f2551d94140e86864b8fa45fb51b2d21e SHA256 bd1a63b67f1c1786e537992b50b9bb376a14be54971bd0ac8912a584f7f802d8
+AUX ginac-1.5.7-gcc45.patch 571 RMD160 81a4fe06629c827941c0cfc41eb71f25cf58bada SHA1 9361d1cfe823435072fab62a10fd5de8a79438cb SHA256 4f20fda304f7f06a9f745329112721531d4d5fdce0586dd3304404a983c90057
 DIST ginac-1.5.5.tar.bz2 997969 RMD160 99d96d49b42a425f90b8db4e9b76d0d38d190ea9 SHA1 cf3b18dc7f8a787821b80ab0411314c015bff84f SHA256 6e0c8d20a76316b8f9b1bb015babdfa0b4fe401a190a9d501fc0702647750956
 DIST ginac-1.5.6.tar.bz2 998303 RMD160 da872208a576b4c1a35cbf0c4d65b36e9a946e3d SHA1 2f65eae2cdda3fad6aa9ed8f1b54444e443ee5a0 SHA256 f06175f32e758279e963910087890c7109222975a7f7fcfe90fd4fec22d20e24
 DIST ginac-1.5.7.tar.bz2 998446 RMD160 bb826bcc0da06435ce4f1f287ba3729663e770b7 SHA1 defc247327017d43dc457f2c4490551186cc8a9a SHA256 cf59e63cb6e4db52c944b2d008056b93b05bdd09c04860c4ead2e9603602c7dd
 EBUILD ginac-1.5.5.ebuild 1687 RMD160 86fbb7702b5262bc27fe78c5fb9a8f2b82489a26 SHA1 531206f28ec6e9063c80ea8d426a4efceae1c00a SHA256 8202c03e50ae8b895e73124341ed1289f87e9fd5ec7baedaa8c0b08b4a004ca3
 EBUILD ginac-1.5.6.ebuild 1712 RMD160 8729c082c15b759076fa6b82e3b46b4b718ba50e SHA1 a11d6cd60013a18365ffd1c8d4b2c14210ee90e4 SHA256 1b31d98a1cac2dc1b905c7ad2c6cca3e9af57ffc93ba3acffdc2902b82f4dcd4
-EBUILD ginac-1.5.7.ebuild 1714 RMD160 37a668ba7abc5474a4c90b6ca57e459285647e25 SHA1 67f52d0ea640145c1fe25bbeaea0a4a453374723 SHA256 6e53f422227668fe73c286c32bdda897b1f5360c8c2fc232b8a6b4f0c5fb38ec
-MISC ChangeLog 7306 RMD160 20a94ada060847c0a39c7d5e62ff0a357b44508e SHA1 4ed072c97dd52cb4374aaee808e7137ec05a6af9 SHA256 9884b7a2ff011de872e67ce183ed0dba50bcf90a9c5da45b1150473b23f4d1dd
+EBUILD ginac-1.5.7.ebuild 1755 RMD160 7ae99c7c130fe3529d2a1338075e025bd0f499e7 SHA1 3837795e72201c8a88ecb2d3bb4ecd0b4b33ca11 SHA256 11c6d282777aae2bd4193c5fe36de2c779ef8a19ce3139b69dbaa5c4f546f0ff
+MISC ChangeLog 7482 RMD160 1a6d3a1e3474ce3d30e39400bb6765e4be32172b SHA1 2cb9bf4ed092d70ae781182d8b318a941c2b9dbf SHA256 e8c5e5d0c921af493babe5cf8fee06e94840ff2ccf5239cc9c72dcd555c45cc8
 MISC metadata.xml 582 RMD160 0f0b60e373c8fee0efbebb7b7fd2420e2052082e SHA1 7e2a04c2da42292f37e33d06fc2e15305687bcdf SHA256 a68adc59dd6641c75f663a7be278804746fc15f64707b2570ed88918c6f9ff33
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku+jxMACgkQ1ycZbhPLE2Cr5wCcD+mH3jUtekCoj01hsuhP0e1A
-tAwAn3xlxDnG8ThyXZaZoxla9SbJ7RL2
-=2fMt
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/ginac/files/ginac-1.5.7-gcc45.patch b/sci-mathematics/ginac/files/ginac-1.5.7-gcc45.patch
new file mode 100644
index 000000000000..df0a61d79f3c
--- /dev/null
+++ b/sci-mathematics/ginac/files/ginac-1.5.7-gcc45.patch
@@ -0,0 +1,16 @@
+Fixing build with gcc 4.5. 
+Upstream fix e22d2ed95925d870876c4fcd922ea2a9cfdbdab1
+
+http://bugs.gentoo.org/show_bug.cgi?id=321411
+
+--- ginac/function.pl
++++ ginac/function.pl
+@@ -1314,7 +1314,7 @@
+ 	
+ 	// No derivative defined? Then return abstract derivative object
+ 	if (opt.power_f == NULL)
+-		return (new power::power(*this, power_param))->setflag(status_flags::dynallocated |
++		return (new GiNaC::power(*this, power_param))->setflag(status_flags::dynallocated |
+ 	                                               status_flags::evaluated);
+ 
+ 	current_serial = serial;
diff --git a/sci-mathematics/ginac/ginac-1.5.7.ebuild b/sci-mathematics/ginac/ginac-1.5.7.ebuild
index 90f6918fceb3..359744e9777a 100644
--- a/sci-mathematics/ginac/ginac-1.5.7.ebuild
+++ b/sci-mathematics/ginac/ginac-1.5.7.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/sci-mathematics/ginac/ginac-1.5.7.ebuild,v 1.1 2010/04/09 01:34:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.5.7.ebuild,v 1.2 2010/05/25 16:48:12 xarthisius Exp $
 
 EAPI=2
 inherit eutils
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch
+	epatch "${FILESDIR}"/${P}-gcc45.patch
 }
 
 src_compile() {