Version bump. Rewritten for automagic and include more modules. Initial work from Eckard Brauer, bug #387217

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

12 files changed, 185 insertions, 331 deletions

diff --git a/sci-libs/gerris/ChangeLog b/sci-libs/gerris/ChangeLog
index 7162efa72eb1..66912fb029a6 100644
--- a/sci-libs/gerris/ChangeLog
+++ b/sci-libs/gerris/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/gerris
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.13 2011/07/20 16:59:00 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.14 2012/01/23 02:22:14 bicatali Exp $
+
+*gerris-20111123 (23 Jan 2012)
+
+  23 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> -gerris-0.8.0.ebuild,
+  -gerris-0.9.2.ebuild, -gerris-20080929.ebuild,
+  -files/gerris-20080929-as-needed.patch, -gerris-20100114.ebuild,
+  -files/gerris-20100114-autotools.patch, +gerris-20111123.ebuild,
+  +files/gerris-20111123-autotools.patch, metadata.xml:
+  Version bump. Rewritten for automagic and include more modules. Initial work
+  from Eckard Brauer, bug #387217
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #105599
diff --git a/sci-libs/gerris/Manifest b/sci-libs/gerris/Manifest
index 83792f12cc09..8a3e3067fb66 100644
--- a/sci-libs/gerris/Manifest
+++ b/sci-libs/gerris/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gerris-20080929-as-needed.patch 1009 RMD160 b8a5e8e03bf37c8932134f6135dc3161cb6b5916 SHA1 e8a6842275ab3725880ae8d3516ec55195538c40 SHA256 4bc0ac9603a066ba9cdcf27652f3e99050eae4ac620c95fba9510b8a725d9630
-AUX gerris-20100114-autotools.patch 1878 RMD160 c064d151d09d7755ad6cb22542727aa167eb6ace SHA1 db4eb6a27d83adf27ed5363698a67568caded977 SHA256 1cee4a3a22ad689f087a9ba8aab5bdb75b6eae6ff2fb194abdde207d960f7d5e
 AUX gerris-20100519-autotools.patch 1414 RMD160 28193985d701ad70726fca7acece4e0eb68f7c8b SHA1 45816aca0a51f40a30f05013393a7b4cf7e283bb SHA256 bd758909b58ca74def5f9f962afddf4db0edb4ed68c16abdf2e12dfa9a3ee4dd
-DIST gerris-0.8.0.tar.gz 4112581 RMD160 e4b510d17016a880837af6045e2259ef43b3f415 SHA1 c064479c3aafb442db8b93bf17f8b6216af4aeda SHA256 e3b9dd58fb6242d18740ecce3cb8eb9f6c79d61f5412869a2ce0a95c6ca76b91
-DIST gerris-0.9.2.tar.gz 4180547 RMD160 fdc3cee4a1c3154e60785e5d317a808d0f5cbdd6 SHA1 e56b888169703e9e8d174f188eac491f43a16acf SHA256 ab605863bc2ce872c03f1f88fd4de4d7782f49734f2fe9c01bfbbfd16b68069d
-DIST gerris-20080929.tar.gz 1590928 RMD160 460cdd272db2ff68489af54ce3ccaffd98e4c028 SHA1 a51f64f4a21e89d9fa3f4b3c39d2c5099250a401 SHA256 f828178578873ce4baf6e1e809be48e3dcd21fdd156276dbd816dc947401a064
-DIST gerris-20100114.tar.gz 1254202 RMD160 5434166aecf730db92ef865e9144a5fe14c813af SHA1 6ef5dda357eb04703843a52dc817aaa3b20e03e5 SHA256 0907736096a7e99b2e1b720b9f18e4b46c0c646109c94bdd69adb064e1e8d6cc
+AUX gerris-20111123-autotools.patch 3249 RMD160 f130c54537dde284c656f68b713ba97499f8c378 SHA1 e2ef750721bbb1fa94d9c2d1c7d9758712ebe5a5 SHA256 8c485a120ed850406158e850ebe8e3e51a91085f938bbf1cd7d6d711ba51895e
 DIST gerris-20100519.tar.gz 1285580 RMD160 6e9ea7938629842b45ca02a729cc3474b38588b4 SHA1 e2df6e87d55d445fc5fa7dbf95d148b854f7c338 SHA256 110f3cbc27d5f599467a1795dcb98a41814a3598402a0aebe8f0836b1aaa39c1
