Added patch to allow compilation with gcc-4.3.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686

4 files changed, 101 insertions, 17 deletions

diff --git a/sci-calculators/fung-calc/ChangeLog b/sci-calculators/fung-calc/ChangeLog
index ad5592330262..8ee3c14e3910 100644
--- a/sci-calculators/fung-calc/ChangeLog
+++ b/sci-calculators/fung-calc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/fung-calc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/ChangeLog,v 1.12 2008/04/25 13:39:49 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/ChangeLog,v 1.13 2008/08/16 11:26:27 markusle Exp $
+
+  16 Aug 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/fung-calc-1.3.2b-gcc4.3.patch, fung-calc-1.3.2b.ebuild:
+  Added patch to allow compilation with gcc-4.3.
 
   25 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> fung-calc-1.3.2b.ebuild:
   Quote FILESDIR.
diff --git a/sci-calculators/fung-calc/Manifest b/sci-calculators/fung-calc/Manifest
index 5a5e559b6743..05edbc175a5f 100644
--- a/sci-calculators/fung-calc/Manifest
+++ b/sci-calculators/fung-calc/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fung-calc-1.3.2b-configure.patch 3567 RMD160 c8baf289570c98c81463f85c3a32cfa34ccc995f SHA1 a48c480e109a154828e2688e9e07843e052734dd SHA256 1bf210d48d142a2442eb90b8323332f426f34583d8c16550b4575b9ba940f1f5
+AUX fung-calc-1.3.2b-gcc4.3.patch 3991 RMD160 066ea8131c8fb23f5cfd905d1e8e23a556533878 SHA1 ae2afb33a2a9964c2e3f48bd0efff8db016ecf87 SHA256 94634f198ecfe936993319d239adea53bfd8992126b3b6143bedd6d6f4ed688a
 AUX fung-calc-fPIC 1150 RMD160 305e3409efbe8ca72898f44847c23228dd33f423 SHA1 2a6457849e9092f60111b9f44e51acd0c872a764 SHA256 4282e21eed4c4ac3fcc69610bfaca3eccb40a4c531d64a2375f8b7f89dac3f6d
 AUX fung-calc-gcc34-fix 679 RMD160 849ea20dd09ec08cb3cf6263b47ee6a3aa4e4002 SHA1 1d61ec585cf72906acdae474d3a5bdf4e96e482e SHA256 3144b8d4b66cc04391ffed7594872d1cb7c37f0e90179c5546c3fd98185ecd6a
 DIST fung-calc-1.3.2b.tar.gz 1123189 RMD160 7c2928648f1eb8bfdf303586f7cc90b60538b7cc SHA1 4e618daebe964c9a12114cd2ab4f284e10829829 SHA256 644a9c776aafe4634bb345524fcea2f68d283e990e09a885dc574f67c7cee9ad
