sci-mathematics/freefem++: fix dependencies for document building, cleanup old files for freefem++-3.2.

8 files changed, 164 insertions, 63 deletions

diff --git a/sci-mathematics/freefem++/ChangeLog b/sci-mathematics/freefem++/ChangeLog
index 2c682832f..511a063ed 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: $
 
+  24 July 2009; David Radice <david.e.pi.3.14@gmail.com>
+  +freefem++-3.4.ebuild, +files/freefem++-3.4-mortar-DN-4.patch,
+  +files/freefem++-3.4-no-doc-autobuild.patch, -freefem++-3.2.ebuild,
+  -files/freefem++-lamboot.patch, -files/freefem++-make-clean.patch,
+  -files/freefem++-opengl-automagic.patch:
+  Version bump, fix dependencies for document building, cleanup
+  old files for freefem++-3.2.
+
+*freefem++-3.4 (24 July 2009)
+
   13 June 2009; David Radice <david.e.pi.3.14@gmail.com>
   +freefem++-3.3.ebuild, +files/freefem++-no-doc-autobuild.patch:
   Version bump, now FHS compliant.
diff --git a/sci-mathematics/freefem++/Manifest b/sci-mathematics/freefem++/Manifest
index 3772bd770..50da5d975 100644
--- a/sci-mathematics/freefem++/Manifest
+++ b/sci-mathematics/freefem++/Manifest
@@ -1,17 +1,16 @@
+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++-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++-lamboot.patch 542 RMD160 29738d41470dcfda4f37113be53e8b4528a560bc SHA1 40f04c7c0e4255719213ae4fe00e101904ce03b0 SHA256 806bc6192bc229800a993a8ecf0870c6e601360c1a3de06367cd7d33c38a09ca
-AUX freefem++-make-clean.patch 404 RMD160 ab35d51de0acb9ade03120e8d6743ac98035ff36 SHA1 7fc01b056c6c872071d097ef7f4741d3d0bb4d50 SHA256 018de46dcf56b404959c150afc7db66e7180664ea818b7b3e35ddcd3a197cfc8
 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++-opengl-automagic.patch 744 RMD160 472964c5874582e56bcc7f5be6d43350ef17267e SHA1 bb60e97e2408b8663a2927a51f2d7ab497726429 SHA256 7b5c83b4a92702b66c44f5553f5f8b4639d271a498d95886a12a2ce7f17e9f7a
 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.2.tar.gz 12443524 RMD160 05284d65e35d2da77ff55ba5ac6c40270adaa0fc SHA1 f9d99d8a744a2be19d180530dc40403a2e2ff652 SHA256 9c2fbef5b738d1c9c7e0158b2c07cd227bdffcc4ca66ae3b1a4267cf653d047f
 DIST freefem++-3.3.tar.gz 12442706 RMD160 6b939b4cf99e32e4b248924ff3ce8b3b278a3425 SHA1 f5f0a8328f804d41ca753ec8a999935292af4d90 SHA256 51fbcebb233e2fa0ab15fe27bf359a5c73ec17da7048c11d1f2e828f4e928d47
+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.2.ebuild 3203 RMD160 bea96c52c05492bd50f68354b6115cc20889084c SHA1 2e188de3b1ce208f7c3d7e52fe6f243f678abf5e SHA256 90588b72dc11bca24be74f9a381e531f58052132e711bdff1ef4f31937f050cd
 EBUILD freefem++-3.3.ebuild 3658 RMD160 0fffbe06c40563380dbaa644f98b7a2f2baf2367 SHA1 792c4fd3c80f93952a5ebbf53b77e695bf0c7e3d SHA256 ac477d5a55614c3bdb6a7a6e1370542cd2fdcca4423f1b71d193152624d1c4c3
-MISC ChangeLog 2368 RMD160 2cdcba33dc862ca3c9947df28fae6c41d9858274 SHA1 89ea5dd9e5f2854df7e12f1d092ebd29b941ee10 SHA256 bea4740133859a26d15da801237fcc4714f4b306f013a2d5e825380aa2165eeb
+EBUILD freefem++-3.4.ebuild 3888 RMD160 e52daad970cf5455eaffc2c95d69fa5b46b51f56 SHA1 5cf53b8717787eac227d251ec01b62cebef21e14 SHA256 cd33e75e4b2983fda1398684e1ff912ea972dba4aa4128ba1cd69a7229223a38
+MISC ChangeLog 2799 RMD160 2bdcface8d0177cad84c7393119c57e0ef11807d SHA1 f15195104605c2fabe10b9c0257258b53a298ee3 SHA256 6a3a247b43456261696f52bda0ae9702080b11035c6ff452f5095e53c4b05b5f
 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
