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 15174138334 for ; Sun, 17 Feb 2019 12:39:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06D6DE0899; Sun, 17 Feb 2019 12:39:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B66FCE0899 for ; Sun, 17 Feb 2019 12:39:21 +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 32270335D40 for ; Sun, 17 Feb 2019 12:39:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBA72543 for ; Sun, 17 Feb 2019 12:39:18 +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: <1550407140.6026d536aa292b0589c2b29cdd2b6a93ba490eb2.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/flann/flann-1.9.1-r2.ebuild sci-libs/flann/flann-9999.ebuild X-VCS-Directories: sci-libs/flann/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6026d536aa292b0589c2b29cdd2b6a93ba490eb2 X-VCS-Branch: master Date: Sun, 17 Feb 2019 12:39:18 +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: 6735172f-c777-4be2-bf2f-44e34e506a6e X-Archives-Hash: a7ec16daf31bd98d98f6657232224ad8 commit: 6026d536aa292b0589c2b29cdd2b6a93ba490eb2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 17 12:24:01 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 17 12:39:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6026d536 sci-libs/flann: EAPI-7 bump, fix unused cmake var Closes: https://bugs.gentoo.org/659756 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../{flann-9999.ebuild => flann-1.9.1-r2.ebuild} | 32 ++++++++++++---------- sci-libs/flann/flann-9999.ebuild | 26 ++++++++++-------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild similarity index 77% copy from sci-libs/flann/flann-9999.ebuild copy to sci-libs/flann/flann-1.9.1-r2.ebuild index e8b80e9f855..73e6a60c52b 100644 --- a/sci-libs/flann/flann-9999.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -1,37 +1,38 @@ -# 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 cuda flag-o-matic git-r3 toolchain-funcs +inherit cmake-utils cuda flag-o-matic toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/" -EGIT_REPO_URI="https://github.com/mariusmuja/flann.git" +HOMEPAGE="https://www.cs.ubc.ca/research/flann/" +SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi openmp octave static-libs" -RDEPEND=" +BDEPEND=" + app-arch/unzip + doc? ( dev-tex/latex2html ) +" +DEPEND=" cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html )" + octave? ( >=sci-mathematics/octave-3.6.4-r1 ) +" +RDEPEND="${DEPEND}" # TODO: # readd dependencies for test suite, # requires multiple ruby dependencies -PATCHES=( - "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch -) +PATCHES=( "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch ) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -67,7 +68,6 @@ src_configure() { -DBUILD_C_BINDINGS=ON -DBUILD_PYTHON_BINDINGS=OFF -DPYTHON_EXECUTABLE= - -DDOCDIR=share/doc/${PF} -DBUILD_CUDA_LIB=$(usex cuda) -DBUILD_EXAMPLES=$(usex examples) -DBUILD_DOC=$(usex doc) @@ -79,6 +79,8 @@ src_configure() { use cuda && mycmakeargs+=( -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" ) + use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) + cmake-utils_src_configure } diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild index e8b80e9f855..04b6a5770ac 100644 --- a/sci-libs/flann/flann-9999.ebuild +++ b/sci-libs/flann/flann-9999.ebuild @@ -1,12 +1,12 @@ -# 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 cuda flag-o-matic git-r3 toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/" +HOMEPAGE="https://www.cs.ubc.ca/research/flann/" EGIT_REPO_URI="https://github.com/mariusmuja/flann.git" LICENSE="BSD" @@ -14,24 +14,25 @@ SLOT="0" KEYWORDS="" IUSE="cuda doc examples mpi openmp octave static-libs" -RDEPEND=" +BDEPEND=" + doc? ( dev-tex/latex2html ) +" +DEPEND=" + app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html )" + octave? ( >=sci-mathematics/octave-3.6.4-r1 ) +" +RDEPEND="${DEPEND}" # TODO: # readd dependencies for test suite, # requires multiple ruby dependencies -PATCHES=( - "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch -) +PATCHES=( "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch ) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -67,7 +68,6 @@ src_configure() { -DBUILD_C_BINDINGS=ON -DBUILD_PYTHON_BINDINGS=OFF -DPYTHON_EXECUTABLE= - -DDOCDIR=share/doc/${PF} -DBUILD_CUDA_LIB=$(usex cuda) -DBUILD_EXAMPLES=$(usex examples) -DBUILD_DOC=$(usex doc) @@ -79,6 +79,8 @@ src_configure() { use cuda && mycmakeargs+=( -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" ) + use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) + cmake-utils_src_configure }