sci-mathematics/freefem++: version bump and cleanup.

12 files changed, 25 insertions, 691 deletions

diff --git a/sci-mathematics/freefem++/ChangeLog b/sci-mathematics/freefem++/ChangeLog
index dc66dd66b..b36d62718 100644
--- a/sci-mathematics/freefem++/ChangeLog
+++ b/sci-mathematics/freefem++/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 September 2009; David Radice <david.e.pi.3.14@gmail.com>
+  +freefem++-3.5.ebuild, -freefem++-2.24.2-r3.ebuild, -freefem++-3.3.ebuild,
+  -freefem++-3.4.ebuild, -files/freefem++-3.4-mortar-DN-4.patch,
+  -files/freefem++-3.4-no-doc-autobuild.patch, -files/freefem++-P1-fix.patch,
+  -files/freefem++-gcc43.patch, -files/freefem++-no-x11r6-dir.patch,
+  -files/freefem++-texlive2008.patch:
+  Version bump and cleanup.
+
+*freefem++-3.5 (11 September 2009)
+
   15 August 2009; David Radice <david.e.pi.3.14@gmail.com>
   +freefem++-3.4.2.ebuild, +files/freefem++-3.4.2-no-doc-autobuild.patch:
   Version bump.
diff --git a/sci-mathematics/freefem++/Manifest b/sci-mathematics/freefem++/Manifest
index 96596232a..8bbcba024 100644
--- a/sci-mathematics/freefem++/Manifest
+++ b/sci-mathematics/freefem++/Manifest
@@ -1,19 +1,9 @@
-AUX freefem++-3.4-mortar-DN-4.patch 2605 RMD160 18265c433dcbebd394c1bad71ed1b030168c1588 SHA1 ae20646f490d7fffd319f171808c0e2fe869ce11 SHA256 695a8c65bcca9034ca283dd20d5301909e3aef6d0cf26a2e4a0ed891fd947ccb
-AUX freefem++-3.4-no-doc-autobuild.patch 1155 RMD160 39cc42211934298ec1dea2bb68fced68594277de SHA1 b40c9a7424b66eb737b9ebe1d689bea5b7077906 SHA256 c497606929d28a663c1ecb05af9a03b4395bbe3828889d9502c0b5a779cf2ff8
 AUX freefem++-3.4.2-no-doc-autobuild.patch 1155 RMD160 39cc42211934298ec1dea2bb68fced68594277de SHA1 b40c9a7424b66eb737b9ebe1d689bea5b7077906 SHA256 c497606929d28a663c1ecb05af9a03b4395bbe3828889d9502c0b5a779cf2ff8
-AUX freefem++-P1-fix.patch 793 RMD160 493ec623aae985130f0ad7d8a152d84844f24f6a SHA1 4a57fe0b7c1c39510e58a001d55e3027bd1d0d8a SHA256 6f228dca25c40658eddd183ab898f6e69e9503c5e40ae1b9de67881c3997685a
 AUX freefem++-acoptim.patch 663 RMD160 6294d436eaf8bdea7258b3ca704e5ff9f942f019 SHA1 0ebe27e991bdd3949d3bf671056a15ce23f4f29f SHA256 6d07f4cd1a061d401879e54568fbeb2a035951b50195dfd3b88b05086a87cbb7
-AUX freefem++-gcc43.patch 6566 RMD160 5d8dcb917ec2e5367eb04ddc25e083f6fbb36cfe SHA1 70e4e373d204ccc774d08557cc4ed366688dd6fc SHA256 b114df6f1079c8e7e8a2c393d6dc0c414c38c5c15fe3c4df7ec5c670e0628383
-AUX freefem++-no-doc-autobuild.patch 1764 RMD160 024cf96f74a32868018e2ce1daaa119bdc12fa5b SHA1 fed93164bb2b2be196ac32eb2ea0fae115bee024 SHA256 c3426957b1265ed6205b1cf6786f7b1319691445142276961c3f996ba566a9d2
-AUX freefem++-no-x11r6-dir.patch 401 RMD160 e655fee7b078162aa04e08289e8aceaa6663b884 SHA1 bbe3e6b32573abcb45e75b2a9844a5ee175d6694 SHA256 867136ede23c25a8e7ea61fa542e589c1f35a3d6a8a37658da0ced8a25d4bb26
-AUX freefem++-texlive2008.patch 984 RMD160 b22bc9a810b23b784e576658d4a971414cc3e190 SHA1 537fe8e3b5612424ed1b3d5e4335521560690419 SHA256 b84db5990298efa28b801a17493f2e75cd418f7921cc970ff5d46d11fcace698
-DIST freefem++-2.24-2.tar.gz 10974055 RMD160 db4ce51f42eabd00b0f85f37c0a3c9e1f126c17c SHA1 ea5968f49d4c9b682a6e09998c7bc254187de422 SHA256 58865bf6679c78c21448abd3c824b511f152e360e4c436368f36a9c54c0aeaf1
-DIST freefem++-3.3.tar.gz 12442706 RMD160 6b939b4cf99e32e4b248924ff3ce8b3b278a3425 SHA1 f5f0a8328f804d41ca753ec8a999935292af4d90 SHA256 51fbcebb233e2fa0ab15fe27bf359a5c73ec17da7048c11d1f2e828f4e928d47
+AUX freefem++-no-doc-autobuild.patch 1155 RMD160 39cc42211934298ec1dea2bb68fced68594277de SHA1 b40c9a7424b66eb737b9ebe1d689bea5b7077906 SHA256 c497606929d28a663c1ecb05af9a03b4395bbe3828889d9502c0b5a779cf2ff8
 DIST freefem++-3.4-2.tar.gz 18455053 RMD160 59cf1d9545a319b4bff032d65bdfaecde7ec061c SHA1 40748fcc8ce2ca6f4b4b6d954643bcdf1ca6d2d4 SHA256 70f92aa24aca17392b7e5f20cda5357769fec2f38e391406b6bc6d93ccdd5d2f
