sci-mathematics/freefem++: version bump.

4 files changed, 194 insertions, 1 deletions

diff --git a/sci-mathematics/freefem++/ChangeLog b/sci-mathematics/freefem++/ChangeLog
index 511a063ed..dc66dd66b 100644
--- a/sci-mathematics/freefem++/ChangeLog
+++ b/sci-mathematics/freefem++/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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.
+
   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,
diff --git a/sci-mathematics/freefem++/Manifest b/sci-mathematics/freefem++/Manifest
index 50da5d975..96596232a 100644
--- a/sci-mathematics/freefem++/Manifest
+++ b/sci-mathematics/freefem++/Manifest
@@ -1,5 +1,6 @@
 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
@@ -8,9 +9,11 @@ AUX freefem++-no-x11r6-dir.patch 401 RMD160 e655fee7b078162aa04e08289e8aceaa6663
 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
+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
+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 2799 RMD160 2bdcface8d0177cad84c7393119c57e0ef11807d SHA1 f15195104605c2fabe10b9c0257258b53a298ee3 SHA256 6a3a247b43456261696f52bda0ae9702080b11035c6ff452f5095e53c4b05b5f
+MISC ChangeLog 2949 RMD160 2337cb0e80cfcd19ca14cbd78604489c42683cd8 SHA1 8f8469db4db03b63db861c48d53dcce705628908 SHA256 31780ef96a4cf1c53694e388da6060dbebb173e5112fa697b8438cceddbd6950
 MISC metadata.xml 381 RMD160 17dca0ed77bf65c0d2d8aa2148243f67c4a05edf SHA1 f583b125502b06a151f200849e2892bd08dbc70e SHA256 d7569d977d779a55533651e01e4d45e5ae7a1ada36b634e8b988ae4db86cdb83
diff --git a/sci-mathematics/freefem++/files/freefem++-3.4.2-no-doc-autobuild.patch b/sci-mathematics/freefem++/files/freefem++-3.4.2-no-doc-autobuild.patch
new file mode 100644
index 000000000..add003aea
--- /dev/null
+++ b/sci-mathematics/freefem++/files/freefem++-3.4.2-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++/freefem++-3.4.2.ebuild b/sci-mathematics/freefem++/freefem++-3.4.2.ebuild
new file mode 100644
index 000000000..c94d04790
--- /dev/null
+++ b/sci-mathematics/freefem++/freefem++-3.4.2.ebuild
@@ -0,0 +1,156 @@
+# 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? (
+		|| (
+			(
+				dev-texlive/texlive-latexrecommended
+				dev-texlive/texlive-latexextra
+			)
+			app-text/ptex
+			)
+		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}"/${P}-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}/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
+	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
+}