diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-libs/gerris | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-libs/gerris')
-rw-r--r-- | sci-libs/gerris/Manifest | 3 | ||||
-rw-r--r-- | sci-libs/gerris/files/gerris-20130531-hypre-no-mpi.patch | 22 | ||||
-rw-r--r-- | sci-libs/gerris/files/gerris-20130531-lis-matrix-csr.patch | 11 | ||||
-rw-r--r-- | sci-libs/gerris/files/gerris-20130531-use-blas-lapack-system.patch | 33 | ||||
-rw-r--r-- | sci-libs/gerris/files/gerris-hypre-no-mpi.patch | 21 | ||||
-rw-r--r-- | sci-libs/gerris/gerris-20120731.ebuild | 64 | ||||
-rw-r--r-- | sci-libs/gerris/gerris-20130531.ebuild | 68 | ||||
-rw-r--r-- | sci-libs/gerris/gerris-20131206.ebuild | 68 | ||||
-rw-r--r-- | sci-libs/gerris/metadata.xml | 9 |
9 files changed, 299 insertions, 0 deletions
diff --git a/sci-libs/gerris/Manifest b/sci-libs/gerris/Manifest new file mode 100644 index 000000000000..6e112fe71c3a --- /dev/null +++ b/sci-libs/gerris/Manifest @@ -0,0 +1,3 @@ +DIST gerris-snapshot-120731.tar.gz 2640044 SHA256 2a032e3418672057d1d83a5280380241d8865d4cc1a53f7bc21e95acd3a5f8fb SHA512 7ec58b715c4e52462c8e0507d34ccf554c71b3bf3575eafd8fb59002c60dcd91a749cfc53b7a4eda1822571777736dab15b0e75594b1d97b4627f72a97defb46 WHIRLPOOL abce090c4f79ee9bf4982ca9bc673ca43c6e40488e308f37a549348eb900ca1d74a8d95b59898bd173167cb849bd5afeca1e38be300d66d711f2a9225108e410 +DIST gerris-snapshot-130531.tar.gz 2822863 SHA256 808a690b928d7a90067e2115121e529311f3631882db46cecdae1468334912d5 SHA512 7372cfae4442f9daf996091d4043c3649976f937eaf6b27a8b65f58b316d26c0cb9d106da6f041ce58b2149d193ab311ed0c65d8834d42bcfebe0b7ec073be9e WHIRLPOOL be02b7b189dd2b27e00ac0cb4af10997e669afef92f4a4377f8117dfda35fe9fd894b750b605dee805288ece2f8ba4072f1d7d6570411eaab51ec8336e5c4eb9 +DIST gerris-snapshot-131206.tar.gz 2841686 SHA256 d5346a362b104ccc858c4b79938727d56c4654b103c268e54cf3aa56d0b55b39 SHA512 b3855d51eea04c496d2e5f662c148560d9ab8d5dfa97e4f7d1c22c70405b9b801b46f30aa0d159b1bd6a8182f171a1649b5f510f0e13feeb55f29cafe57b45dd WHIRLPOOL 81027d9c4c9bf44b542e1161e3238711f321b5db581b0538d5c7addc4dd5229c90f787216d05a689e287ba511546b4e7cc2fb9664bcfb9098e421722a5d8e0fd diff --git a/sci-libs/gerris/files/gerris-20130531-hypre-no-mpi.patch b/sci-libs/gerris/files/gerris-20130531-hypre-no-mpi.patch new file mode 100644 index 000000000000..f05512efbddf --- /dev/null +++ b/sci-libs/gerris/files/gerris-20130531-hypre-no-mpi.patch @@ -0,0 +1,22 @@ +patch to allow gerris to use hypre without mpi + +--- configure.ac 2013-05-30 23:57:18.000000000 -0700 ++++ configure.ac.new 2013-07-22 13:52:36.083974663 -0700 +@@ -336,7 +336,7 @@ + + # Build hypre module if HYPRE is installed + hypre=no +-if test "x$use_mpicc" = "xyes" ; then # HYPRE needs MPI ++# hypre does not need mpi + AC_CHECK_LIB(HYPRE, HYPRE_IJMatrixCreate, hypre="yes", hypre="no", [-lm]) + if test x$hypre = xyes; then + AC_CHECK_HEADERS(HYPRE.h, hypre="yes", hypre="no") +@@ -344,7 +344,7 @@ + if test x$hypre = xno; then + AC_MSG_WARN([HYPRE not found. hypre Module won't be available.]) + fi +-fi ++ + AM_CONDITIONAL(BUILD_HYPRE, test x$hypre = xyes) + + # Build lis module if lis is installed diff --git a/sci-libs/gerris/files/gerris-20130531-lis-matrix-csr.patch b/sci-libs/gerris/files/gerris-20130531-lis-matrix-csr.patch new file mode 100644 index 000000000000..21d6810bbd2b --- /dev/null +++ b/sci-libs/gerris/files/gerris-20130531-lis-matrix-csr.patch @@ -0,0 +1,11 @@ +--- modules/lis.c.orig 2013-07-22 15:34:05.346631560 -0700 ++++ modules/lis.c 2013-07-22 15:33:28.621427315 -0700 +@@ -45,7 +45,7 @@ + g_array_index (stencil->coeff, double, j), + A); + } +- lis_matrix_set_type (A, LIS_MATRIX_CRS); ++ lis_matrix_set_type (A, LIS_MATRIX_CSR); + lis_matrix_assemble (A); + + LIS_VECTOR b, x; diff --git a/sci-libs/gerris/files/gerris-20130531-use-blas-lapack-system.patch b/sci-libs/gerris/files/gerris-20130531-use-blas-lapack-system.patch new file mode 100644 index 000000000000..4c8985ce5e77 --- /dev/null +++ b/sci-libs/gerris/files/gerris-20130531-use-blas-lapack-system.patch @@ -0,0 +1,33 @@ +--- modules/Makefile.am.orig 2013-07-22 14:13:10.339130133 -0700 ++++ modules/Makefile.am 2013-07-22 14:15:10.770813929 -0700 +@@ -105,7 +105,7 @@ + libstokes2D_la_LIBADD = $(GFS2D_LIBS) + + libwavewatch2D_la_SOURCES = wavewatch.c +-libwavewatch2D_la_LIBADD = $(GFS2D_LIBS) -Lwavewatch -lwavewatch -L/usr/lib/gcc/i486-linux-gnu/4.2 -lgfortran ++libwavewatch2D_la_LIBADD = $(GFS2D_LIBS) -Lwavewatch -lwavewatch + libwavewatch2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 \ + -DW3SRCE=`nm wavewatch/libwavewatch.a | grep w3srce | awk '{ if ($$2 == "T") print $$3; }'` \ + -DGFSW3INIT=`nm wavewatch/libwavewatch.a | grep gfsw3_init | awk '{ if ($$2 == "T") print $$3; }'` +@@ -164,17 +164,17 @@ + + liblis3D_la_SOURCES = lis.c + liblis3D_la_CFLAGS = $(AM_CFLAGS) +-liblis3D_la_LIBADD = $(GFS3D_LIBS) -llis -lgfortran -lm ++liblis3D_la_LIBADD = $(GFS3D_LIBS) -llis -lm + liblis2D_la_SOURCES = lis.c + liblis2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 +-liblis2D_la_LIBADD = $(GFS2D_LIBS) -llis -lgfortran -lm ++liblis2D_la_LIBADD = $(GFS2D_LIBS) -llis -lm + + libagmg3D_la_SOURCES = agmg.c dagmg.f90 + libagmg3D_la_CFLAGS = $(AM_CFLAGS) +-libagmg3D_la_LIBADD = $(GFS3D_LIBS) -llapack -lblas -lgfortran -lm ++libagmg3D_la_LIBADD = $(GFS3D_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) -lm + libagmg2D_la_SOURCES = agmg.c dagmg.f90 + libagmg2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 +-libagmg2D_la_LIBADD = $(GFS2D_LIBS) -llapack -lblas -lgfortran -lm ++libagmg2D_la_LIBADD = $(GFS2D_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) -lm + + libokada3D_la_SOURCES = okada.c + libokada3D_la_CFLAGS = $(AM_CFLAGS) diff --git a/sci-libs/gerris/files/gerris-hypre-no-mpi.patch b/sci-libs/gerris/files/gerris-hypre-no-mpi.patch new file mode 100644 index 000000000000..2e3aede8b7d6 --- /dev/null +++ b/sci-libs/gerris/files/gerris-hypre-no-mpi.patch @@ -0,0 +1,21 @@ +--- configure.in.orig 2012-08-08 17:19:49.374366942 +0100 ++++ configure.in 2012-08-08 17:20:40.585155226 +0100 +@@ -334,7 +334,8 @@ + + # Build hypre module if HYPRE is installed + hypre=no +-if test "x$use_mpicc" = "xyes" ; then # HYPRE needs MPI ++# hypre does not need mpi ++#if test "x$use_mpicc" = "xyes" ; then # HYPRE needs MPI + AC_CHECK_LIB(HYPRE, HYPRE_IJMatrixCreate, hypre="yes", hypre="no", [-lm]) + if test x$hypre = xyes; then + AC_CHECK_HEADERS(HYPRE.h, hypre="yes", hypre="no") +@@ -342,7 +343,7 @@ + if test x$hypre = xno; then + AC_MSG_WARN([HYPRE not found. hypre Module won't be available.]) + fi +-fi ++#fi + AM_CONDITIONAL(BUILD_HYPRE, test x$hypre = xyes) + + # Build lis module if lis is installed diff --git a/sci-libs/gerris/gerris-20120731.ebuild b/sci-libs/gerris/gerris-20120731.ebuild new file mode 100644 index 000000000000..973040d29ba5 --- /dev/null +++ b/sci-libs/gerris/gerris-20120731.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +inherit autotools eutils flag-o-matic toolchain-funcs + +MYP=${P/-20/-snapshot-} + +DESCRIPTION="Gerris Flow Solver" +HOMEPAGE="http://gfs.sourceforge.net/" +SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MYP}.tar.gz" + +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +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[mpi?] + sci-libs/lis[mpi?] + sci-libs/proj + >=sci-libs/fftw-3 + virtual/lapack + mpi? ( virtual/mpi )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MYP}" + +# buggy tests, need extra packages and require gerris to be installed +RESTRICT=test + +src_prepare() { + epatch "${FILESDIR}"/${PN}-hypre-no-mpi.patch + eautoreconf +} + +src_configure() { + append-cppflags "-I${EPREFIX}/usr/include/hypre" + econf \ + $(use_enable mpi) \ + $(use_enable static-libs static) \ + LAPACK_LIBS="$($(tc-getPKG_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/gerris-20130531.ebuild b/sci-libs/gerris/gerris-20130531.ebuild new file mode 100644 index 000000000000..5aec888c6f71 --- /dev/null +++ b/sci-libs/gerris/gerris-20130531.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 + +inherit autotools-utils eutils flag-o-matic toolchain-funcs + +MYP=${P/-20/-snapshot-} + +DESCRIPTION="Gerris Flow Solver" +HOMEPAGE="http://gfs.sourceforge.net/" +SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MYP}.tar.gz" + +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +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[mpi?] + sci-libs/lis[mpi?] + sci-libs/proj + >=sci-libs/fftw-3 + virtual/lapack + mpi? ( virtual/mpi )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MYP}" + +# buggy tests, need extra packages and require gerris to be installed +RESTRICT=test + +PATCHES=( + "${FILESDIR}"/${P}-hypre-no-mpi.patch + "${FILESDIR}"/${P}-lis-matrix-csr.patch + "${FILESDIR}"/${P}-use-blas-lapack-system.patch +) + +src_configure() { + append-cppflags "-I${EPREFIX}/usr/include/hypre" + local myeconfargs=( + $(use_enable mpi) + ) + autotools-utils_src_configure \ + LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" +} + +src_install() { + autotools-utils_src_install + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r doc/examples/* + fi +} diff --git a/sci-libs/gerris/gerris-20131206.ebuild b/sci-libs/gerris/gerris-20131206.ebuild new file mode 100644 index 000000000000..9dbad6db4d23 --- /dev/null +++ b/sci-libs/gerris/gerris-20131206.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 + +inherit autotools-utils eutils flag-o-matic toolchain-funcs + +MYP=${P/-20/-snapshot-} + +DESCRIPTION="Gerris Flow Solver" +HOMEPAGE="http://gfs.sourceforge.net/" +SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MYP}.tar.gz" + +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +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[mpi?] + sci-libs/lis[mpi?] + sci-libs/proj + >=sci-libs/fftw-3 + virtual/lapack + mpi? ( virtual/mpi )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MYP}" + +# buggy tests, need extra packages and require gerris to be installed +RESTRICT=test + +PATCHES=( + "${FILESDIR}"/${PN}-20130531-hypre-no-mpi.patch + "${FILESDIR}"/${PN}-20130531-lis-matrix-csr.patch + "${FILESDIR}"/${PN}-20130531-use-blas-lapack-system.patch +) + +src_configure() { + append-cppflags "-I${EPREFIX}/usr/include/hypre" + local myeconfargs=( + $(use_enable mpi) + ) + autotools-utils_src_configure \ + LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" +} + +src_install() { + autotools-utils_src_install + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r doc/examples/* + fi +} diff --git a/sci-libs/gerris/metadata.xml b/sci-libs/gerris/metadata.xml new file mode 100644 index 000000000000..430d5d021bdf --- /dev/null +++ b/sci-libs/gerris/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<longdescription lang="en"> + Gerris Flow Solver is a software program for the solution of the partial + differential equations describing fluid flow. +</longdescription> +</pkgmetadata> |