-EBUILD gerris-0.8.0.ebuild 1346 RMD160 36725e72d650a6f3b3e3a12bd299ff504671fbf8 SHA1 e152415469cad50563374e742e66d2a2db51bfd5 SHA256 7a81b84ed48c6f1bbcc9cb4278a0acee066ebc768bfe2c3f0c6225322e2e002d
-EBUILD gerris-0.9.2.ebuild 1347 RMD160 bfb91f0d3f04def99929af4d19af11343f8a35fd SHA1 ad0568f4fb544d5327c8ea13189acaf9315781e4 SHA256 ea2be17148ea7e83703b39e82cd1a89cffc72fc38c2abe6cf218f74dedecd5bc
-EBUILD gerris-20080929.ebuild 1153 RMD160 76cc456eb4630f801d204adab487474064926ff2 SHA1 7bf180d73969fb40139cdb3b0bb5a0b18dc5a63b SHA256 0086ca4c1e301c33d1722771bc20c301349223bcdf63f70867307188d25408ab
-EBUILD gerris-20100114.ebuild 1095 RMD160 ffdaa288b882fa5f8e24a59a40461c0f0a7921e3 SHA1 4332855da265b8a4047d4983e968b1ac07811a22 SHA256 9bb284b5719599785044618695544758c883169e83030c5a002b762086b7ef2e
+DIST gerris-20111123.tar.gz 2562693 RMD160 d88f480e36502d059a85d23fb4ba6ad29d32e1d6 SHA1 89ae88860ea04984da2a77a67f3ea46e2fdb2f6f SHA256 f9c5aab9149fd156d9347ace48c257e0a8956e5ced83e747ab3aab3601bb2863
 EBUILD gerris-20100519.ebuild 1095 RMD160 18bfcac212261999dd532b296fc26b71df56540a SHA1 851ef2f68023bd79447ea57bef1029bc7defefbe SHA256 bdccd44203c65b4b9e5d439ee0ff1217309b6ae74ab1cf96e6c264ab5496eded
