Version bump. Needs still implementation of cuda support.

Package-Manager: portage-2.1.10.47/cvs/Linux x86_64

3 files changed, 109 insertions, 8 deletions

diff --git a/sci-libs/flann/ChangeLog b/sci-libs/flann/ChangeLog
index 21007e10abd4..3fe4964db0cf 100644
--- a/sci-libs/flann/ChangeLog
+++ b/sci-libs/flann/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/flann
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.12 2011/11/11 20:12:59 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.13 2012/02/19 22:34:54 dilfridge Exp $
+
+*flann-1.7.1 (19 Feb 2012)
+
+  19 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> +flann-1.7.1.ebuild:
+  Version bump. Needs still implementation of cuda support.
 
   11 Nov 2011; Mike Frysinger <vapier@gentoo.org> flann-1.6.8.ebuild,
   flann-1.6.10.ebuild, flann-1.6.11.ebuild:
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 91a1ab187afe..5ef6580f80d7 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,19 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST flann-1.6.10-src.zip 499308 RMD160 4d1bcf66e1aa782a96ff0230b270cf13c004860f SHA1 1a172bd57ac720b621d60a9b81fde62bf4e99708 SHA256 403ab6742177d3f0c7ad651045275e3697cd9ca17b7abc18f9f37d0f9a9a6bda
 DIST flann-1.6.10-testdata.tar.xz 26425552 RMD160 2a1b7a34f6d5361ba037b01c1afec79f911e0dcd SHA1 cf11d7fbcc82da8567d0fb73789375f00ac2bdd8 SHA256 5cfd556cae36b5901b929d82492523754dc98c7535338b7c87d55e0a63e14364
 DIST flann-1.6.11-src.zip 500128 RMD160 52263c560f71d0ce1fc4f6c63c19bfc2f789c7ea SHA1 cecb709299f1cf16c9f6202e648d6d7ee2b12f8a SHA256 9c4e8a4aa4c7f06ad0bfaf2a4fc5183b34bdc7a6bcf78c122b500b922927c776
 DIST flann-1.6.8-src.zip 438645 RMD160 f253c0d65a583632ae2083ab642cb55f51ec90ba SHA1 35e8ca5dd76a1c36652e3c41fc3591a3d6f542c2 SHA256 a03860a31dc40c288e7777620023a3b3ab4227b652bb2cdf40097819049ae929
+DIST flann-1.7.1-src.zip 582517 RMD160 cec1ce99d2c91ddf8f20d5aa8009a08c5347b904 SHA1 61b9858620528919ea60a2a4b085ccc2b3c2d138 SHA256 eafb8c07cf59ff050be149b15d620ca3dd162e3fce9cb6748cde5d92e0dac775
 EBUILD flann-1.6.10.ebuild 2421 RMD160 ff3ca26ef4102f5dd236cda49340bee407d79ce9 SHA1 9bcfff9d1540977fba2ac7392b44fbc79471587e SHA256 033f5f629a29d3a714ad62fff626b0a0743a7b1b531bd0e6b27324f8a0531ca1
 EBUILD flann-1.6.11.ebuild 2433 RMD160 8c631988b51d6d48244508391bba4c8e7c3fb483 SHA1 acddc5be5cf01474d4a0848b31c49e40e413dff2 SHA256 8a024eca2acbcdacb4fdff392d710506733e01e38de04b28fed107a5e29ceffc
 EBUILD flann-1.6.8.ebuild 1103 RMD160 5915cc0a5dbfdd351cf9605ff424935183db758d SHA1 d82b9bc6c2d38d71415d0d1816029fae5d5f732d SHA256 1ceb8f9dd6d37ba972c706a16169d4c106f257e441bea19070818afc18180d85
-MISC ChangeLog 1881 RMD160 a6f6b3af4d8e176ea6bd0dc327cca83c12fe0efd SHA1 aadd332f2d9d561881f2137d2374eb70824c6253 SHA256 ada91f9f8dcdaf8f04284529dc824858b21feabdd9bcfd8b25ef1d7aab26c8f2
+EBUILD flann-1.7.1.ebuild 2492 RMD160 a251e127d87e511e5dd8b28ab55d328703855ea4 SHA1 783b5024709d225e374b9c608dcdff89bc2fdd65 SHA256 3c6f9851751382e72797bb96d056444175aaa7c7a2e315dd92040352c16645af
+MISC ChangeLog 2051 RMD160 ec6eb48cdcbf63db8a8fa2eacae3c43a1236b1ba SHA1 c813b8bebcad0670e0dd9f2cba78b5a1fd566b10 SHA256 d78a272ad548a58d1b693072d43d1f8c9ee2aea84dfbfa5a34fe0fdb406f4bef
 MISC metadata.xml 696 RMD160 af7004ccf5ad18f3e8343a0aa68d25d58296cb6c SHA1 5e9530cb2905e7b9b0e19c842f1d0cd9d1c47273 SHA256 324ee2c5f7d3398746efd0e5bfee61e364134800da252630d88e31eb69d4f34b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk69gdIACgkQaC/OocHi7JbVogD+I40W1ECe/41Kr4G/ukDj93qw