new file mode 100644
index 000000000..59541d4a2
--- /dev/null
+++ b/sci-mathematics/freefem++/files/freefem++-3.4-mortar-DN-4.patch
@@ -0,0 +1,81 @@
+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
new file mode 100644
index 000000000..add003aea
--- /dev/null
+++ b/sci-mathematics/freefem++/files/freefem++-3.4-no-doc-autobuild.patch
@@ -0,0 +1,30 @@
+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++-lamboot.patch b/sci-mathematics/freefem++/files/freefem++-lamboot.patch
deleted file mode 100644
index 0de0e0e6b..000000000
--- a/sci-mathematics/freefem++/files/freefem++-lamboot.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN freefem++-3.2.old/regtests.sh freefem++-3.2.new/regtests.sh
---- freefem++-3.2.old/regtests.sh	2008-11-25 17:21:06.000000000 +0100
-+++ freefem++-3.2.new/regtests.sh	2009-05-24 16:51:49.000000000 +0200
-@@ -76,7 +76,7 @@
-     if [ $mpich -ne 0 ] ; then
-     dotest "mpirun -np $nprocs -machinefile machinefile ${PROGLOC}/mpi/FreeFem++-mpi${EXEEXT}" mpi $script
-     else
--    lamboot 
-+	[[ -f "$(which lamboot 2>/dev/null)" ]] && lamboot	
-      dotest "mpirun -np $nprocs ${PROGLOC}/mpi/FreeFem++-mpi${EXEEXT}" mpi $script
-     fi
- fi
diff --git a/sci-mathematics/freefem++/files/freefem++-make-clean.patch b/sci-mathematics/freefem++/files/freefem++-make-clean.patch
deleted file mode 100644
index 4f3478637..000000000
--- a/sci-mathematics/freefem++/files/freefem++-make-clean.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN freefem++-3.2.old/download/fftw/Makefile freefem++-3.2.new/download/fftw/Makefile
---- freefem++-3.2.old/download/fftw/Makefile	2009-04-30 09:52:57.000000000 +0200
-+++ freefem++-3.2.new/download/fftw/Makefile	2009-05-24 16:43:03.000000000 +0200
-@@ -40,6 +40,8 @@
- $(PKGDIR)/$(PACKAGE):
- 	cd $(PKGDIR); $(WGET)  $(SERVER)/$(PACKAGE)
- 
-+clean: clean-local
-+
- clean-local:
- 	-rm -rf fftw-* FAIT 
- 
diff --git a/sci-mathematics/freefem++/files/freefem++-opengl-automagic.patch b/sci-mathematics/freefem++/files/freefem++-opengl-automagic.patch
deleted file mode 100644
index 79834d89f..000000000
--- a/sci-mathematics/freefem++/files/freefem++-opengl-automagic.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN freefem++-3.2.old/configure.ac freefem++-3.2.new/configure.ac
---- freefem++-3.2.old/configure.ac	2009-05-13 16:11:44.000000000 +0200
-+++ freefem++-3.2.new/configure.ac	2009-05-24 17:36:34.000000000 +0200
-@@ -403,7 +403,12 @@
- ff_glx_ok=no
- ff_agl_ok=no
- ff_libs="$LIBS"
-+AC_ARG_WITH(flib,[  --with-flib= the fortran library ])
-+AC_ARG_ENABLE([opengl],AS_HELP_STRING([--enable-opengl],
-+                                      [Enable/disable support for OpenGL]))
-+
- # echo "  .... LIBS = $LIBS .... " 
-+if test x$enable_opengl != xno; then
- # GL libraries seem to depend on some dlopen capabilities
- if test "$enable_static" != yes -a "$ff_glut_ok" != yes
- then
-@@ -476,6 +481,7 @@
-     
- 
- fi
-+fi
- 
- if test "$ff_glut_ok" = yes
- then
diff --git a/sci-mathematics/freefem++/freefem++-3.2.ebuild b/sci-mathematics/freefem++/freefem++-3.4.ebuild
index 8598f2092..3b0e25422 100644
--- a/sci-mathematics/freefem++/freefem++-3.2.ebuild
+++ b/sci-mathematics/freefem++/freefem++-3.4.ebuild
@@ -37,6 +37,13 @@ RDEPEND="sci-libs/fftw
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? (
+		|| (
+			(
+				dev-texlive/texlive-latexrecommended
+				dev-texlive/texlive-latexextra
+			)
+			app-text/ptex
+			)
 		virtual/latex-base
 		media-gfx/imagemagick
 		)"
@@ -46,16 +53,13 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# fix opengl automagic dependency
-	epatch "${FILESDIR}"/${PN}-opengl-automagic.patch
 	# 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 make clean
-	epatch "${FILESDIR}"/${PN}-make-clean.patch
-	# do not run lamboot on systems with other MPI implementations
-	epatch "${FILESDIR}"/${PN}-lamboot.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
 
 	eautoreconf
 }
@@ -103,6 +107,32 @@ src_test() {
 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}/idp
+	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
@@ -121,7 +151,6 @@ src_install() {
 		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
 
 		rm -f examples*/Makefile*
 		doins -r examples*