From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A8B54138335 for ; Tue, 21 May 2019 21:55:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2EBCE0863; Tue, 21 May 2019 21:55:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9DA5E0863 for ; Tue, 21 May 2019 21:55:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94AF8344D7C for ; Tue, 21 May 2019 21:55:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 471105EF for ; Tue, 21 May 2019 21:55:28 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1558475704.2ec025cfb18c105c97dbeac18b7eb1ef5112fab1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/Field3D/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/Field3D/Field3D-1.7.2.ebuild X-VCS-Directories: media-libs/Field3D/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2ec025cfb18c105c97dbeac18b7eb1ef5112fab1 X-VCS-Branch: master Date: Tue, 21 May 2019 21:55:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e0daf57d-a73d-41ee-8c73-c7b05238baf2 X-Archives-Hash: b2938dd7d201fbdeafaf199669cc7a30 commit: 2ec025cfb18c105c97dbeac18b7eb1ef5112fab1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue May 21 21:48:52 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue May 21 21:55:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec025cf media-libs/Field3D: EAPI-7 bump, USE mpi, add proper src_configure() Properly disabling Doxygen (don't even build it if it ain't finished). Closes: https://bugs.gentoo.org/573440 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/Field3D/Field3D-1.7.2.ebuild | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild index 2238a60f864..1af0862f0c6 100644 --- a/media-libs/Field3D/Field3D-1.7.2.ebuild +++ b/media-libs/Field3D/Field3D-1.7.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils @@ -12,17 +12,24 @@ SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~x86" +IUSE="mpi" +BDEPEND="virtual/pkgconfig" RDEPEND=" >=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= - virtual/mpi" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch" ) - -# Docs are not finished yet. -mycmakeargs=( -DINSTALL_DOCS=OFF ) + mpi? ( virtual/mpi ) +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${P}-Use-PkgConfig-for-IlmBase.patch" ) + +src_configure() { + local mycmakeargs=( + -DINSTALL_DOCS=OFF # Docs are not finished yet. + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + $(cmake-utils_use_find_package mpi MPI) + ) + cmake-utils_src_configure +}