-1w3bPN0dwXjcpF2xpJ4A/1oDWntSfJaQ3scqRxysw5KQgWoSAHRHzkdb9qCZSj6U
-=GQiJ
+iQIcBAEBCgAGBQJPQXl+AAoJENwGBM22xffe920P/2MCUtASaH3U7dBvMAYdORMM
+0chRHLPre+lLiorBzAA8EvVL0LIjkS1wrLxMZrSWVD92nWT3ArBPFye4LkHZ8KBk
+ewwiohLD5BxhuF7nrxmRpK2bh+XHfJaXveXbYK5NYmc57T3qKLpB3pnDK1+33Lbf
+8P7kJwnB84hnI1xjA6ZdmFKOtxVDGblXHamc3fjGNo8YV3Qmtb2y21P63gjbA3Na
+euIRtJ76EZZZpyVGoO0i+uY+BUU0Kq/txzk2p/kb4KPewInGl0a9KHUbAy7UuClm
+iZ2S0/XxBFg5szWFtjRnUv9rdQrjXLU7+b+uu+siXBlCDb3quCBXVeELM/CY2rZa
+rJ/8ZdC1U9kWz38pgLFHsnYmjDdKrUMcgyQ43WW8Oht8NvodUR/9QBoychiAlBXe
+YU9cm/fBLLI7Xr9lsvGX8Jkue5lXfdXt2ZqfWuEM05Lhyx8+IxFNydBXvY1NUhuM
+KKAM7kxrh5qMQLqY050tufJfnsDMozEka7XQx2icZy/hmoDX2GButTj2TY5FnDW3
+rMFcuecfyVemtgPk+ENSwbfACkMC/vfb/jrwB9xqVUklMdBZEpnWjGBjbgrKj86Y
+2oqt0w9k57cKJrfnyBSDGsOycsO6dU6HOA/9ChwojW5Heg+2IFf3rPDAg0S0FRzW
+q2RvHVSdQFS1ps96eLCX
+=FHXE
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/flann/flann-1.7.1.ebuild b/sci-libs/flann/flann-1.7.1.ebuild
new file mode 100644
index 000000000000..8a22e892cda9
--- /dev/null
+++ b/sci-libs/flann/flann-1.7.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.1 2012/02/19 22:34:54 dilfridge Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit cmake-utils eutils python
+
+DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
+HOMEPAGE="http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN/"
+SRC_URI="http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
+	test? ( http://dev.gentoo.org/~dilfridge/distfiles/${PN}-1.6.10-testdata.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc mpi octave python static-libs test"
+# cuda needs to be implemented!
+
+RDEPEND="sci-libs/hdf5[mpi?]
+	mpi? ( dev-libs/boost[mpi] )
+	octave? ( sci-mathematics/octave )
+	python? ( dev-python/numpy )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}"/${P}-src
+
+src_prepare() {
+	# bug #302621
+	has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+	# gentoo doc directory respected
+	sed -i \
+		-e "s:share/doc/flann:share/doc/${PF}:" \
+		doc/CMakeLists.txt || die
+	# python standard installation directory respected
+	sed -i \
+		-e "/share/d" \
+		-e "/COMMAND/s:install:install --root="${ED}" --no-compile:" \
+		src/python/CMakeLists.txt || die
+	# 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
+	# do not compile examples by default
+	sed -i \
+		-e '/add_subdirectory.*examples/d' \
+		CMakeLists.txt || die
+	# compile tests only when requested
+	use test || sed -i -e '/add_subdirectory.*test/d' CMakeLists.txt
+	# avoid automatic installation of pdf
+	use doc || sed -i -e '/doc/d' CMakeLists.txt
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_C_BINDINGS=ON"
+		"-DBUILD_CUDA_LIB=OFF"
+		$(cmake-utils_use_build octave MATLAB_BINDINGS)
+		$(cmake-utils_use_build python PYTHON_BINDINGS)
+		$(cmake-utils_use_use mpi)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}"
+	LD_LIBRARY_PATH="${PWD}/lib" PYTHONPATH="${S}/src/python" \
+		emake test
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README.md
+	use static-libs || find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+'
+}