4 files changed, 124 insertions, 2 deletions
diff --git a/sci-libs/gerris/ChangeLog b/sci-libs/gerris/ChangeLog
index a208c15c99aa..8912addee3f3 100644
--- a/sci-libs/gerris/ChangeLog
+++ b/sci-libs/gerris/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/gerris
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.8 2008/10/04 10:35:46 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.9 2010/01/15 18:19:13 bicatali Exp $
+
+*gerris-20100114 (15 Jan 2010)
+
+  15 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +gerris-20100114.ebuild, +files/gerris-20100114-autotools.patch,
+  metadata.xml:
+  Version bump. Added a patch that correct some autotools minor errors and
+  allow parallel building
 
 *gerris-20080929 (03 Oct 2008)
 
diff --git a/sci-libs/gerris/files/gerris-20100114-autotools.patch b/sci-libs/gerris/files/gerris-20100114-autotools.patch
new file mode 100644
index 000000000000..76ca031a282b
--- /dev/null
+++ b/sci-libs/gerris/files/gerris-20100114-autotools.patch
@@ -0,0 +1,60 @@
+--- ./src/Makefile.am.orig	2010-01-15 18:33:26.000000000 +0000
++++ ./src/Makefile.am	2010-01-15 18:42:10.000000000 +0000
+@@ -2,10 +2,8 @@
+ 
+ AUTOMAKE_OPTIONS = 1.6
+ 
+-AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\"
+-
+-INCLUDES = -I$(top_srcdir) -I$(includedir) \
+-           -DG_LOG_DOMAIN=\"Gfs\" $(GTS_CFLAGS)
++AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\" \
++        -DG_LOG_DOMAIN=\"Gfs\" $(GTS_CFLAGS)
+ 
+ bin_SCRIPTS=gfs-config
+ 
+@@ -116,18 +114,21 @@
+         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\
+ 	-release $(LT_RELEASE) -export-dynamic
+ libgfs3D_la_SOURCES = $(SRC)
++libgfs3D_la_LIBADD = $(GTS_LIBS)
+ 
+ libgfs2D_la_LDFLAGS = $(NO_UNDEFINED)\
+         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\
+ 	-release $(LT_RELEASE) -export-dynamic
+ libgfs2D_la_SOURCES = $(SRC)
+-libgfs2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
++libgfs2D_la_CPPFLAGS = $(AM_CPPFLAGS) -DFTT_2D=1
++libgfs2D_la_LIBADD = $(GTS_LIBS)
+ 
+ libgfs2D3_la_LDFLAGS = $(NO_UNDEFINED)\
+         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\
+ 	-release $(LT_RELEASE) -export-dynamic
+ libgfs2D3_la_SOURCES = $(SRC)
+-libgfs2D3_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D3=1
++libgfs2D3_la_CPPFLAGS = $(AM_CPPFLAGS) -DFTT_2D3=1
++libgfs2D3_la_LIBADD = $(GTS_LIBS)
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+@@ -139,15 +140,15 @@
+ bin_PROGRAMS = gerris2D gerris3D gerris2D3
+ 
+ gerris2D_SOURCES = gerris.c
+-gerris2D_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
+-gerris2D_LDADD = $(GFS2D_LIBS)
++gerris2D_CPPFLAGS = $(AM_CPPFLAGS) -DFTT_2D=1
++gerris2D_LDADD = libgfs2D.la
+ 
+ gerris3D_SOURCES = gerris.c
+-gerris3D_LDADD = $(GFS3D_LIBS)
++gerris3D_LDADD = libgfs3D.la
+ 
+ gerris2D3_SOURCES = gerris.c
+-gerris2D3_CFLAGS = $(AM_CFLAGS) -DFTT_2D3=1
+-gerris2D3_LDADD = $(GFS2D3_LIBS)
++gerris2D3_CPPFLAGS = $(AM_CPPFLAGS) -DFTT_2D3=1
++gerris2D3_LDADD = libgfs2D3.la
+ 
+ if DARCS_CONTROLLED
+ DARCS_VERSION = darcsversion
diff --git a/sci-libs/gerris/gerris-20100114.ebuild b/sci-libs/gerris/gerris-20100114.ebuild
new file mode 100644
index 000000000000..0a15b6ab93ed
--- /dev/null
+++ b/sci-libs/gerris/gerris-20100114.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20100114.ebuild,v 1.1 2010/01/15 18:19:13 bicatali Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="The Gerris Flow Solver"
+LICENSE="GPL-2"
+HOMEPAGE="http://gfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gfs/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples mpi"
+
+RDEPEND=">=dev-libs/glib-2.4.0
+	sci-libs/netcdf
+	sci-libs/gsl
+	sci-libs/gts
+	sci-libs/proj
+	dev-lang/python
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+# test assume it is installed
+RESTRICT="test"
+
+S="${WORKDIR}"/${PN}-snapshot-100114
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable mpi)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake nstall failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		rm -f doc/examples/*.pyc || die "Failed to remove python object"
+		doins -r doc/examples/* || die
+	fi
+}
diff --git a/sci-libs/gerris/metadata.xml b/sci-libs/gerris/metadata.xml
index bd9643acdd9d..691c0926b278 100644
--- a/sci-libs/gerris/metadata.xml
+++ b/sci-libs/gerris/metadata.xml
@@ -9,4 +9,8 @@
 <use>
   <flag name='dx'>Enable support for <pkg>sci-visualization/opendx</pkg></flag>
 </use>
+<longdescription lang='en'>
+  Gerris Flow Solver is a software program for the solution of the partial
+  differential equations describing fluid flow.
+</longdescription>
 </pkgmetadata>