Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/Field3D/
Date: Tue, 21 May 2019 21:55:31
Message-Id: 1558475704.2ec025cfb18c105c97dbeac18b7eb1ef5112fab1.asturm@gentoo
1 commit: 2ec025cfb18c105c97dbeac18b7eb1ef5112fab1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 21 21:48:52 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue May 21 21:55:04 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec025cf
7
8 media-libs/Field3D: EAPI-7 bump, USE mpi, add proper src_configure()
9
10 Properly disabling Doxygen (don't even build it if it ain't finished).
11
12 Closes: https://bugs.gentoo.org/573440
13 Package-Manager: Portage-2.3.66, Repoman-2.3.12
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 media-libs/Field3D/Field3D-1.7.2.ebuild | 29 ++++++++++++++++++-----------
17 1 file changed, 18 insertions(+), 11 deletions(-)
18
19 diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
20 index 2238a60f864..1af0862f0c6 100644
21 --- a/media-libs/Field3D/Field3D-1.7.2.ebuild
22 +++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
23 @@ -1,7 +1,7 @@
24 -# Copyright 1999-2018 Gentoo Foundation
25 +# Copyright 1999-2019 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 -EAPI=6
29 +EAPI=7
30
31 inherit cmake-utils
32
33 @@ -12,17 +12,24 @@ SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar
34 LICENSE="BSD"
35 SLOT="0"
36 KEYWORDS="amd64 ~x86"
37 +IUSE="mpi"
38
39 +BDEPEND="virtual/pkgconfig"
40 RDEPEND="
41 >=dev-libs/boost-1.62:=
42 >=media-libs/ilmbase-2.2.0:=
43 sci-libs/hdf5:=
44 - virtual/mpi"
45 -
46 -DEPEND="${RDEPEND}
47 - virtual/pkgconfig"
48 -
49 -PATCHES=( "${FILESDIR}/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch" )
50 -
51 -# Docs are not finished yet.
52 -mycmakeargs=( -DINSTALL_DOCS=OFF )
53 + mpi? ( virtual/mpi )
54 +"
55 +DEPEND="${RDEPEND}"
56 +
57 +PATCHES=( "${FILESDIR}/${P}-Use-PkgConfig-for-IlmBase.patch" )
58 +
59 +src_configure() {
60 + local mycmakeargs=(
61 + -DINSTALL_DOCS=OFF # Docs are not finished yet.
62 + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
63 + $(cmake-utils_use_find_package mpi MPI)
64 + )
65 + cmake-utils_src_configure
66 +}