-DIST freefem++-3.4.tar.gz 18459941 RMD160 db159e38e5778fafd66290cc97e83dddad9d03d1 SHA1 0297913011221cc32c095bcd3d2c3b847d1a43b8 SHA256 9be90300b00bf78c9e416ea31c4ec8cd8a76dc5c452e0de39343c01a082037e5
-EBUILD freefem++-2.24.2-r3.ebuild 3585 RMD160 2ef387a12052df4248d9202a43b7cffd552174df SHA1 b453e77d841c19f16e483b0b9f7bfa1c327f6595 SHA256 ca322e94b12c872ad6f5987b3d37839aee5615e0ed4fa0525a035ed6ef863b23
-EBUILD freefem++-3.3.ebuild 3658 RMD160 0fffbe06c40563380dbaa644f98b7a2f2baf2367 SHA1 792c4fd3c80f93952a5ebbf53b77e695bf0c7e3d SHA256 ac477d5a55614c3bdb6a7a6e1370542cd2fdcca4423f1b71d193152624d1c4c3
+DIST freefem++-3.5.tar.gz 18472428 RMD160 3eccdd385566d470778d5a1fab494638f5bb1b85 SHA1 301fd85e72e7b4ca001fe20459ccde6d899b4895 SHA256 c67c859dc7e5b498fa52b5f7cf99e3325f6c2facf42afd5eb77e16f83192c687
 EBUILD freefem++-3.4.2.ebuild 3811 RMD160 9d0b4b98cb74be6e11b5f97155aa4cf1bdabd50a SHA1 ce0f0476a0c2d837ea2790d13d1d903ffffa204b SHA256 c772ec50a473d2ac61892df6d31fcfc508e0dcf7dbe7ba9f83abcd903f36c9ee
-EBUILD freefem++-3.4.ebuild 3888 RMD160 e52daad970cf5455eaffc2c95d69fa5b46b51f56 SHA1 5cf53b8717787eac227d251ec01b62cebef21e14 SHA256 cd33e75e4b2983fda1398684e1ff912ea972dba4aa4128ba1cd69a7229223a38
-MISC ChangeLog 2949 RMD160 2337cb0e80cfcd19ca14cbd78604489c42683cd8 SHA1 8f8469db4db03b63db861c48d53dcce705628908 SHA256 31780ef96a4cf1c53694e388da6060dbebb173e5112fa697b8438cceddbd6950
+EBUILD freefem++-3.5.ebuild 3812 RMD160 6585e04525b9930f3e6def487aa3a90b2419ce69 SHA1 9ffa27db61a3fa08326c9ea707413bd99c6182e0 SHA256 e366a74974ebde35712f85d72f076fca86ca9020396f4a62407001dee3411e6b
+MISC ChangeLog 3403 RMD160 3eb1a05a5bb6ad54a17cafae59654e9900c4e4ae SHA1 5ece500d253f90c03b0fbd3aa55cc0114d097148 SHA256 02201b3c0caaaa1e8bb3ca4e8cebd990257e6478c1655e00714401d6e9493fcc
 MISC metadata.xml 381 RMD160 17dca0ed77bf65c0d2d8aa2148243f67c4a05edf SHA1 f583b125502b06a151f200849e2892bd08dbc70e SHA256 d7569d977d779a55533651e01e4d45e5ae7a1ada36b634e8b988ae4db86cdb83
