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-libs/gmsh/
Date: Mon, 21 Sep 2015 17:44:28
Message-Id: 1442857437.3cc234341f62f2e84a8aca6adc852b28dd335480.jlec@gentoo
1 commit: 3cc234341f62f2e84a8aca6adc852b28dd335480
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 21 17:43:57 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 21 17:43:57 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3cc23434
7
8 sci-libs/gmsh: Add subslot operators
9
10 Package-Manager: portage-2.2.20.1
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 sci-libs/gmsh/gmsh-2.8.5.ebuild | 23 +++++++++++------------
14 1 file changed, 11 insertions(+), 12 deletions(-)
15
16 diff --git a/sci-libs/gmsh/gmsh-2.8.5.ebuild b/sci-libs/gmsh/gmsh-2.8.5.ebuild
17 index a56cb4e..368a4e8 100644
18 --- a/sci-libs/gmsh/gmsh-2.8.5.ebuild
19 +++ b/sci-libs/gmsh/gmsh-2.8.5.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2014 Gentoo Foundation
22 +# Copyright 1999-2015 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24 # $Id$
25
26 @@ -6,7 +6,7 @@ EAPI=5
27
28 inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs
29
30 -DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities"
31 +DESCRIPTION="A three-dimensional finite element mesh generator"
32 HOMEPAGE="http://www.geuz.org/gmsh/"
33 SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
34
35 @@ -22,11 +22,11 @@ RDEPEND="
36 X? ( x11-libs/fltk:1 )
37 blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
38 cgns? ( sci-libs/cgnslib )
39 - jpeg? ( virtual/jpeg )
40 - lua? ( dev-lang/lua )
41 + jpeg? ( virtual/jpeg:0= )
42 + lua? ( dev-lang/lua:0 )
43 med? ( >=sci-libs/med-2.3.4 )
44 - opencascade? ( sci-libs/opencascade )
45 - png? ( media-libs/libpng )
46 + opencascade? ( sci-libs/opencascade:* )
47 + png? ( media-libs/libpng:0= )
48 petsc? ( <=sci-mathematics/petsc-3.4.2 )
49 zlib? ( sys-libs/zlib )
50 mpi? ( virtual/mpi[cxx] )
51 @@ -70,8 +70,7 @@ src_configure() {
52 $(cmake-utils_use_enable petsc PETSC)"
53 # $(cmake-utils_use_enable tetgen TETGEN_NEW)
54
55 - cmake-utils_src_configure ${mycmakeargs} \
56 - || die "cmake configuration failed"
57 + cmake-utils_src_configure ${mycmakeargs}
58 }
59
60 src_install() {
61 @@ -79,14 +78,14 @@ src_install() {
62
63 # TODO: tutorials get installed twice ATM
64 if use doc ; then
65 - cd "${CMAKE_BUILD_DIR}"
66 - emake pdf || die "failed to build documentation"
67 - cd "${S}"
68 + cd "${CMAKE_BUILD_DIR}" || die
69 + emake pdf
70 + cd "${S}" || die
71 dodoc doc/texinfo/gmsh.pdf
72 fi
73
74 if use examples ; then
75 insinto /usr/share/doc/${PF}
76 - doins -r demos tutorial || die "failed to install examples"
77 + doins -r demos tutorial
78 fi
79 }