-EBUILD fung-calc-1.3.2b.ebuild 980 RMD160 fc01faf9115babc5b24b7d41deca14eb1fb165a9 SHA1 72334d9e068f457e6c26083ea89b25f1ce38b0b3 SHA256 921678df998f8dcf1ad70663e566cb2a208e781cfedb81b5e81d1022eec9f145
-MISC ChangeLog 3341 RMD160 259c919f9160d328f7e29757ac56db7f0d26ffa5 SHA1 df8c2dcad8a19e511cf1eedfc3a7d52c08a5c073 SHA256 4014fa34c91f5791ba83ca7cf47253852c59725b4781c5821f0e734559e49bf8
+EBUILD fung-calc-1.3.2b.ebuild 1002 RMD160 63c6d9dcbc144d2a462b5aed868921b3f289b809 SHA1 ce6aa6c676a440056db952e0823a5267de1b07f2 SHA256 dd492d0e86c4e1528e5b9284562e209a6ba1790ff58efd6cec3882d59b96f53c
+MISC ChangeLog 3511 RMD160 c8cec191994256fc977a791f4d3e6d0d7cd6ec09 SHA1 2a58fa3da3a785a5e49b1b9d7c809aaa672f2a27 SHA256 bcd4b720fad6f48a86db72808d62f8533cd45f4519590bae3bfdb364078e2560
 MISC metadata.xml 173 RMD160 2c44d67bec5e1a71d69b0d047235439817109d99 SHA1 ed014e13b4663db94fbe01400a2b9d615ffe6447 SHA256 54c85281e6ed7a935800439f474ea006370b24c1fe3e821ee57f17f02f714785
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgR3w0ACgkQB18eXLOpYdlccACfZunDKm0r6aHf/9cb+d2BeEgL
-BpYAoKz8u9Ois6XGwRGOMHp1k3cQv87K
-=Uq8P
------END PGP SIGNATURE-----
diff --git a/sci-calculators/fung-calc/files/fung-calc-1.3.2b-gcc4.3.patch b/sci-calculators/fung-calc/files/fung-calc-1.3.2b-gcc4.3.patch
new file mode 100644
index 000000000000..fcfbdbeec169
--- /dev/null
+++ b/sci-calculators/fung-calc/files/fung-calc-1.3.2b-gcc4.3.patch
@@ -0,0 +1,88 @@
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/densityplotmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/densityplotmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/densityplotmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/densityplotmain.ui.h	2008-08-16 07:12:01.000000000 -0400
+@@ -7,6 +7,7 @@
+ *****************************************************************************/
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/functiongraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/functiongraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/functiongraphmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/functiongraphmain.ui.h	2008-08-16 07:10:05.000000000 -0400
+@@ -7,6 +7,7 @@
+ *****************************************************************************/
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/parametricgraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/parametricgraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/parametricgraphmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/parametricgraphmain.ui.h	2008-08-16 07:10:40.000000000 -0400
+@@ -7,6 +7,7 @@
+ *****************************************************************************/
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/polargraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/polargraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/polargraphmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/polargraphmain.ui.h	2008-08-16 07:09:27.000000000 -0400
+@@ -7,6 +7,7 @@
+ *****************************************************************************/
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/statplotgraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/statplotgraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/statplotgraphmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/statplotgraphmain.ui.h	2008-08-16 07:10:53.000000000 -0400
+@@ -8,6 +8,7 @@
+ 
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include <qbuttongroup.h>
+ #include <qmessagebox.h>
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/3D/glcylindricalgraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/3D/glcylindricalgraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/3D/glcylindricalgraphmain.ui.h	2003-07-16 00:59:44.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/3D/glcylindricalgraphmain.ui.h	2008-08-16 07:16:35.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/3D/glfunctiongraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/3D/glfunctiongraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/3D/glfunctiongraphmain.ui.h	2003-07-16 00:59:44.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/3D/glfunctiongraphmain.ui.h	2008-08-16 07:16:32.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/3D/glpolargraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/3D/glpolargraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/3D/glpolargraphmain.ui.h	2003-07-16 00:59:44.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/3D/glpolargraphmain.ui.h	2008-08-16 07:16:28.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
diff --git a/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild b/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild
index eb6361d94f8d..41c327138b69 100644
--- a/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild
+++ b/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild,v 1.11 2008/04/25 13:39:49 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild,v 1.12 2008/08/16 11:26:27 markusle Exp $
 
 inherit kde eutils flag-o-matic
 
@@ -25,9 +25,10 @@ need-qt 3.1
 src_unpack() {
 	kde_src_unpack
 
-	epatch "${FILESDIR}"/fung-calc-fPIC
-	epatch "${FILESDIR}"/fung-calc-gcc34-fix
-	use arts || epatch "${FILESDIR}"/fung-calc-1.3.2b-configure.patch
+	epatch "${FILESDIR}"/${PN}-fPIC
+	epatch "${FILESDIR}"/${PN}-gcc34-fix
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+	use arts || epatch "${FILESDIR}"/${P}-configure.patch
 }
 
 src_compile() {