-MISC ChangeLog 2505 RMD160 e56754786162d441d178d76c315759deb9aa5288 SHA1 fc7f0abdd0b26b94210538d3d9bc08c43184889e SHA256 a8a3f29188cf77ffb933247c5f656e268b0648386a38af285a136cdf66de4f41
-MISC metadata.xml 419 RMD160 b447c7ad51a10ccade69182a555ef70395315fb8 SHA1 13a7656362730f7d0bb63169eb03f83f4b7f3315 SHA256 375dc4b047646404fbe5521c676fc700a2f4e2055b8bc06f6f144945cad1b90d
+EBUILD gerris-20111123.ebuild 1359 RMD160 0936fd62a27920240cf354a5e83f6d46fcbe7421 SHA1 3bea7a57b3a98108969980eb4d563ba00544576f SHA256 7820c03740e421904827071a6517035e7868ecca02e4d8749d369f3c43917ee9
+MISC ChangeLog 2970 RMD160 2d76510a85713437c33d6b3fce1c0aa06da1b68c SHA1 1ab4680a0d545c9db1d95e9091121209cccaa342 SHA256 a677ddf7e8b8e9152477328b905718ce8b320682fc19b32a50643e30f0746b44
+MISC metadata.xml 326 RMD160 e2764f18511b59942cac08bd53fcb04bfde09158 SHA1 0f0fbc2f29633b5c8d7a14d88e1aede94363f2b8 SHA256 b703973b39f55b88505f9efde23f9317c80505c82564a1c7dd9233bcb14f4d8e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4nCVkACgkQCaWpQKGI+9S9rQCfVgSzUA0U70n7JokpVN8sqywN
-JtoAnivvLBYvPkB7KfNC5GSFQ3x9xF1m
-=e1a2
+iEYEARECAAYFAk8cxGQACgkQ1ycZbhPLE2CzCwCfV/wTH/gkxClFsxwHOM9ym50V
+O6wAn3WH1FsuTLd7+UVVPvWds3TNEIIA
+=fwTI
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gerris/files/gerris-20080929-as-needed.patch b/sci-libs/gerris/files/gerris-20080929-as-needed.patch
deleted file mode 100644
index eca75a32f432..000000000000
--- a/sci-libs/gerris/files/gerris-20080929-as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur gerris-snapshot-080929/src/Makefile.am gerris-snapshot-080929.new/src/Makefile.am
---- gerris-snapshot-080929/src/Makefile.am	2008-09-30 08:47:33.000000000 -0400
-+++ gerris-snapshot-080929.new/src/Makefile.am	2008-10-03 18:42:46.000000000 -0400
-@@ -114,18 +114,21 @@
-         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\
- 	-release $(LT_RELEASE) -export-dynamic
- libgfs3D_la_SOURCES = $(SRC)
-+libgfs3D_la_LIBADD = -lgmodule-2.0
- 
- 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_LIBADD = -lgmodule-2.0 -lgts
- 
- 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_LIBADD = -lgmodule-2.0
- 
- CLEANFILES = $(BUILT_SOURCES)
- 
diff --git a/sci-libs/gerris/files/gerris-20100114-autotools.patch b/sci-libs/gerris/files/gerris-20100114-autotools.patch
deleted file mode 100644
index 76ca031a282b..000000000000
--- a/sci-libs/gerris/files/gerris-20100114-autotools.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- ./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/files/gerris-20111123-autotools.patch b/sci-libs/gerris/files/gerris-20111123-autotools.patch
new file mode 100644
index 000000000000..05bd3b5a9bed
--- /dev/null
+++ b/sci-libs/gerris/files/gerris-20111123-autotools.patch
@@ -0,0 +1,96 @@
+--- Makefile.am.orig	2012-01-20 19:59:56.000000000 +0000
++++ Makefile.am	2012-01-21 04:35:19.000000000 +0000
+@@ -28,7 +28,7 @@
+ DARCS_CHANGELOG = 
+ endif
+ 
+-pkglib_SCRIPTS = build_function libtool
++noinst_SCRIPTS = build_function libtool
+ 
+ ChangeLog: $(DARCS_CHANGELOG)
+ 
+--- src/Makefile.am.orig	2012-01-20 19:59:56.000000000 +0000
++++ src/Makefile.am	2012-01-21 05:13:31.000000000 +0000
+@@ -1,10 +1,9 @@
+-## Process this file with automake to produce Makefile.in
++## Process this file with automake to produce Makefile.in
+ 
+ AUTOMAKE_OPTIONS = 1.6
+ 
+-AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\"
+-
+-INCLUDES = -I$(top_srcdir) -I$(includedir) \
++AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\" \
++	 -I$(top_srcdir) -I$(includedir) \
+            -DG_LOG_DOMAIN=\"Gfs\" $(GTS_CFLAGS)
+ 
+ bin_SCRIPTS = gfs-config
+@@ -15,7 +14,8 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gerris2D.pc gerris3D.pc
+-pkglib_DATA = m4.awk
++pkgawkdir = $(datadir)/gerris
++pkgawk_DATA = m4.awk
+ 
+ lib_LTLIBRARIES = libgfs2D.la libgfs3D.la
+ 
+@@ -119,7 +119,7 @@
+         -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)
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+@@ -132,13 +132,11 @@
+ bin_PROGRAMS = gerris2D gerris3D
+ 
+ gerris2D_SOURCES = gerris.c
+-gerris2D_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
+-gerris2D_LDADD = $(GFS2D_LIBS)
+-gerris2D_DEPENDENCIES = libgfs2D.la
++gerris2D_CPPFLAGS = $(AM_CPPFLAGS) -DFTT_2D=1
++gerris2D_LDADD = libgfs2D.la
+ 
+ gerris3D_SOURCES = gerris.c
+-gerris3D_LDADD = $(GFS3D_LIBS)
+-gerris3D_DEPENDENCIES = libgfs3D.la
++gerris3D_LDADD = libgfs3D.la
+ 
+ if DARCS_CONTROLLED
+ DARCS_VERSION = darcsversion
+--- configure.in.orig	2012-01-20 19:59:56.000000000 +0000
++++ configure.in	2012-01-23 01:10:36.000000000 +0000
+@@ -348,10 +350,14 @@
+ 
+ # AGMG module requires the gfortran compiler and lapack/blas
+ if test x$with_agmg != xno; then
+-   AC_PROG_FC([gfortran f90 xlf90],90)
+-   AC_CHECK_LIB(lapack, sorg2l_, lapack="true", lapack="false", [-lblas -lm])
++   AC_PROG_FC
++   if [ -z "$LAPACK_LIBS" ]; then
++      AC_CHECK_LIB(lapack, sorg2l_,lapack="true", lapack="false", [-lblas -lm])
++   else
++      LIBS="${LIBS} ${LAPACK_LIBS}"
++   fi
+ fi
+-AM_CONDITIONAL(BUILD_AGMG, test x$FC = xgfortran -a x$lapack = xtrue -a x$with_agmg != xno)
++AM_CONDITIONAL(BUILD_AGMG, test x$with_agmg != xno)
+ 
+ # Build wavewatch module if wavewatch is installed
+ AM_CONDITIONAL(BUILD_WAVEWATCH, test -r $HOME/.wwatch3.env)
+--- doc/examples/Makefile.am.orig	2012-01-20 19:59:56.000000000 +0000
++++ doc/examples/Makefile.am	2012-01-23 02:02:38.000000000 +0000
+@@ -48,7 +48,6 @@
+ 
+ CLEANFILES = $(BUILT_SOURCES) Makefile.deps
+ 
+-pkglib_DATA = gfs2tex.py
+-pkgdata_DATA = gfs.lang gerris.dic gfs-keywords.el gfs-mode.el gfs.sty gfs.hva kaltura.sh gfs.php
++pkgdata_DATA = gfs2tex.py gfs.lang gerris.dic gfs-keywords.el gfs-mode.el gfs.sty gfs.hva kaltura.sh gfs.php
+ 
+ gerris.dic: classes modulesyms.sh $(top_srcdir)/modules/Makefile.am modules.list
+	($(srcdir)/classes && sh $(srcdir)/modulesyms.sh $(top_srcdir)/modules $(pkglibdir)) | sort > gerris.dic
+ 
diff --git a/sci-libs/gerris/gerris-0.8.0.ebuild b/sci-libs/gerris/gerris-0.8.0.ebuild
deleted file mode 100644
index a0fa4fb36d0c..000000000000
--- a/sci-libs/gerris/gerris-0.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-0.8.0.ebuild,v 1.5 2011/03/02 19:59:23 jlec Exp $
-
-EAPI="1"
-
-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="doc"
-
-RDEPEND="dev-libs/glib:2
-		>=sci-libs/gts-0.7.4
-		sys-apps/gawk
-		dev-lang/python"
-DEPEND="${RDEPEND}
-		sys-devel/libtool"
-
-src_compile() {
-	# disable explicit building of tutorial
-	sed -e "s:tutorial::" -i doc/Makefile.am || \
-		die "failed to disable building of tutorial"
-	sed -e "s:tutorial::" -i doc/Makefile.in || \
-		die "failed to disable building of tutorial"
-
-	# disable mpi for now, since it causes TEXTRELS
-	# in the shared libs
-	local myconf="--disable-mpi"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# extended documentation
-	if use doc; then
-		dohtml doc/html/*
-
-		insinto /usr/share/doc/${P}/examples
-		doins -r doc/examples/*
-
-		insinto /usr/share/doc/${P}/tutorial
-		doins doc/tutorial/tutorial.pdf
-
-		insinto /usr/share/doc/${P}/faq
-		doins doc/faq/faq.pdf
-	fi
-}
diff --git a/sci-libs/gerris/gerris-0.9.2.ebuild b/sci-libs/gerris/gerris-0.9.2.ebuild
deleted file mode 100644
index a5b79cb621fc..000000000000
--- a/sci-libs/gerris/gerris-0.9.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-0.9.2.ebuild,v 1.5 2011/03/02 19:59:23 jlec Exp $
-
-EAPI="1"
-
-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="doc mpi dx"
-
-RDEPEND="dev-libs/glib:2
-		>=sci-libs/gts-0.7.4
-		sys-apps/gawk
-		dev-lang/python
-		mpi? ( virtual/mpi )
-		dx? ( sci-visualization/opendx )"
-DEPEND="${RDEPEND}
-		sys-devel/libtool"
-
-src_compile() {
-	# disable explicit building of tutorial
-	sed -e "s:tutorial::" -i doc/Makefile.am || \
-		die "failed to disable building of tutorial"
-	sed -e "s:tutorial::" -i doc/Makefile.in || \
-		die "failed to disable building of tutorial"
-
-	econf $(use_enable mpi ) \
-		$(use_enable dx) \
-		|| die "configure failed"
-
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# extended documentation
-	if use doc; then
-		dohtml doc/html/*
-
-		insinto /usr/share/doc/${P}/examples
-		doins -r doc/examples/*
-
-		insinto /usr/share/doc/${P}/tutorial
-		doins doc/tutorial/tutorial.pdf
-
-		insinto /usr/share/doc/${P}/faq
-		doins doc/faq/faq.pdf
-	fi
-}
diff --git a/sci-libs/gerris/gerris-20080929.ebuild b/sci-libs/gerris/gerris-20080929.ebuild
deleted file mode 100644
index 5ab4428e2af2..000000000000
--- a/sci-libs/gerris/gerris-20080929.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20080929.ebuild,v 1.4 2011/03/02 19:59:23 jlec Exp $
-
-EAPI="1"
-
-inherit autotools
-
-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="mpi dx"
-
-RDEPEND="dev-libs/glib:2
-		>=sci-libs/gts-20081607
-		sys-apps/gawk
-		dev-lang/python
-		mpi? ( virtual/mpi )
-		dx? ( sci-visualization/opendx )"
-DEPEND="${RDEPEND}
-		sys-devel/libtool"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${PN}-snapshot-080929
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable mpi ) \
-		$(use_enable dx) \
-		|| die "configure failed"
-
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	insinto /usr/share/doc/${P}/examples
-	rm -f doc/examples/*.pyc || die "Failed to remove python object"
-	doins -r doc/examples/*
-}
diff --git a/sci-libs/gerris/gerris-20100114.ebuild b/sci-libs/gerris/gerris-20100114.ebuild
deleted file mode 100644
index fa72007ad832..000000000000
--- a/sci-libs/gerris/gerris-20100114.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 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.3 2011/03/02 19:59:23 jlec 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
-	sci-libs/netcdf
-	sci-libs/gsl
-	sci-libs/gts
-	sci-libs/proj
-	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/gerris-20111123.ebuild b/sci-libs/gerris/gerris-20111123.ebuild
new file mode 100644
index 000000000000..df1d2d975243
--- /dev/null
+++ b/sci-libs/gerris/gerris-20111123.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20111123.ebuild,v 1.1 2012/01/23 02:22:14 bicatali Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Gerris Flow Solver"
+HOMEPAGE="http://gfs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples mpi static-libs"
+
+# all these deps could be optional
+# but the configure.in would have to be modified
+# heavily for the automagic
+RDEPEND="dev-libs/glib:2
+	dev-games/ode
+	sci-libs/netcdf
+	sci-libs/gsl
+	sci-libs/gts
+	sci-libs/hypre
+	sci-libs/lis
+	sci-libs/proj
+	>=sci-libs/fftw-3
+	virtual/lapack
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+# test assume it is installed
+#RESTRICT="test"
+
+S="${WORKDIR}"/${P/-20/-snapshot-}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-I${EPREFIX}/usr/include/hypre"
+	econf \
+		$(use_enable mpi) \
+		$(use_enable static-libs static) \
+		LAPACK_LIBS="$(pkg-config --libs lapack)"
+}
+
+src_install() {
+	default
+	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/*
+	fi
+}
diff --git a/sci-libs/gerris/metadata.xml b/sci-libs/gerris/metadata.xml
index 1fdc0811f9c5..14c7a6b771ae 100644
--- a/sci-libs/gerris/metadata.xml
+++ b/sci-libs/gerris/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<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.
diff --git a/sci-libs/gts/Manifest b/sci-libs/gts/Manifest
index b7f5d7d95de4..69f0180efaca 100644
--- a/sci-libs/gts/Manifest
+++ b/sci-libs/gts/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX gts-20100321-examples.patch 472 RMD160 69737f927247c69849adff2cc9ac175f09d1178d SHA1 50acbc11281661ebf5488ed13b9acc6e6705e0db SHA256 e164f7eb970675b3333f709fc1a0a1225b0a6f7a16503fe9a2e3aac023826be7
-AUX gts-20111025-autotools.patch 1747 RMD160 18e542f7f37cee5643c77f00f1f0aa3d5f856172 SHA1 7451347ff602cec32737dc5533c2ccec94abe9c2 SHA256 241ac29ee9564edf93d808804a9184d42229668f0d7becbb9eabd4e6b90aad8b
+AUX gts-20111025-autotools.patch 1782 RMD160 f45ad8a2a69c62314898ce3c4c929d369184a97e SHA1 9d7954c8b802902d5f54cc7fac69ea755d624ce9 SHA256 3f8bed3275320ee0f11f68ef983e4419e909bc8bc156d05117725b89e2ba5d3f
 DIST gts-20100321.tar.gz 876320 RMD160 4ab3d3642408c57f213a186c823e9b4da4acf147 SHA1 02948e5c5db0574612cd3323662bd7a6966be53d SHA256 4b7fc999c3693c9dcc6dec444edc839c794cc1708ec0f13b6d0e2b9913b00e9f
 DIST gts-20111025.tar.gz 877437 RMD160 8d10cdd59516e3c323e49610dc821d004d9a0b86 SHA1 c8864eb945ca4f21e56b3c10efdc4c9e0fcb41ed SHA256 9070df762879139cc1f0c822e3d3ad545c75b209e762f8db38b049685e293075
 EBUILD gts-20100321-r3.ebuild 1243 RMD160 35ed50cd614918161b86b46d2971c0b3d62c118d SHA1 5ce6acb4dfafcf91db5a5d58645c8fe50fc7036c SHA256 6f0a5cd77a3f563400fc90e45fb65bb9c066c46fec7f1b209dd05db5445270d3
-EBUILD gts-20111025.ebuild 1368 RMD160 8553aa9ac1a7898dd5a0b5a6b171498419e33ebd SHA1 116e5b336e2221792a3cfb9ed504be15d2cb540c SHA256 1ae5c44ca05e84b9aa3baba26f73f60dc01e26538e5831ff981912d7151fc7ae
-MISC ChangeLog 4008 RMD160 8a89fe4938df10381540dc5ffbfe797c1233ab8a SHA1 842deff801309fe9fe262ac47bea2199a62dfaff SHA256 a425ab6248bbedea955a1067e362067b1a8f93026843f0914b51edbd8f3915d0
+EBUILD gts-20111025-r1.ebuild 1171 RMD160 1a2079c790f70ad306a3e5f3159a6cbe350c50f2 SHA1 0ace9fe20b963b8df582af05d183831b808904a9 SHA256 9b0ba7e0319f67098289240083141f6c18eda3e7c125b73d661e81e871ff52ae
+MISC ChangeLog 4237 RMD160 27bbf39820ff0ee7d8156395cee452af695b00b1 SHA1 f3953b197969468079ce2d63d182cbf7a363bbb4 SHA256 1aa97d8c3b2945442346387f661e5acb9102396bea8def4f4008bea01dfe9daa
 MISC metadata.xml 328 RMD160 d0476ceb89877a7b1caa94159d442491e77118aa SHA1 78d18dcf9f1d970b161349902da034bca29ce293 SHA256 c65b1015ca27352fcf00d50fe76741a584e7af13f8d7bce3bf087c910b08006a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8a4ogACgkQgAnW8HDreRYhVwCfc1wvBIJ7OoXtnwf1kCEu6tfq
-e9sAnRZ9NoK6cII598lkIhSQM8rNFyM4
-=I1BL
+iEYEARECAAYFAk8cxS4ACgkQ1ycZbhPLE2D8MQCeMerdn3PHK0Z3MYxCycJf5I0q
+AVYAn0HtvvA4Mw2jtpAJRyuMLD27vIN0
+=nWNm
 -----END PGP SIGNATURE-----