public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2016-01-07 19:25 Justin Lecher
  0 siblings, 0 replies; 24+ messages in thread
From: Justin Lecher @ 2016-01-07 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     29fb908337297d83ef1a6ef6dd750fb7c8b5e5a4
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 19:23:46 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 19:23:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29fb9083

sci-libs/flann: Drop unnecesarry patches

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/flann/flann-9999.ebuild | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild
index 5a505d8..14e0996 100644
--- a/sci-libs/flann/flann-9999.ebuild
+++ b/sci-libs/flann/flann-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -33,14 +33,6 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.4-options.patch
-	"${FILESDIR}"/${PN}-1.8.4-CUDA_NVCC_FLAGS.patch
-	"${FILESDIR}"/${PN}-1.8.4-cuda5.5.patch
-	"${FILESDIR}"/${PN}-1.8.4-multilib.patch
-	"${FILESDIR}"/${PN}-1.8.4-docdir.patch
-)
-
 pkg_setup() {
 	if use openmp; then
 		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2016-01-07 19:25 Justin Lecher
  0 siblings, 0 replies; 24+ messages in thread
From: Justin Lecher @ 2016-01-07 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9b8aa4c0811ae9e6d7325dfc33edc962ce8cb0dc
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 19:25:13 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 19:25:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b8aa4c0

sci-libs/flann: Chop DESCRIPTION to 80 chars

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/flann/flann-1.8.4-r1.ebuild | 4 ++--
 sci-libs/flann/flann-9999.ebuild     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/flann/flann-1.8.4-r1.ebuild b/sci-libs/flann/flann-1.8.4-r1.ebuild
index 550389a..24da6e7 100644
--- a/sci-libs/flann/flann-1.8.4-r1.ebuild
+++ b/sci-libs/flann/flann-1.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit cmake-utils cuda eutils multilib toolchain-funcs
 
-DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
+DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
 HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
 SRC_URI="
 	http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip

diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild
index 14e0996..7c99bb0 100644
--- a/sci-libs/flann/flann-9999.ebuild
+++ b/sci-libs/flann/flann-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit cmake-utils cuda eutils git-r3 multilib toolchain-funcs
 
-DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
+DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
 HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
 SRC_URI="test? ( https://dev.gentoo.org/~bicatali/distfiles/${PN}-1.8.4-testdata.tar.xz )"
 EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2016-09-15 21:26 David Seifert
  0 siblings, 0 replies; 24+ messages in thread
From: David Seifert @ 2016-09-15 21:26 UTC (permalink / raw
  To: gentoo-commits

commit:     1ca3b429a59c04d4b77e1963540db544fa71ee64
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 20:39:37 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 21:24:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca3b429

sci-libs/flann: Version bump to 1.9.1

Gentoo-bug: 593856
* EAPI=6
* Removed src_test(), as flann now requires
  ruby for tests.

Package-Manager: portage-2.3.0

 sci-libs/flann/Manifest           |  1 +
 sci-libs/flann/flann-1.9.1.ebuild | 86 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 39203fd..7b4a809 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,2 +1,3 @@
 DIST flann-1.8.4-src.zip 561057 SHA256 dfbb9321b0d687626a644c70872a2c540b16200e7f4c7bd72f91ae032f445c08 SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a WHIRLPOOL f7722d8c0a8482809920927353421ebb578464fe6746a4dba20a6c7b6f941715529d5be33aebd1726db36eae3b5d4080c6ae86b0f807e6e384af32b87735b83b
 DIST flann-1.8.4-testdata.tar.xz 26744244 SHA256 4eaecf3a221ea6611e841fa2f459a17b6a5fdd633338bb5bc46c434e37667141 SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb WHIRLPOOL e49e5a594464955241ebc9bdfa908bac8b93b2fb465fc08ab73ec4d57194a8b71361ecb67985cdc641013fb8c3fb51ea2033769f41e558ab86e8f71e477b97da
+DIST flann-1.9.1.tar.gz 485391 SHA256 b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3 SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 WHIRLPOOL 40c16b3b2d8ef458676c37a246ae1c0d45d14163a42a46172283cf20a377ee43971e7cacce9d575cc7ecfa0eab01377dbd5e592e3e7ae71e74334af18ebab836

diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild
new file mode 100644
index 00000000..b4f868b
--- /dev/null
+++ b/sci-libs/flann/flann-1.9.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils cuda 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_setup() {
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+	fi
+}
+
+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() {
+	# 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},-arsch"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if ! use static-libs; then
+		find "${D}" -name 'lib*.a' -delete || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2017-01-15 18:58 Andreas Hüttel
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Hüttel @ 2017-01-15 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     8f509310510a3ab61ec169fc3bbb989c903581f6
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 18:47:15 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 18:57:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f509310

sci-libs/flann: Drop to ~arch (no stable reverse deps) so bug 590244 can go ahead

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/flann/flann-1.8.4-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/flann/flann-1.8.4-r1.ebuild b/sci-libs/flann/flann-1.8.4-r1.ebuild
index 24da6e7..a8bb0b8 100644
--- a/sci-libs/flann/flann-1.8.4-r1.ebuild
+++ b/sci-libs/flann/flann-1.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi openmp octave static-libs test"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2017-04-21 21:34 David Seifert
  0 siblings, 0 replies; 24+ messages in thread
From: David Seifert @ 2017-04-21 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     da0ccdb61002b260e0c2a8acf67b1646fc072ab0
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 21:33:13 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 21:34:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da0ccdb6

sci-libs/flann: Force C++11

Bug: https://bugs.gentoo.org/show_bug.cgi?id=614552
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sci-libs/flann/flann-1.9.1.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild
index a625b8cdeed..cc7583379a9 100644
--- a/sci-libs/flann/flann-1.9.1.ebuild
+++ b/sci-libs/flann/flann-1.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils cuda 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/"
@@ -29,13 +29,12 @@ DEPEND="${RDEPEND}
 # readd dependencies for test suite,
 # requires multiple ruby dependencies
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
@@ -56,6 +55,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cxxflags -std=c++11
+
 	# python bindings are split
 	# off into dev-python/pyflann
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2018-02-06 18:05 Amy Liffey
  0 siblings, 0 replies; 24+ messages in thread
From: Amy Liffey @ 2018-02-06 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     a27be96554ff89124e27de08d56d34215428dd1d
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  6 17:56:07 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 18:04:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27be965

sci-libs/flann: fix cuda linking error

Submitted-by: pa.lacaze <AT> gmail.com
Closes: https://bugs.gentoo.org/607062
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sci-libs/flann/flann-1.9.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild
index cc7583379a9..af848293644 100644
--- a/sci-libs/flann/flann-1.9.1.ebuild
+++ b/sci-libs/flann/flann-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,7 +73,7 @@ src_configure() {
 		-DUSE_OPENMP=$(usex openmp)
 	)
 	use cuda && mycmakeargs+=(
-		-DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
+		-DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\""
 	)
 	cmake-utils_src_configure
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2018-06-06 14:55 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2018-06-06 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e20eb846570051b5a5aa2331fb4e3d2861050e15
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 12:30:02 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 14:54:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20eb846

sci-libs/flann: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/flann/Manifest              |   1 -
 sci-libs/flann/flann-1.8.4-r1.ebuild | 108 -----------------------------------
 2 files changed, 109 deletions(-)

diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index b7bd4a7ec5e..fc60a7b83e9 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,3 +1,2 @@
-DIST flann-1.8.4-src.zip 561057 BLAKE2B 0cd1cf7bc394501d878d848246f76919924e39dc950e49e82bd2c8dbf46d9626fc9749ba4578ce62aabd0313314969dd7f6883c42167545238bc89561ce028ce SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a
 DIST flann-1.8.4-testdata.tar.xz 26744244 BLAKE2B eb8a5066d79dedd2ff4ec48f0e0969d6486417abfb2cc5c2e3e1e0f8dfef637f2cb290e8f1868b819ff7e4d71687daf2aaeb16c8197f5642125ea50ef775441f SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7

diff --git a/sci-libs/flann/flann-1.8.4-r1.ebuild b/sci-libs/flann/flann-1.8.4-r1.ebuild
deleted file mode 100644
index 00be826a33e..00000000000
--- a/sci-libs/flann/flann-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils cuda eutils multilib toolchain-funcs
-
-DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
-SRC_URI="
-	http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
-	test? ( https://dev.gentoo.org/~bicatali/distfiles/${P}-testdata.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc examples mpi openmp octave static-libs test"
-
-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 )
-	test? (
-		dev-cpp/gtest
-		cuda? ( sci-libs/hdf5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-examples.patch
-	"${FILESDIR}"/${P}-options.patch
-	"${FILESDIR}"/${P}-CUDA_NVCC_FLAGS.patch
-	"${FILESDIR}"/${P}-cuda5.5.patch
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-docdir.patch
-)
-
-S="${WORKDIR}"/${P}-src
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
-}
-
-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() {
-	# python bindings are split
-	local mycmakeargs=(
-		-DBUILD_C_BINDINGS=ON
-		-DBUILD_PYTHON_BINDINGS=OFF
-		-DPYTHON_EXECUTABLE=
-		-DDOCDIR=share/doc/${PF}
-		$(cmake-utils_use_build cuda CUDA_LIB)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build octave MATLAB_BINDINGS)
-		$(cmake-utils_use_use mpi)
-		$(cmake-utils_use_use openmp)
-	)
-	use cuda && \
-		mycmakeargs+=(
-		-DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
-		)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	ln -s "${WORKDIR}"/testdata/* test/ || die
-	# -j1 to avoid obversubscribing jobs
-	LD_LIBRARY_PATH="${BUILD_DIR}/lib" \
-		cmake-utils_src_compile -j1 test
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	if ! use static-libs; then
-		find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2018-06-06 14:55 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2018-06-06 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a6639daf8bff5b5de398cfcf109a4a3385e96f0a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 12:38:45 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 14:54:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6639daf

sci-libs/flann: Sync live with 1.9.1 updates

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/flann/Manifest          |  1 -
 sci-libs/flann/flann-9999.ebuild | 70 ++++++++++++++++------------------------
 2 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index fc60a7b83e9..c8693334eee 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,2 +1 @@
-DIST flann-1.8.4-testdata.tar.xz 26744244 BLAKE2B eb8a5066d79dedd2ff4ec48f0e0969d6486417abfb2cc5c2e3e1e0f8dfef637f2cb290e8f1868b819ff7e4d71687daf2aaeb16c8197f5642125ea50ef775441f SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7

diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild
index 2f25498da1d..06d78eb963d 100644
--- a/sci-libs/flann/flann-9999.ebuild
+++ b/sci-libs/flann/flann-9999.ebuild
@@ -1,55 +1,45 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils cuda eutils git-r3 multilib toolchain-funcs
+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/"
-SRC_URI="test? ( https://dev.gentoo.org/~bicatali/distfiles/${PN}-1.8.4-testdata.tar.xz )"
 EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="cuda doc examples mpi openmp octave static-libs test"
+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]
+		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 )
-	test? (
-		dev-cpp/gtest
-		cuda? ( sci-libs/hdf5 )
-	)
-"
+	doc? ( dev-tex/latex2html )"
+# TODO:
+# readd dependencies for test suite,
+# requires multiple ruby dependencies
 
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-src_unpack() {
-	default
-	git-r3_src_unpack
+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 \
@@ -65,38 +55,32 @@ 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}
-		$(cmake-utils_use_build cuda CUDA_LIB)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build octave MATLAB_BINDINGS)
-		$(cmake-utils_use_use mpi)
-		$(cmake-utils_use_use openmp)
+		-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\""
 	)
-	use cuda && \
-		mycmakeargs+=(
-		-DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
-		)
 	cmake-utils_src_configure
 }
 
-src_test() {
-	ln -s "${WORKDIR}"/testdata/* test/ || die
-	# -j1 to avoid obversubscribing jobs
-	LD_LIBRARY_PATH="${BUILD_DIR}/lib" \
-		cmake-utils_src_compile -j1 test
-}
-
 src_install() {
 	cmake-utils_src_install
-	dodoc README.md
 	if ! use static-libs; then
-		find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
+		find "${D}" -name 'lib*.a' -delete || die
 	fi
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2018-06-24 13:09 Jason Zaman
  0 siblings, 0 replies; 24+ messages in thread
From: Jason Zaman @ 2018-06-24 13:09 UTC (permalink / raw
  To: gentoo-commits

commit:     d7342d6d68c10e56c0fd15b1c0de3f8b5851a696
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 13:07:55 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 13:07:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7342d6d

sci-libs/flann: amd64 stable

Gentoo-bug: 652654
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/flann/flann-1.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild
index af848293644..48b07167075 100644
--- a/sci-libs/flann/flann-1.9.1.ebuild
+++ b/sci-libs/flann/flann-1.9.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi openmp octave static-libs"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2018-07-09  1:29 Thomas Deutschmann
  0 siblings, 0 replies; 24+ messages in thread
From: Thomas Deutschmann @ 2018-07-09  1:29 UTC (permalink / raw
  To: gentoo-commits

commit:     c34b94be492903fc956651080b37ab7ba270e1dd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 01:19:16 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 01:28:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c34b94be

sci-libs/flann: x86 stable (bug #652654)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sci-libs/flann/flann-1.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild
index 48b07167075..98e3f17c9fd 100644
--- a/sci-libs/flann/flann-1.9.1.ebuild
+++ b/sci-libs/flann/flann-1.9.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi openmp octave static-libs"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2019-02-17 12:39 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2019-02-17 12:39 UTC (permalink / raw
  To: gentoo-commits

commit:     6026d536aa292b0589c2b29cdd2b6a93ba490eb2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 12:24:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
 }
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2019-05-13  1:41 Thomas Deutschmann
  0 siblings, 0 replies; 24+ messages in thread
From: Thomas Deutschmann @ 2019-05-13  1:41 UTC (permalink / raw
  To: gentoo-commits

commit:     ebb6563218b0bf2a66a580a5c560e2f2f483033d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 01:32:50 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon May 13 01:40:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb65632

sci-libs/flann: x86 stable (bug #652594)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sci-libs/flann/flann-1.9.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild
index c240ca1dcf1..b628b93c4ce 100644
--- a/sci-libs/flann/flann-1.9.1-r2.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi openmp octave static-libs"
 
 BDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2019-05-19 21:19 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2019-05-19 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     b2e14fba0824139e7c8ba8052278ec59df85b2da
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 21:08:38 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2019-05-19 21:42 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2019-05-19 21:42 UTC (permalink / raw
  To: gentoo-commits

commit:     3368d93400098b40cc0b8cef7a3d7b19d99e5b81
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 21:40:32 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 19 21:42:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3368d934

sci-libs/flann: Really 1.9.1-r2 amd64 stable

We got mail so we assume it was done.

Closes: https://bugs.gentoo.org/652594
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/flann/flann-1.9.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild
index 4b72bf9fbe2..8d3a7477b4b 100644
--- a/sci-libs/flann/flann-1.9.1-r2.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi openmp octave static-libs"
 
 BDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2019-05-20 17:22 Aaron Bauman
  0 siblings, 0 replies; 24+ messages in thread
From: Aaron Bauman @ 2019-05-20 17:22 UTC (permalink / raw
  To: gentoo-commits

commit:     321856d6883957afab0b3243b7eb3fc5bdfd9ea4
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 17:07:50 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon May 20 17:22:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321856d6

sci-libs/flann: arm64 stable

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 sci-libs/flann/flann-1.9.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild
index 8d3a7477b4b..f6ffdd259b2 100644
--- a/sci-libs/flann/flann-1.9.1-r2.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi openmp octave static-libs"
 
 BDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2020-05-23 10:53 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-05-23 10:53 UTC (permalink / raw
  To: gentoo-commits

commit:     5b0a118d58dcc3e38b542f4c4e9aa53dd3c9d9a9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 09:44:41 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 23 10:52:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0a118d

sci-libs/flann: Drop 1.9.1-r2

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/flann/flann-1.9.1-r2.ebuild | 95 ------------------------------------
 1 file changed, 95 deletions(-)

diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild
deleted file mode 100644
index f6ffdd259b2..00000000000
--- a/sci-libs/flann/flann-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils cuda flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-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="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc examples mpi openmp octave static-libs"
-
-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 )
-"
-RDEPEND="${DEPEND}"
-# TODO:
-# readd dependencies for test suite,
-# requires multiple ruby dependencies
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030
-	"${FILESDIR}"/${P}-cuda-9.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=
-		-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\""
-	)
-	use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use static-libs; then
-		find "${D}" -name 'lib*.a' -delete || die
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2020-05-23 10:53 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-05-23 10:53 UTC (permalink / raw
  To: gentoo-commits

commit:     67970b58a844a1604acf62765810abb7f7cc3658
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 09:44:17 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 23 10:52:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67970b58

sci-libs/flann: Fix HOMEPAGE, old one was dead

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/flann/flann-1.9.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/flann/flann-1.9.1-r3.ebuild b/sci-libs/flann/flann-1.9.1-r3.ebuild
index b34a54471dc..e53d428ee73 100644
--- a/sci-libs/flann/flann-1.9.1-r3.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake cuda flag-o-matic toolchain-funcs
 
 DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="https://www.cs.ubc.ca/research/flann/"
+HOMEPAGE="https://github.com/mariusmuja/flann"
 SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2021-11-07 15:41 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-11-07 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     535129904c2663195386eb41bd676ed3100fc0bd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 12:17:17 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 15:41:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53512990

sci-libs/flann: Drop unmaintained 9999 ebuild

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/flann/flann-9999.ebuild | 92 ----------------------------------------
 1 file changed, 92 deletions(-)

diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild
deleted file mode 100644
index 04b6a5770ac..00000000000
--- a/sci-libs/flann/flann-9999.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils cuda flag-o-matic git-r3 toolchain-funcs
-
-DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="https://www.cs.ubc.ca/research/flann/"
-EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="cuda doc examples mpi openmp octave static-libs"
-
-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 )
-"
-RDEPEND="${DEPEND}"
-# 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=
-		-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\""
-	)
-	use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use static-libs; then
-		find "${D}" -name 'lib*.a' -delete || die
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2021-12-26  3:08 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-12-26  3:08 UTC (permalink / raw
  To: gentoo-commits

commit:     3db33dc972b14fd6fe3c944f5376597b720ec5e2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 03:07:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 03:07:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db33dc9

sci-libs/flann: adjust patch reference

Bug: https://bugs.gentoo.org/827263
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/flann/flann-1.9.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/flann/flann-1.9.1-r4.ebuild b/sci-libs/flann/flann-1.9.1-r4.ebuild
index 49a8a1c514e2..299876df8ad3 100644
--- a/sci-libs/flann/flann-1.9.1-r4.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r4.ebuild
@@ -37,7 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030
 	"${FILESDIR}"/${P}-cuda-9.patch
 	"${FILESDIR}"/${P}-system-lz4.patch # bug 681898
-	"${FILESDIR}"/flann-1.9.1-system-lz4-pkgconfig.patch
+	"${FILESDIR}"/${P}-system-lz4-pkgconfig.patch # bug 827263
 )
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2022-02-18  3:07 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-02-18  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     01f352b1649fc560c6cea09b91e72e56b49f6f68
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Wed Feb 16 22:13:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 03:05:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f352b1

sci-libs/flann: fix RUNPATH with MPI

Bug: https://bugs.gentoo.org/795828
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24221
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/flann/flann-1.9.1-r5.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild
index 716c7a4fec72..788c2733be10 100644
--- a/sci-libs/flann/flann-1.9.1-r5.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r5.ebuild
@@ -17,6 +17,7 @@ IUSE="cuda doc examples mpi octave openmp"
 BDEPEND="
 	app-arch/unzip
 	doc? ( dev-tex/latex2html )
+	mpi? ( app-admin/chrpath )
 "
 DEPEND="
 	app-arch/lz4:=
@@ -85,4 +86,9 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	find "${D}" -name 'lib*.a' -delete || die
+
+	# bug 795828; mpicc volunterely adds some runpaths
+	if use mpi; then
+		chrpath -d "${ED}"/usr/bin/flann_mpi_{client,server} || die
+	fi
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2022-12-18 11:01 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-12-18 11:01 UTC (permalink / raw
  To: gentoo-commits

commit:     469f3c378af339b0dfdebf03980a5b38552ad697
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 11:01:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 11:01:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469f3c37

sci-libs/flann: Stabilize 1.9.1-r5 arm64, #886643

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/flann/flann-1.9.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild
index 788c2733be10..d8f4e02ab620 100644
--- a/sci-libs/flann/flann-1.9.1-r5.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi octave openmp"
 
 BDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2022-12-18 11:29 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-12-18 11:29 UTC (permalink / raw
  To: gentoo-commits

commit:     2949418714bd5dc4e8592e76e81d9114b15b7b99
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 11:29:31 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 11:29:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29494187

sci-libs/flann: Stabilize 1.9.1-r5 x86, #886643

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/flann/flann-1.9.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild
index d8f4e02ab620..8c97f094cc69 100644
--- a/sci-libs/flann/flann-1.9.1-r5.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi octave openmp"
 
 BDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2022-12-19 14:47 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-12-19 14:47 UTC (permalink / raw
  To: gentoo-commits

commit:     319cfc9e74ce46a1d52a6cc37a6ca094ebcf05b1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 08:47:35 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 14:44:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319cfc9e

sci-libs/flann: drop 1.9.1-r4

Closes: https://bugs.gentoo.org/886643
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/flann/flann-1.9.1-r4.ebuild | 95 ------------------------------------
 1 file changed, 95 deletions(-)

diff --git a/sci-libs/flann/flann-1.9.1-r4.ebuild b/sci-libs/flann/flann-1.9.1-r4.ebuild
deleted file mode 100644
index 299876df8ad3..000000000000
--- a/sci-libs/flann/flann-1.9.1-r4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake cuda flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="https://github.com/mariusmuja/flann"
-SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc examples mpi octave openmp"
-
-BDEPEND="
-	app-arch/unzip
-	doc? ( dev-tex/latex2html )
-"
-DEPEND="
-	app-arch/lz4:=
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	mpi? (
-		dev-libs/boost:=[mpi]
-		sci-libs/hdf5[mpi]
-	)
-	!mpi? ( !sci-libs/hdf5[mpi] )
-	octave? ( >=sci-mathematics/octave-3.6.4-r1 )
-"
-RDEPEND="${DEPEND}"
-# TODO:
-# readd dependencies for test suite,
-# requires multiple ruby dependencies
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030
-	"${FILESDIR}"/${P}-cuda-9.patch
-	"${FILESDIR}"/${P}-system-lz4.patch # bug 681898
-	"${FILESDIR}"/${P}-system-lz4-pkgconfig.patch # bug 827263
-)
-
-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_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=
-		-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\""
-	)
-	use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name 'lib*.a' -delete || die
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
@ 2024-04-23 20:37 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-04-23 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     a46fb07e56cbf99cc3fd82c562f579d761628342
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 20:29:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 20:33:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a46fb07e

sci-libs/flann: add subslot dep on sci-libs/hdf5

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/flann/{flann-1.9.1-r5.ebuild => flann-1.9.1-r6.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r6.ebuild
similarity index 97%
rename from sci-libs/flann/flann-1.9.1-r5.ebuild
rename to sci-libs/flann/flann-1.9.1-r6.ebuild
index 6f4b7099f0e9..8f253ff0802e 100644
--- a/sci-libs/flann/flann-1.9.1-r5.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ DEPEND="
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
 	mpi? (
 		dev-libs/boost:=[mpi]
-		sci-libs/hdf5[mpi]
+		sci-libs/hdf5:=[mpi]
 	)
 	!mpi? ( !sci-libs/hdf5[mpi] )
 	octave? ( >=sci-mathematics/octave-3.6.4-r1:= )


^ permalink raw reply related	[flat|nested] 24+ messages in thread
end of thread, other threads:[~2024-04-23 20:37 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-23 20:37 [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-12-19 14:47 Andreas Sturmlechner
2022-12-18 11:29 Sam James
2022-12-18 11:01 Sam James
2022-02-18  3:07 Sam James
2021-12-26  3:08 Sam James
2021-11-07 15:41 Andreas Sturmlechner
2020-05-23 10:53 Andreas Sturmlechner
2020-05-23 10:53 Andreas Sturmlechner
2019-05-20 17:22 Aaron Bauman
2019-05-19 21:42 Andreas Sturmlechner
2019-05-19 21:19 Andreas Sturmlechner
2019-05-13  1:41 Thomas Deutschmann
2019-02-17 12:39 Andreas Sturmlechner
2018-07-09  1:29 Thomas Deutschmann
2018-06-24 13:09 Jason Zaman
2018-06-06 14:55 Andreas Sturmlechner
2018-06-06 14:55 Andreas Sturmlechner
2018-02-06 18:05 Amy Liffey
2017-04-21 21:34 David Seifert
2017-01-15 18:58 Andreas Hüttel
2016-09-15 21:26 David Seifert
2016-01-07 19:25 Justin Lecher
2016-01-07 19:25 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox