diff options
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/gerris/ChangeLog | 14 | ||||
-rw-r--r-- | sci-libs/gerris/files/gerris-20080929-as-needed.patch | 25 | ||||
-rw-r--r-- | sci-libs/gerris/files/gerris-20100114-autotools.patch | 60 | ||||
-rw-r--r-- | sci-libs/gerris/files/gerris-20111123-autotools.patch | 96 | ||||
-rw-r--r-- | sci-libs/gerris/gerris-0.8.0.ebuild | 57 | ||||
-rw-r--r-- | sci-libs/gerris/gerris-0.9.2.ebuild | 57 | ||||
-rw-r--r-- | sci-libs/gerris/gerris-20080929.ebuild | 54 | ||||
-rw-r--r-- | sci-libs/gerris/gerris-20100114.ebuild | 50 | ||||
-rw-r--r-- | sci-libs/gerris/gerris-20111123.ebuild | 61 | ||||
-rw-r--r-- | sci-libs/gerris/metadata.xml | 3 |
10 files changed, 169 insertions, 308 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/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. |