diff --git a/sci-mathematics/freefem++/files/freefem++-3.4-mortar-DN-4.patch b/sci-mathematics/freefem++/files/freefem++-3.4-mortar-DN-4.patch
deleted file mode 100644
index 59541d4a2..000000000
--- a/sci-mathematics/freefem++/files/freefem++-3.4-mortar-DN-4.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -urN freefem++-3.4.old/examples++-mpi/mortar-DN-4-mpi.edp freefem++-3.4.new/examples++-mpi/mortar-DN-4-mpi.edp
---- freefem++-3.4.old/examples++-mpi/mortar-DN-4-mpi.edp	2009-07-15 17:19:57.000000000 +0200
-+++ freefem++-3.4.new/examples++-mpi/mortar-DN-4-mpi.edp	2009-07-24 15:01:27.000000000 +0200
-@@ -1,6 +1,5 @@
- assert(version>=2.23);
--
--if ( mpisize  ) 
-+if ( mpisize != 4 ) 
-   {
-     cout << " sorry number of processeur !=4 " << endl;
-     exit(1);
-@@ -31,9 +30,20 @@
- if(mpirank==0)
-   {
-     
--    mesh Thacopy=square(NN,NN);
--    
--    
-+    mesh Thacopy; //hack to dcl Tha ouside of mortar-msh.hdp
-+    {  
-+      include "mortar-msh.hdp"  
-+	Thacopy=Tha;
-+      regsd=regi;
-+    }   
-+    Tha=Thacopy;
-+    cout << "mortar : " << endl;
-+    Thm=Tha;
-+    Thm=adaptmesh(Thm,meshsizem,IsMetric=1,thetamax=60);
-+    Thm=emptymesh(Thm);       Thmm=Thm;
-+    Thmm=trunc(Thm,split=4,1); // for fine integration
-+    Thmm=emptymesh(Thmm);
-+    plot(Thm,wait=0,ps="mortar-Thm.eps");
-   }
- 
- // send meshes 
-diff -urN freefem++-3.4.old/examples++-mpi/mortar-msh.hdp freefem++-3.4.new/examples++-mpi/mortar-msh.hdp
---- freefem++-3.4.old/examples++-mpi/mortar-msh.hdp	1970-01-01 01:00:00.000000000 +0100
-+++ freefem++-3.4.new/examples++-mpi/mortar-msh.hdp	2009-07-24 15:01:40.000000000 +0200
-@@ -0,0 +1,42 @@
-+// --- begin  meshes  building --------------
-+real[int] theta(nbsd+1),cost(nbsd),sint(nbsd);
-+
-+for (int i=0;i<nbsd;i++)
-+ {
-+  real t=i*2*pi/nbsd;
-+  theta[i]= t;
-+  theta[i+1]= (i+1)*2*pi/nbsd;
-+  cost[i]=cos(t);
-+  sint[i]=sin(t);
-+ }
-+
-+
-+border g1(t=0,1){x=cost[0]*t;y=sint[0]*t;label=1;};
-+border g2(t=0,1){x=cost[1]*t;y=sint[1]*t;label=1;};
-+border g3(t=0,1){x=cost[2]*t;y=sint[2]*t;label=1;};
-+border g4(t=0,1){x=cost[3]*t;y=sint[3]*t;label=1;};
-+
-+border e12(t=theta[0],theta[1]){x=cos(t);y=sin(t);label=labext;};
-+border e23(t=theta[1],theta[2]){x=cos(t);y=sin(t);label=labext;};
-+border e34(t=theta[2],theta[3]){x=cos(t);y=sin(t);label=labext;};
-+border e41(t=theta[3],theta[4]){x=cos(t);y=sin(t);label=labext;};
-+
-+ int Ng = 5;
-+ int Ne = 5 ;
-+
-+plot(g1(Ng)+g2(Ng)+g3(Ng)+g4(Ng) + e12(Ne) + e23(Ne)+ e34(Ne) + e41(Ne) ,wait=1);
-+
-+mesh Tha = buildmesh( g1(Ng)+g2(Ng)+g3(Ng)+g4(Ng) + e12(Ne) + e23(Ne)+ e34(Ne) + e41(Ne) );
-+
-+int [int] regi(4);
-+for (int i=0;i<4;i++)
-+  {
-+    real tt = (theta[i]+theta[i+1])*0.5;
-+    regi[i]=Tha(0.5*cos(tt),0.5*sin(tt)).region;
-+  }
-+
-+
-+Tha=adaptmesh(Tha,meshsize*3,IsMetric=1,thetamax=60,nbvx=100000);
-+Tha=adaptmesh(Tha,meshsize*1.5,IsMetric=1,thetamax=60,nbvx=100000);
-+Tha=adaptmesh(Tha,meshsize,IsMetric=1,thetamax=60,nbvx=100000);
-+
diff --git a/sci-mathematics/freefem++/files/freefem++-3.4-no-doc-autobuild.patch b/sci-mathematics/freefem++/files/freefem++-3.4-no-doc-autobuild.patch
deleted file mode 100644
index add003aea..000000000
--- a/sci-mathematics/freefem++/files/freefem++-3.4-no-doc-autobuild.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN freefem++-3.4.old/DOC/Makefile.am freefem++-3.4.new/DOC/Makefile.am
---- freefem++-3.4.old/DOC/Makefile.am	2009-07-15 17:19:57.000000000 +0200
-+++ freefem++-3.4.new/DOC/Makefile.am	2009-07-15 17:20:22.000000000 +0200
-@@ -1,4 +1,4 @@
--dist_pkgdata_DATA=$(DOCPDF)
-+all:
- documentation: $(DOCPDF) 
- docps:  $(DOCPS) $(DOCPSGZ) 
- docpdf: $(DOCPDF) 
-@@ -117,4 +117,4 @@
- 
- 
- # do not delete the copy figure to long to created 
--.PRECIOUS: $(CPFIGS_PDF) $(CPFIGS_EPS)
-\ No newline at end of file
-+.PRECIOUS: $(CPFIGS_PDF) $(CPFIGS_EPS)
-diff -urN freefem++-3.4.old/Makefile.am freefem++-3.4.new/Makefile.am
---- freefem++-3.4.old/Makefile.am	2009-07-15 17:19:57.000000000 +0200
-+++ freefem++-3.4.new/Makefile.am	2009-07-15 17:55:42.000000000 +0200
-@@ -147,10 +147,6 @@
- 
- # Native MacOS packaging
- # ----------------------
--install-exec-local:: 
--	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/$(VERSION)
--	tar cvf - $(FF_EXAMPLES_FILES)| (cd $(DESTDIR)$(pkgdatadir)/$(VERSION); tar xvf -)
--
- ListFiles-natives: .FORCE 
- #	echo COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION >$@	
- #	echo mode-mi-edp.zip >> $@
diff --git a/sci-mathematics/freefem++/files/freefem++-P1-fix.patch b/sci-mathematics/freefem++/files/freefem++-P1-fix.patch
deleted file mode 100644
index 258366b2d..000000000
--- a/sci-mathematics/freefem++/files/freefem++-P1-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN freefem++-2.24-2.old/src/femlib/FESpace.cpp freefem++-2.24-2.new/src/femlib/FESpace.cpp
---- freefem++-2.24-2.old/src/femlib/FESpace.cpp	2008-01-09 10:12:30.000000000 +0100
-+++ freefem++-2.24-2.new/src/femlib/FESpace.cpp	2008-12-04 15:37:07.000000000 +0100
-@@ -1193,7 +1193,7 @@
- { 
-    R u0(u(K(0))), u1(u(K(1))), u2(u(K(2)));
-    R r=0;
--   if (op==0)
-+   if (op==op_id)
-     {
-       R l0=1-PHat.x-PHat.y,l1=PHat.x,l2=PHat.y; 
-       r = u0*l0+u1*l1+l2*u2;
-@@ -1202,9 +1202,9 @@
-     { 
-        const Triangle & T=K.T;
-        R2 D0 = T.H(0) , D1 = T.H(1)  , D2 = T.H(2) ;
--       if (op==1)
-+       if (op==op_dx)
-          r =  D0.x*u0 + D1.x*u1 + D2.x*u2 ;
--        else 
-+        else if(op==op_dy) 
-          r =  D0.y*u0 + D1.y*u1 + D2.y*u2 ;
-     }
-  //  cout << r << "\t";
diff --git a/sci-mathematics/freefem++/files/freefem++-gcc43.patch b/sci-mathematics/freefem++/files/freefem++-gcc43.patch
deleted file mode 100644
index 60177fa4f..000000000
--- a/sci-mathematics/freefem++/files/freefem++-gcc43.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -up freefem++-2.23/src/Graphics/getprog-unix.hpp.gcc43 freefem++-2.23/src/Graphics/getprog-unix.hpp
---- freefem++-2.23/src/Graphics/getprog-unix.hpp.gcc43	2007-12-11 22:37:39.000000000 +0100
-+++ freefem++-2.23/src/Graphics/getprog-unix.hpp	2008-02-20 21:50:16.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <cstring>
- 
- extern long verbosity;
- 
-diff -up freefem++-2.23/src/Graphics/sansrgraph.cpp.gcc43 freefem++-2.23/src/Graphics/sansrgraph.cpp
-diff -up freefem++-2.23/src/Algo/LineSearch.hpp.gcc43 freefem++-2.23/src/Algo/LineSearch.hpp
---- freefem++-2.23/src/Algo/LineSearch.hpp.gcc43	2006-04-03 19:23:33.000000000 +0200
-+++ freefem++-2.23/src/Algo/LineSearch.hpp	2008-02-21 17:39:08.000000000 +0100
-@@ -30,7 +30,7 @@ public:
- 	typedef M Mat;
- 	typedef P Param;
- 	typedef V Vect;
--	typedef  NRJ<Param,Vect,VMat,Real> NRJ;
-+	typedef  NRJ<Param,Vect,VMat,Real> lsNRJ;
- 
- private:
-   //ne sert que si on calcule le gradient de mani?re num?rique
-@@ -57,7 +57,7 @@ protected:
-   // c'est du meme type que le gradient
-   Vect* step;
-   //pointer to the nrj
--  NRJ *	nrj;
-+  lsNRJ *	nrj;
-   
-   void appendSearchNumber();
-   
-@@ -65,7 +65,7 @@ public:
-   
-   //a constructor with pointer to the nrj and
-   //to the step if numerical gradient is computed
--  LineSearch(NRJ* f,Vect* interval = NULL);
-+  LineSearch(lsNRJ* f,Vect* interval = NULL);
-   virtual ~LineSearch();
- 
-   // point de d?part et direction de descente + des param?tres
-@@ -92,7 +92,7 @@ public:
- };
- 
- template <class P, class V,class M,class VM,class R>
--LineSearch<P,V,M,VM,R>::LineSearch(NRJ* p, Vect* interval )
-+LineSearch<P,V,M,VM,R>::LineSearch(lsNRJ* p, Vect* interval )
- {
-    iterMax 	= 	MAX_IT_LS;
-    iterNum 	= 	0;
-diff -up freefem++-2.23/src/Algo/CubicLS.hpp.gcc43 freefem++-2.23/src/Algo/CubicLS.hpp
---- freefem++-2.23/src/Algo/CubicLS.hpp.gcc43	2006-04-03 19:23:32.000000000 +0200
-+++ freefem++-2.23/src/Algo/CubicLS.hpp	2008-02-21 17:39:08.000000000 +0100
-@@ -31,12 +31,12 @@ class CubicLineSearch : public LS
-   typedef typename LS::Vect Vect;
-   typedef typename LS::VMat VMat;
-   typedef LS  LineSearch;
--  typedef NRJ<Param,Vect,VMat,Real> NRJ;
-+  typedef NRJ<Param,Vect,VMat,Real> clsNRJ;
- public:
-   //a constructor with the default delta
--  CubicLineSearch(NRJ* f, int iter);
-+  CubicLineSearch(clsNRJ* f, int iter);
-   //a constructor with the specified delta
--  CubicLineSearch(NRJ* f, int iter, Vect* delta);
-+  CubicLineSearch(clsNRJ* f, int iter, Vect* delta);
-    /*    The parameter $delta$ is not used by the line search 
-          itself. Rather it is used in the numerical computation
-          of the derivatives using centered differences. For
-@@ -65,13 +65,13 @@ public:
- };
- 
- template <class LS>
--CubicLineSearch<LS>::CubicLineSearch(NRJ* f, int it) 
-+CubicLineSearch<LS>::CubicLineSearch(clsNRJ* f, int it) 
- : LS(f)
- {	this->iterMax	=	it;
- }
- 
- template <class LS>
--CubicLineSearch<LS>::CubicLineSearch(NRJ* f, int it, Vect* interval)
-+CubicLineSearch<LS>::CubicLineSearch(clsNRJ* f, int it, Vect* interval)
- : LS(f,interval)
- {	this->iterMax	=	it;
- }
-diff -up freefem++-2.23/src/ide/testhighlight.cpp.gcc43 freefem++-2.23/src/ide/testhighlight.cpp
---- freefem++-2.23/src/ide/testhighlight.cpp.gcc43	2007-04-20 17:18:59.000000000 +0200
-+++ freefem++-2.23/src/ide/testhighlight.cpp	2008-02-21 17:39:08.000000000 +0100
-@@ -33,6 +33,7 @@ using namespace std;
- #include "hl_lexyacc.hpp"
- #include <iostream>
- #include <fstream>
-+#include <cstdlib>
- 
- extern int yydebug;
- 
-diff -up freefem++-2.23/src/ide/highlight.cpp.gcc43 freefem++-2.23/src/ide/highlight.cpp
---- freefem++-2.23/src/ide/highlight.cpp.gcc43	2006-09-29 22:30:15.000000000 +0200
-+++ freefem++-2.23/src/ide/highlight.cpp	2008-02-21 17:39:08.000000000 +0100
-@@ -31,6 +31,7 @@
- 
- #include <iostream>
- #include <cassert>
-+#include <cstring>
- using namespace std;
- #include "highlight.hpp"
- #include "hl_lexyacc.hpp"
-diff -up freefem++-2.23/src/ide/commands.cpp.gcc43 freefem++-2.23/src/ide/commands.cpp
---- freefem++-2.23/src/ide/commands.cpp.gcc43	2006-09-25 17:36:43.000000000 +0200
-+++ freefem++-2.23/src/ide/commands.cpp	2008-02-21 17:39:08.000000000 +0100
-@@ -32,6 +32,7 @@
- // together, or through sockets if they are separated.
- 
- #include <FL/Fl.H>
-+#include <cstdlib>
- #include "commands.hpp"
- #include "editor.hpp"
- #include "draw.hpp"
-diff -up freefem++-2.23/src/ide/socket.cpp.gcc43 freefem++-2.23/src/ide/socket.cpp
---- freefem++-2.23/src/ide/socket.cpp.gcc43	2006-09-29 22:30:15.000000000 +0200
-+++ freefem++-2.23/src/ide/socket.cpp	2008-02-21 17:39:08.000000000 +0100
-@@ -33,6 +33,7 @@
- 
- #include <iostream>
- #include <cassert>
-+#include <cstring>
- #include "socket.hpp"
- using namespace std;
- 
-diff -up freefem++-2.23/src/ide/spawn.cpp.gcc43 freefem++-2.23/src/ide/spawn.cpp
---- freefem++-2.23/src/ide/spawn.cpp.gcc43	2006-09-29 22:30:15.000000000 +0200
-+++ freefem++-2.23/src/ide/spawn.cpp	2008-02-21 17:39:08.000000000 +0100
-@@ -35,6 +35,7 @@
- #define SPAWN_HPP
- 
- #include <iostream>
-+#include <cstdlib>
- using namespace std;
- #include <cassert>
- #include <FL/Fl.H>
-diff -up freefem++-2.23/src/fflib/Serialize.hpp.gcc43 freefem++-2.23/src/fflib/Serialize.hpp
---- freefem++-2.23/src/fflib/Serialize.hpp.gcc43	2008-01-13 11:17:49.000000000 +0100
-+++ freefem++-2.23/src/fflib/Serialize.hpp	2008-02-20 20:57:33.000000000 +0100
-@@ -28,6 +28,8 @@
- #ifndef SERIALEZE_HPP_
- #define SERIALEZE_HPP_
- 
-+#include <cstring>
-+
- struct MPIrank;
-  class Serialize {  
-    // we store a refcounter in the pointer p a adresse p-sizeof(long)
-diff -up freefem++-2.23/src/femlib/fem.hpp.gcc43 freefem++-2.23/src/femlib/fem.hpp
---- freefem++-2.23/src/femlib/fem.hpp.gcc43	2008-01-17 18:00:42.000000000 +0100
-+++ freefem++-2.23/src/femlib/fem.hpp	2008-02-21 17:39:57.000000000 +0100
-@@ -5,6 +5,7 @@
- #include "Serialize.hpp"
- // some usefull function 
- 
-+#include <algorithm>
- 
- template<class K> class KN_;
- 
-@@ -132,7 +133,6 @@ inline R2 Maxc(const R3 & A,const R3& B,
- // def de numerotation dans un triangles direct sens (trigo)
- // the edge is oposite of the vertex
- ////  [3] is a edge
--#include <algorithm>
- //#include <Functional>
- struct SortedTriplet {
-     static const int  empty = -1;
-diff -up freefem++-2.23/src/femlib/MatriceCreuse_tpl.hpp.gcc43 freefem++-2.23/src/femlib/MatriceCreuse_tpl.hpp
---- freefem++-2.23/src/femlib/MatriceCreuse_tpl.hpp.gcc43	2007-12-12 18:12:37.000000000 +0100
-+++ freefem++-2.23/src/femlib/MatriceCreuse_tpl.hpp	2008-02-20 19:37:28.000000000 +0100
-@@ -4,6 +4,7 @@
- #include <set>
- #include <list>
- #include <map>
-+#include <limits>
- #endif
- 
- #ifndef __MWERKS__
diff --git a/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch b/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch
index 188db2589..add003aea 100644
--- a/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch
+++ b/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch
@@ -1,39 +1,23 @@
-diff -urN freefem++-3.3.old/DOC/Makefile.am freefem++-3.3.new/DOC/Makefile.am
---- freefem++-3.3.old/DOC/Makefile.am	2009-06-08 15:00:09.000000000 +0200
-+++ freefem++-3.3.new/DOC/Makefile.am	2009-06-08 15:08:15.000000000 +0200
-@@ -1,4 +1,3 @@
+diff -urN freefem++-3.4.old/DOC/Makefile.am freefem++-3.4.new/DOC/Makefile.am
+--- freefem++-3.4.old/DOC/Makefile.am	2009-07-15 17:19:57.000000000 +0200
++++ freefem++-3.4.new/DOC/Makefile.am	2009-07-15 17:20:22.000000000 +0200
+@@ -1,4 +1,4 @@
 -dist_pkgdata_DATA=$(DOCPDF)
++all:
  documentation: $(DOCPDF) 
  docps:  $(DOCPS) $(DOCPSGZ) 
  docpdf: $(DOCPDF) 
-@@ -117,4 +116,4 @@
+@@ -117,4 +117,4 @@
  
  
  # do not delete the copy figure to long to created 
 -.PRECIOUS: $(CPFIGS_PDF) $(CPFIGS_EPS)
 \ No newline at end of file
 +.PRECIOUS: $(CPFIGS_PDF) $(CPFIGS_EPS)
-diff -urN freefem++-3.3.old/Makefile.am freefem++-3.3.new/Makefile.am
---- freefem++-3.3.old/Makefile.am	2009-06-08 15:00:08.000000000 +0200
-+++ freefem++-3.3.new/Makefile.am	2009-06-08 15:01:22.000000000 +0200
-@@ -25,16 +25,6 @@
- 
- FF_MAC_PREFIX=FreeFem++v$(VERSION)$(ADD_PACKAGE_NAME)
- 
--FF_EXAMPLES_FILES = COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION \
--mode-mi-edp.zip \
--examples++-tutorial/aile.msh examples++-tutorial/xyf \
--examples++-3d/dodecaedre01.mesh  \
--examples++-load/load.link \
--./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh  \
--./download/fftw/Makefile ./download/fftw/Makefile.am \
--examples++/*.edp 
--
--
- # Creates a file named "ChangeLog" containing the chronology of all
- # modifications to the source files. Needs "cvs2cl" to be installed.
- 
-@@ -146,10 +136,6 @@
+diff -urN freefem++-3.4.old/Makefile.am freefem++-3.4.new/Makefile.am
+--- freefem++-3.4.old/Makefile.am	2009-07-15 17:19:57.000000000 +0200
++++ freefem++-3.4.new/Makefile.am	2009-07-15 17:55:42.000000000 +0200
+@@ -147,10 +147,6 @@
  
  # Native MacOS packaging
  # ----------------------
diff --git a/sci-mathematics/freefem++/files/freefem++-no-x11r6-dir.patch b/sci-mathematics/freefem++/files/freefem++-no-x11r6-dir.patch
deleted file mode 100644
index 096d791c4..000000000
--- a/sci-mathematics/freefem++/files/freefem++-no-x11r6-dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN freefem++-2.24-2.old/configure.ac freefem++-2.24-2.new/configure.ac
---- freefem++-2.24-2.old/configure.ac	2008-03-27 13:22:17.000000000 +0100
-+++ freefem++-2.24-2.new/configure.ac	2008-10-26 16:46:21.000000000 +0100
-@@ -331,10 +331,7 @@
- 
- if test "$ff_mingw" = no && test "$with_x" != "no";
- then
--	if test -d /usr/X11R6
--	then
--		ff_x11=yes
--	fi
-+	ff_x11=yes
- fi
- 
- AC_MSG_RESULT($ff_x11)
diff --git a/sci-mathematics/freefem++/files/freefem++-texlive2008.patch b/sci-mathematics/freefem++/files/freefem++-texlive2008.patch
deleted file mode 100644
index c33ad8cb7..000000000
--- a/sci-mathematics/freefem++/files/freefem++-texlive2008.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN freefem++-2.24-2.old/DOC/dessin.sty freefem++-2.24-2.new/DOC/dessin.sty
---- freefem++-2.24-2.old/DOC/dessin.sty	2009-04-12 18:05:17.000000000 +0200
-+++ freefem++-2.24-2.new/DOC/dessin.sty	2009-04-12 18:13:51.000000000 +0200
-@@ -1,10 +1,4 @@
--\newif\ifpdf
--\ifx\pdfoutput\undefined
--\pdffalse % we are not running PDFLaTeX
--\else
--\pdfoutput=1 % we are running PDFLaTeX
--\pdftrue
--\fi
-+\usepackage{ifpdf}
- 
- \ifpdf
- \usepackage[pdftex]{graphicx}
-diff -urN freefem++-2.24-2.old/DOC/styles.sty freefem++-2.24-2.new/DOC/styles.sty
---- freefem++-2.24-2.old/DOC/styles.sty	2009-04-12 18:05:07.000000000 +0200
-+++ freefem++-2.24-2.new/DOC/styles.sty	2009-04-12 18:13:35.000000000 +0200
-@@ -1,14 +1,6 @@
- 
- %\RequirePackage{everyshi}%
--\newif\ifpdf
--\pdffalse
--\@ifundefined{pdfoutput}{\message{-- no pdf -- }}{
--    \ifcase\pdfoutput
--    \message{-- no  pdf -- }
--    \else
--    \pdftrue
--    \message{--  ++ pdf -- }
--    \fi}
-+\usepackage{ifpdf}
- 
- \ifpdf
- \usepackage{pdfsync}
diff --git a/sci-mathematics/freefem++/freefem++-2.24.2-r3.ebuild b/sci-mathematics/freefem++/freefem++-2.24.2-r3.ebuild
deleted file mode 100644
index 6f5328e2c..000000000
--- a/sci-mathematics/freefem++/freefem++-2.24.2-r3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils autotools versionator flag-o-matic
-
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Solve PDEs using FEM on 2d domains"
-HOMEPAGE="http://www.freefem.org/ff++/"
-SRC_URI="http://www.freefem.org/ff%2B%2B/ftp/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples fltk mpi vim-syntax X"
-
-RDEPEND="sci-libs/fftw
-	virtual/cblas
-	virtual/lapack
-	sci-libs/umfpack
-	>=sci-libs/arpack-96-r2
-	vim-syntax? ( app-vim/freefem++-syntax )
-	X? (
-		x11-libs/libXpm
-		fltk? ( x11-libs/fltk )
-		)
-	mpi? ( virtual/mpi )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( virtual/latex-base media-gfx/imagemagick )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# acoptim.m4 forced -O2 removal
-	epatch "${FILESDIR}"/${PN}-acoptim.patch
-	# build an X11 version even if there is not an X11R6 directory
-	epatch "${FILESDIR}"/${PN}-no-x11r6-dir.patch
-	# fix building with gcc-4.3 (thanks to Dominik 'Rathann' Mierzejewsk)
-	epatch "${FILESDIR}"/${PN}-gcc43.patch
-	# backport a fix to a problem with P1 fespace
-	epatch "${FILESDIR}"/${PN}-P1-fix.patch
-	# fix documentation building with >=app-text/texlive-2008
-	epatch "${FILESDIR}"/${PN}-texlive2008.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	if use mpi; then
-		if has_version sys-cluster/mpich2 ; then
-			myconf="${myconf} --with-mpi=mpicxx"
-		else
-			myconf="${myconf} --with-mpi=mpiCC"
-		fi
-	else
-		myconf="--without-mpi"
-	fi
-
-	use fltk && append-cppflags $(fltk-config --cflags)
-
-	econf \
-		--disable-download \
-		--disable-optim \
-		--enable-generic \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
-		$(use_with fltk) \
-		$(use_with X x) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc; then
-		emake documentation || die "emake documentation failed"
-	fi
-}
-
-src_test() {
-	if use mpi; then
-		# This may depend on the used MPI implementation. It is needed
-		# with mpich2, but should not be needed with lam-mpi or mpich
-		# (if the system is configured correctly).
-		ewarn "Please check that your MPI root ring is on before running"
-		ewarn "the test phase. Failing to start it before that phase may"
-		ewarn "result in a failing emerge."
-		epause
-	fi
-	emake -j1 check || die "check test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use fltk; then
-		einfo "\"FreeFem++-ide\" is not intended for user use."
-		einfo "Use the \"FreeFem++-cs\" command to access the IDE."
-		einfo
-	fi
-
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins DOC/freefem++doc.pdf || die
-	fi
-
-	if use examples; then
-		einfo "Installing examples..."
-
-		# Remove compiled examples:
-		emake clean || die "emake clean failed"
-
-		einfo "Some of the installed examples assumes that the user has write"
-		einfo "permissions in the working directory and other will look for"
-		einfo "data files in the working directory. For this reason in order to"
-		einfo "run the examples it's better to temporary copy them somewhere"
-		einfo "in the user folder. For example to run the tutorial examples"
-		einfo "it's better to copy the entire examples++-tutorial folder into"
-		einfo "the user directory."
-		doins regtests.sh
-
-		# Install the needed headers with examples++-load
-		tar -xzhf examples++-load/include.tar.gz -C examples++-load
-		rm -f examples++-load/._*
-		rm examples++-load/include.tar.gz
-
-		rm -f examples*/Makefile*
-		doins -r examples*
-	fi
-}
diff --git a/sci-mathematics/freefem++/freefem++-3.3.ebuild b/sci-mathematics/freefem++/freefem++-3.3.ebuild
deleted file mode 100644
index bafcd62c1..000000000
--- a/sci-mathematics/freefem++/freefem++-3.3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils autotools versionator flag-o-matic mpi
-
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Solve PDEs using FEM on 2d and 3d domains"
-HOMEPAGE="http://www.freefem.org/ff++/"
-SRC_URI="http://www.freefem.org/ff%2B%2B/ftp/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples mpi opengl vim-syntax X"
-
-RDEPEND="sci-libs/fftw
-	virtual/cblas
-	virtual/lapack
-	sci-libs/umfpack
-	>=sci-libs/arpack-96-r2
-	mpi? ( $(mpi_pkg_deplist) )
-	opengl? (
-		virtual/glut
-		virtual/opengl
-		)
-	vim-syntax? ( app-vim/freefem++-syntax )
-	X? (
-		media-fonts/font-misc-misc
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXxf86vm
-		)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? (
-		virtual/latex-base
-		media-gfx/imagemagick
-		)"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# acoptim.m4 forced -O2 removal
-	epatch "${FILESDIR}"/${PN}-acoptim.patch
-	# do not try to do a forced "manual" installation of 
-	# examples and documentation
-	epatch "${FILESDIR}"/${PN}-no-doc-autobuild.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	if use mpi; then
-		myconf="${myconf} --with-mpi=$(mpi_pkg_cxx)"
-	else
-		myconf="--without-mpi"
-	fi
-
-	econf \
-		--disable-download \
-		--disable-optim \
-		--enable-generic \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
-		$(use_enable opengl) \
-		$(use_with X x) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc; then
-		emake documentation || die "emake documentation failed"
-	fi
-}
-
-src_test() {
-	if use mpi; then
-		# This may depend on the used MPI implementation. It is needed
-		# with mpich2, but should not be needed with lam-mpi or mpich
-		# (if the system is configured correctly).
-		ewarn "Please check that your MPI root ring is on before running"
-		ewarn "the test phase. Failing to start it before that phase may"
-		ewarn "result in a failing emerge."
-		epause
-	fi
-	emake -j1 check || die "check test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Fixing freefem++.pref
-	dodir /etc
-	cat > "${D}"/etc/freefem++.pref <<EOF
-loadpath += "./"
-loadpath += "/usr/lib/${PN}"
-EOF
-	rm "${D}"/usr/lib/ff++/${MY_PV}/etc/freefem++.pref
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}/etc
-
-	# Move the libraries to the right location
-	dodir /usr/lib/${PN}
-	mv "${D}"/usr/lib/ff++/${MY_PV}/lib/* "${D}"/usr/lib/${PN}
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}/lib
-
-	# Move the headers to the right location
-	dodir /usr/include/${PN}
-	mv "${D}"/usr/lib/ff++/${MY_PV}/include/* "${D}"/usr/include/${PN}
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}/include
-
-	# Remove empty directory tree
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}
-	rmdir "${D}"/usr/lib/ff++
-
-	dodoc AUTHORS INNOVATION HISTORY* README
-
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins DOC/freefem++doc.pdf || die
-	fi
-
-	if use examples; then
-		einfo "Installing examples..."
-
-		# Remove compiled examples:
-		emake clean || die "emake clean failed"
-
-		einfo "Some of the installed examples assumes that the user has write"
-		einfo "permissions in the working directory and other will look for"
-		einfo "data files in the working directory. For this reason in order to"
-		einfo "run the examples it's better to temporary copy them somewhere"
-		einfo "in the user folder. For example to run the tutorial examples"
-		einfo "it's better to copy the entire examples++-tutorial folder into"
-		einfo "the user directory."
-
-		rm -f examples*/Makefile*
-		doins -r examples*
-	fi
-}
diff --git a/sci-mathematics/freefem++/freefem++-3.4.ebuild b/sci-mathematics/freefem++/freefem++-3.5.ebuild
index 3b0e25422..d8dd73a17 100644
--- a/sci-mathematics/freefem++/freefem++-3.4.ebuild
+++ b/sci-mathematics/freefem++/freefem++-3.5.ebuild
@@ -57,9 +57,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-acoptim.patch
 	# do not try to do a forced "manual" installation of
 	# examples and documentation
-	epatch "${FILESDIR}"/${P}-no-doc-autobuild.patch
-	# Fix mortar-DN-4 in testsuite
-	epatch "${FILESDIR}"/${P}-mortar-DN-4.patch
+	epatch "${FILESDIR}"/${PN}-no-doc-autobuild.patch
 
 	eautoreconf
 }