sci-mathematics/freefem++: New ebuild for freefem++-3

6 files changed, 190 insertions, 1 deletions

diff --git a/sci-mathematics/freefem++/ChangeLog b/sci-mathematics/freefem++/ChangeLog
index 0defcc94e..e43751203 100644
--- a/sci-mathematics/freefem++/ChangeLog
+++ b/sci-mathematics/freefem++/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 May 2009; David Radice <david.e.pi.3.14@gmail.com>
+  +freefem++-3.2.ebuild, +files/freefem++-opengl-automagic.patch,
+  +files/freefem++-make-clean.patch, +files/freefem++-lamboot.patch:
+  Version bump, now uses mpi.eclass, avoid opengl automagic dependency.
+
+*freefem++-3.2 (24 May 2009)
+
   17 May 2009; David Radice <david.e.pi.3.14@gmail.com>
   -freefem++-2.24.2-r2.ebuild:
   Cleanup.
diff --git a/sci-mathematics/freefem++/Manifest b/sci-mathematics/freefem++/Manifest
index 11e1594b4..c04ef9ce6 100644
--- a/sci-mathematics/freefem++/Manifest
+++ b/sci-mathematics/freefem++/Manifest
@@ -1,9 +1,14 @@
 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-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
 EBUILD freefem++-2.24.2-r3.ebuild 3585 RMD160 2ef387a12052df4248d9202a43b7cffd552174df SHA1 b453e77d841c19f16e483b0b9f7bfa1c327f6595 SHA256 ca322e94b12c872ad6f5987b3d37839aee5615e0ed4fa0525a035ed6ef863b23
-MISC ChangeLog 1884 RMD160 ade933881f470fdc378f70e8d2d3898121589a79 SHA1 cb8bc312af38a74ebdc071537d38fde936ccdadb SHA256 118a6d1046289aa2e7fb5372275d0c4e4e581f7a974f8e903690695269188b7e
+EBUILD freefem++-3.2.ebuild 3203 RMD160 bea96c52c05492bd50f68354b6115cc20889084c SHA1 2e188de3b1ce208f7c3d7e52fe6f243f678abf5e SHA256 90588b72dc11bca24be74f9a381e531f58052132e711bdff1ef4f31937f050cd
+MISC ChangeLog 2178 RMD160 ceea2e7d0548fac8c1a7a94a5904b1d34bccd4e3 SHA1 939dccf5f8617df432c9eed47d9d75b079dd9eb1 SHA256 004c7d55752d30402e8d28061186ccf59a8093473732b89f79a5685604f01db4
 MISC metadata.xml 381 RMD160 17dca0ed77bf65c0d2d8aa2148243f67c4a05edf SHA1 f583b125502b06a151f200849e2892bd08dbc70e SHA256 d7569d977d779a55533651e01e4d45e5ae7a1ada36b634e8b988ae4db86cdb83
diff --git a/sci-mathematics/freefem++/files/freefem++-lamboot.patch b/sci-mathematics/freefem++/files/freefem++-lamboot.patch
new file mode 100644
index 000000000..0de0e0e6b
--- /dev/null
+++ b/sci-mathematics/freefem++/files/freefem++-lamboot.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000..4f3478637
--- /dev/null
+++ b/sci-mathematics/freefem++/files/freefem++-make-clean.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000..79834d89f
--- /dev/null
+++ b/sci-mathematics/freefem++/files/freefem++-opengl-automagic.patch
@@ -0,0 +1,24 @@
+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.2.ebuild
new file mode 100644
index 000000000..8598f2092
--- /dev/null
+++ b/sci-mathematics/freefem++/freefem++-3.2.ebuild
@@ -0,0 +1,129 @@
+# 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}"
+	# 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
+
+	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"
+
+	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
+
+		rm -f examples*/Makefile*
+		doins -r examples*
+	fi
+}