Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/, sci-misc/elmer-fem/files/
Date: Tue, 03 Dec 2013 14:53:32
Message-Id: 1386082345.d7d5b682db50724172e027e581d6525b0e549324.jlec@gentoo
1 commit: d7d5b682db50724172e027e581d6525b0e549324
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 3 14:52:25 2013 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 3 14:52:25 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d7d5b682
7
8 sci-misc/elmer-fem: Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; fix whitespacing
9
10 Package-Manager: portage-2.2.7
11 RepoMan-Options: --force
12
13 ---
14 sci-misc/elmer-fem/ChangeLog | 12 ++++
15 sci-misc/elmer-fem/elmer-fem-5.4.1-r1.ebuild | 65 -------------------
16 sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild | 54 ++++++++++++++++
17 sci-misc/elmer-fem/elmer-fem-9999.ebuild | 65 ++++++++-----------
18 .../elmer-fem/files/elmer-fem-6.0_p4651-oos.patch | 75 ++++++++++++++++++++++
19 .../files/elmer-fem-6.0_p4651-underlinking.patch | 23 +++++++
20 sci-misc/elmer-fem/metadata.xml | 5 ++
21 7 files changed, 197 insertions(+), 102 deletions(-)
22
23 diff --git a/sci-misc/elmer-fem/ChangeLog b/sci-misc/elmer-fem/ChangeLog
24 new file mode 100644
25 index 0000000..de1bf37
26 --- /dev/null
27 +++ b/sci-misc/elmer-fem/ChangeLog
28 @@ -0,0 +1,12 @@
29 +# ChangeLog for sci-misc/elmer-fem
30 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
31 +# $Header: $
32 +
33 +*elmer-fem-6.0_p4651 (03 Dec 2013)
34 +
35 + 03 Dec 2013; Justin Lecher <jlec@g.o> -elmer-fem-5.4.1-r1.ebuild,
36 + +elmer-fem-6.0_p4651.ebuild, elmer-fem-9999.ebuild,
37 + +files/elmer-fem-6.0_p4651-oos.patch,
38 + +files/elmer-fem-6.0_p4651-underlinking.patch, +metadata.xml:
39 + Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; fix whitespacing
40 +
41
42 diff --git a/sci-misc/elmer-fem/elmer-fem-5.4.1-r1.ebuild b/sci-misc/elmer-fem/elmer-fem-5.4.1-r1.ebuild
43 deleted file mode 100644
44 index ce60dcc..0000000
45 --- a/sci-misc/elmer-fem/elmer-fem-5.4.1-r1.ebuild
46 +++ /dev/null
47 @@ -1,65 +0,0 @@
48 -# Copyright 1999-2007 Gentoo Foundation
49 -# Distributed under the terms of the GNU General Public License v2
50 -# $Header: $
51 -
52 -EAPI="4"
53 -
54 -inherit autotools eutils
55 -
56 -ELMER_ROOT="elmerfem"
57 -MY_PN=${PN/elmer-/}
58 -
59 -DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, main fem"
60 -HOMEPAGE="http://www.csc.fi/english/pages/elmer"
61 -SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz"
62 -RESTRICT="mirror"
63 -
64 -LICENSE="GPL-2"
65 -SLOT="0"
66 -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
67 -IUSE="mpi debug"
68 -DEPEND="sys-libs/glibc
69 - virtual/blas
70 - virtual/lapack
71 - sci-libs/arpack
72 - sci-libs/matc
73 - sci-libs/elmer-hutiter
74 - sci-libs/elmer-eio
75 - mpi? ( sys-cluster/mpich2 )"
76 -RDEPEND="${DEPEND}"
77 -# Note this seems to only configure correctly with the elmer version of umfpack
78 -# But this doesn't stop it from compiling / working without it
79 -
80 -S="${WORKDIR}/${PV}/fem"
81 -
82 -src_unpack() {
83 - unpack ${A}
84 - cd "${S}"
85 - # configure must be executable
86 - chmod +x configure
87 - epatch ${FILESDIR}/elmer-fem-Makefile-install.patch
88 - eautoreconf
89 -}
90 -
91 -src_compile() {
92 - cd "${S}"
93 - local myconf
94 - export FC="gfortran"
95 - export F77="gfortran"
96 - myconf="$myconf --with-blas --with-lapack --with-arpack --with-huti"
97 - myconf="$myconf --with-eiof --with-matc"
98 - #TODO parpack support is not picked up from the arpack package
99 - #TODO --with-hypre --with-umfpack
100 -
101 - use mpi && myconf="$myconf --with-mpi --with-mpi-dir=/usr"
102 - use debug &&
103 - myconf="${myconf} --with-debug" ||
104 - myconf="${myconf} --without-debug"
105 - econf $myconf || die "econf failed"
106 - emake || die "emake failed"
107 -}
108 -
109 -
110 -src_install() {
111 - emake ELMER_SOLVER_DATADIR="${D}/usr/share/elmersolver" DESTDIR="${D}" install || die "emake install failed"
112 -}
113
114 diff --git a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
115 new file mode 100644
116 index 0000000..d8289c2
117 --- /dev/null
118 +++ b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
119 @@ -0,0 +1,54 @@
120 +# Copyright 1999-2013 Gentoo Foundation
121 +# Distributed under the terms of the GNU General Public License v2
122 +# $Header: $
123 +
124 +EAPI=5
125 +
126 +AUTOTOOLS_AUTORECONF=true
127 +FORTRAN_STANDARD=90
128 +
129 +inherit autotools-utils fortran-2 multilib
130 +
131 +ELMER_ROOT="elmerfem"
132 +MY_PN=${PN/elmer-/}
133 +
134 +DESCRIPTION="Finite element programs, libraries, and visualization tools - main fem"
135 +HOMEPAGE="http://www.csc.fi/english/pages/elmer"
136 +SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz"
137 +
138 +LICENSE="GPL-2"
139 +SLOT="0"
140 +KEYWORDS="~amd64 ~x86"
141 +IUSE="mpi debug"
142 +
143 +RDEPEND="
144 + virtual/blas
145 + virtual/lapack
146 + sci-libs/arpack
147 + sci-libs/matc
148 + sci-libs/elmer-hutiter
149 + sci-libs/elmer-eio
150 + mpi? ( sys-cluster/mpich2 )"
151 +DEPEND="${RDEPEND}"
152 +# Note this seems to only configure correctly with the elmer version of umfpack
153 +# But this doesn't stop it from compiling / working without it
154 +
155 +S="${WORKDIR}/fem"
156 +
157 +PATCHES=(
158 + "${FILESDIR}"/${P}-oos.patch
159 + "${FILESDIR}"/${P}-underlinking.patch
160 +)
161 +
162 +src_configure() {
163 + local myeconfargs=(
164 + $(use_with debug)
165 + $(usex mpi --with-mpi "")
166 + $(usex mpi --with-mpi-dir="${EPREFIX}"/usr "")
167 + --with-arpack="$($(tc-getPKG_CONFIG) --libs arpack)"
168 + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
169 + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
170 + --with-huti --with-eiof --with-matc
171 + )
172 + autotools-utils_src_configure
173 +}
174
175 diff --git a/sci-misc/elmer-fem/elmer-fem-9999.ebuild b/sci-misc/elmer-fem/elmer-fem-9999.ebuild
176 index 9d97083..0c1260d 100644
177 --- a/sci-misc/elmer-fem/elmer-fem-9999.ebuild
178 +++ b/sci-misc/elmer-fem/elmer-fem-9999.ebuild
179 @@ -1,27 +1,29 @@
180 -# Copyright 1999-2007 Gentoo Foundation
181 +# Copyright 1999-2013 Gentoo Foundation
182 # Distributed under the terms of the GNU General Public License v2
183 # $Header: $
184
185 -EAPI="4"
186 +EAPI=5
187
188 -inherit autotools eutils subversion
189 +AUTOTOOLS_AUTORECONF=true
190 +FORTRAN_STANDARD=90
191 +
192 +inherit autotools-utils fortran-2 multilib subversion
193
194 ELMER_ROOT="elmerfem"
195 MY_PN=${PN/elmer-/}
196
197 -DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, main fem"
198 +DESCRIPTION="Finite element programs, libraries, and visualization tools - main fem"
199 HOMEPAGE="http://www.csc.fi/english/pages/elmer"
200 -#SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz"
201 SRC_URI=""
202 -RESTRICT="mirror"
203 ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}"
204 ESVN_PROJECT="${MY_PN}"
205
206 LICENSE="GPL-2"
207 SLOT="0"
208 -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
209 +KEYWORDS=""
210 IUSE="mpi debug"
211 -DEPEND="sys-libs/glibc
212 +
213 +RDEPEND="
214 virtual/blas
215 virtual/lapack
216 sci-libs/arpack
217 @@ -29,37 +31,26 @@ DEPEND="sys-libs/glibc
218 sci-libs/elmer-hutiter
219 sci-libs/elmer-eio
220 mpi? ( sys-cluster/mpich2 )"
221 -RDEPEND="${DEPEND}"
222 +DEPEND="${RDEPEND}"
223 +# Note this seems to only configure correctly with the elmer version of umfpack
224 +# But this doesn't stop it from compiling / working without it
225
226 -S="${WORKDIR}/${PV}/fem"
227 +S="${WORKDIR}/fem"
228
229 -src_prepare() {
230 - #unpack ${A}
231 - cd "${S}"
232 - # configure must be executable
233 - #chmod +x configure
234 - epatch ${FILESDIR}/elmer-fem-Makefile-install.patch
235 - eautoreconf
236 -}
237 +PATCHES=(
238 + "${FILESDIR}"/${PN}-6.0_p4651-oos.patch
239 + "${FILESDIR}"/${PN}-6.0_p4651-underlinking.patch
240 +)
241
242 src_configure() {
243 - cd "${S}"
244 - local myconf
245 - export FC="gfortran"
246 - export F77="gfortran"
247 - myconf="$myconf --with-blas --with-lapack --with-arpack --with-huti"
248 - myconf="$myconf --with-eiof --with-matc"
249 - #TODO parpack support is not picked up from the arpack package
250 - #TODO --with-hypre --with-umfpack
251 -
252 - use mpi && myconf="$myconf --with-mpi --with-mpi-dir=/usr"
253 - use debug &&
254 - myconf="${myconf} --with-debug" ||
255 - myconf="${myconf} --without-debug"
256 - econf $myconf || die "econf failed"
257 -}
258 -
259 -
260 -src_install() {
261 - emake ELMER_SOLVER_DATADIR="/usr/share/elmersolver" DESTDIR=${D} install || die "emake install failed"
262 + local myeconfargs=(
263 + $(use_with debug)
264 + $(usex mpi --with-mpi "")
265 + $(usex mpi --with-mpi-dir="${EPREFIX}"/usr "")
266 + --with-arpack="$($(tc-getPKG_CONFIG) --libs arpack)"
267 + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
268 + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
269 + --with-huti --with-eiof --with-matc
270 + )
271 + autotools-utils_src_configure
272 }
273
274 diff --git a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch
275 new file mode 100644
276 index 0000000..00291bc
277 --- /dev/null
278 +++ b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch
279 @@ -0,0 +1,75 @@
280 + src/Makefile.am | 6 +++---
281 + 1 file changed, 3 insertions(+), 3 deletions(-)
282 +
283 +diff --git a/src/Makefile.am b/src/Makefile.am
284 +index 9e48c31..b94705c 100644
285 +--- a/src/Makefile.am
286 ++++ b/src/Makefile.am
287 +@@ -182,11 +182,11 @@ SC2Elmer_SOURCES = SC2Elmer.c
288 +
289 + if USE_LOCAL_MPIF_H
290 + mpif: mpif_stub.h
291 +- $(CP) mpif_stub.h mpif.h
292 +- $(CP) mpif_stub.h mpif
293 ++ $(CP) $(srcdir)/mpif_stub.h mpif.h
294 ++ $(CP) $(srcdir)/mpif_stub.h mpif
295 + else
296 + mpif: mpif_stub.h
297 +- $(CP) mpif_stub.h mpif
298 ++ $(CP) $(srcdir)/mpif_stub.h mpif
299 + endif
300 +
301 + EXTRA_DIST = \
302 + src/Makefile.am | 25 +++++++++++++------------
303 + 1 file changed, 13 insertions(+), 12 deletions(-)
304 +
305 +diff --git a/src/Makefile.am b/src/Makefile.am
306 +index 92de7a4..89a2236 100644
307 +--- a/src/Makefile.am
308 ++++ b/src/Makefile.am
309 +@@ -144,32 +144,33 @@ ELMER_SOLVER_DATADIR=$(prefix)/share/elmersolver
310 + install-data-local:
311 + @echo "Installing solvers to ${ELMER_SOLVER_DATADIR}/lib"
312 +
313 +- mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib
314 +- $(CP) `ls -f *$(SHL_EXT) | grep -v libelmersolver` $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib
315 +- $(CP) elements.def $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib
316 +- $(CP) SOLVER.KEYWORDS $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib
317 ++ mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir)
318 ++ $(CP) `ls -f $(builddir)/*$(SHL_EXT) | grep -v libelmersolver` $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir)
319 ++ $(CP) $(srcdir)/elements.def $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir)
320 ++ $(CP) $(srcdir)/SOLVER.KEYWORDS $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir)
321 +
322 + @echo "Installing *.mod to ${ELMER_SOLVER_DATADIR}/include"
323 + mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include
324 +- $(CP) *.mod $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include
325 ++ $(CP) $(builddir)/*.mod $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include
326 +
327 +
328 + install-exec-local:
329 + @echo "Installing stuff to ${prefix}/bin"
330 + $(MKDIR) $(DESTDIR)$(prefix)/bin
331 +- $(CP) ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin
332 +- $(CP) ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin
333 +- $(CP) GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin
334 ++ $(CP) $(builddir)/ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin
335 ++ $(CP) $(builddir)/ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin
336 ++ $(CP) $(builddir)/GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin
337 + if USE_WINDOWS_COMPILER
338 + $(CP) libelmersolver*$(SHL_EXT) $(DESTDIR)$(prefix)/lib
339 + else
340 +- $(CP) libelmersolver-$(VERSION)$(SHL_EXT) $(DESTDIR)$(prefix)/lib
341 ++ mkdir -p $(DESTDIR)$(prefix)/$(libdir)
342 ++ $(CP) $(builddir)/libelmersolver-$(VERSION)$(SHL_EXT) $(DESTDIR)$(prefix)/$(libdir)
343 + $(LN) -sf libelmersolver-$(VERSION)$(SHL_EXT)\
344 +- $(DESTDIR)$(prefix)/lib/libelmersolver$(SHL_EXT)
345 ++ $(DESTDIR)$(prefix)/$(libdir)/libelmersolver$(SHL_EXT)
346 + endif
347 +- $(CP) elmerf90 elmerf90-nosh elmerld $(DESTDIR)$(prefix)/bin
348 ++ $(CP) $(builddir)/elmerf90 $(builddir)/elmerf90-nosh elmerld $(DESTDIR)$(prefix)/bin
349 + if USE_MPI
350 +- $(CP) ElmerSolver_mpi$(EXEEXT) $(DESTDIR)$(prefix)/bin
351 ++ $(CP) $(builddir)/ElmerSolver_mpi$(EXEEXT) $(DESTDIR)$(prefix)/bin
352 + endif
353 +
354 + clean-local:
355
356 diff --git a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch
357 new file mode 100644
358 index 0000000..7c6be1d
359 --- /dev/null
360 +++ b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch
361 @@ -0,0 +1,23 @@
362 + src/Makefile.am | 4 ++--
363 + 1 file changed, 2 insertions(+), 2 deletions(-)
364 +
365 +diff --git a/src/Makefile.am b/src/Makefile.am
366 +index b94705c..92de7a4 100644
367 +--- a/src/Makefile.am
368 ++++ b/src/Makefile.am
369 +@@ -122,13 +122,13 @@ if USE_WINDOWS_COMPILER
370 + else
371 + $(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
372 + -o ViewFactors$(EXE_EXT) ViewFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \
373 +- -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS)
374 ++ -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS) -lhuti
375 + endif
376 +
377 + GebhardtFactors$(EXE_EXT): libelmersolver$(SHL_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT)
378 + $(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
379 + -o GebhardtFactors$(EXE_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \
380 +- -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS)
381 ++ -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) -lhuti
382 +
383 +
384 +
385
386 diff --git a/sci-misc/elmer-fem/metadata.xml b/sci-misc/elmer-fem/metadata.xml
387 new file mode 100644
388 index 0000000..897aa2e
389 --- /dev/null
390 +++ b/sci-misc/elmer-fem/metadata.xml
391 @@ -0,0 +1,5 @@
392 +<?xml version="1.0" encoding="UTF-8"?>
393 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
394 +<pkgmetadata>
395 + <herd>sci</herd>
396 +</pkgmetadata>