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 76EED138336 for ; Sun, 19 May 2019 21:20:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A4BDE082B; Sun, 19 May 2019 21:20:00 +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 0D094E082B for ; Sun, 19 May 2019 21:19:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4428F344AF6 for ; Sun, 19 May 2019 21:19:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EBFC5EF for ; Sun, 19 May 2019 21:19:56 +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: <1558300118.b2e14fba0824139e7c8ba8052278ec59df85b2da.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-r1.ebuild sci-libs/flann/flann-1.9.1.ebuild X-VCS-Directories: sci-libs/flann/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b2e14fba0824139e7c8ba8052278ec59df85b2da X-VCS-Branch: master Date: Sun, 19 May 2019 21:19:56 +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: ebd7d6fb-2d45-4564-b07b-a4d2067e01bf X-Archives-Hash: dd5bb1cf536c54afd0e1fff25e138f63 commit: b2e14fba0824139e7c8ba8052278ec59df85b2da Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 19 21:08:38 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 19 21:08:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e14fba sci-libs/flann: Drop old Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/flann-1.9.1-r1.ebuild | 90 ------------------------------------ sci-libs/flann/flann-1.9.1.ebuild | 86 ---------------------------------- 2 files changed, 176 deletions(-) diff --git a/sci-libs/flann/flann-1.9.1-r1.ebuild b/sci-libs/flann/flann-1.9.1-r1.ebuild deleted file mode 100644 index fcb4ef999df..00000000000 --- a/sci-libs/flann/flann-1.9.1-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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/" -SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="cuda doc examples mpi openmp octave static-libs" - -RDEPEND=" - 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 )" -# TODO: -# readd dependencies for test suite, -# requires multiple ruby dependencies - -PATCHES=( - "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - # bug #302621 - use mpi && export CXX=mpicxx - # produce pure octave files - # octave gentoo installation for .m files respected - sed -i \ - -e 's/--mex//' \ - -e 's/\.mex/\.oct/' \ - -e '/FILES/s/${MEX_FILE}//' \ - -e 's:share/flann/octave:share/octave/site/m:' \ - -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ - src/matlab/CMakeLists.txt || die - use cuda && cuda_src_prepare - - cmake-utils_src_prepare -} - -src_configure() { - append-cxxflags -std=c++11 - - # python bindings are split - # off into dev-python/pyflann - local mycmakeargs=( - -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) - -DBUILD_TESTS=OFF - -DBUILD_MATLAB_BINDINGS=$(usex octave) - -DUSE_MPI=$(usex mpi) - -DUSE_OPENMP=$(usex openmp) - ) - use cuda && mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if ! use static-libs; then - find "${D}" -name 'lib*.a' -delete || die - fi -} diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild deleted file mode 100644 index 98e3f17c9fd..00000000000 --- a/sci-libs/flann/flann-1.9.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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/" -SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="cuda doc examples mpi openmp octave static-libs" - -RDEPEND=" - 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 )" -# TODO: -# readd dependencies for test suite, -# requires multiple ruby dependencies - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - # bug #302621 - use mpi && export CXX=mpicxx - # produce pure octave files - # octave gentoo installation for .m files respected - sed -i \ - -e 's/--mex//' \ - -e 's/\.mex/\.oct/' \ - -e '/FILES/s/${MEX_FILE}//' \ - -e 's:share/flann/octave:share/octave/site/m:' \ - -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ - src/matlab/CMakeLists.txt || die - use cuda && cuda_src_prepare - - cmake-utils_src_prepare -} - -src_configure() { - append-cxxflags -std=c++11 - - # python bindings are split - # off into dev-python/pyflann - local mycmakeargs=( - -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) - -DBUILD_TESTS=OFF - -DBUILD_MATLAB_BINDINGS=$(usex octave) - -DUSE_MPI=$(usex mpi) - -DUSE_OPENMP=$(usex openmp) - ) - use cuda && mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if ! use static-libs; then - find "${D}" -name 'lib*.a' -delete || die - fi -}