Version bump

(Portage version: 2.1.10.10/cvs/Linux x86_64)

2 files changed, 89 insertions, 1 deletions

diff --git a/sci-libs/flann/ChangeLog b/sci-libs/flann/ChangeLog
index 8b4e61ca0d93..16f1b0a1d905 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.8 2011/08/02 19:09:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.9 2011/08/07 00:57:51 bicatali Exp $
+
+*flann-1.6.11 (07 Aug 2011)
+
+  07 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> +flann-1.6.11.ebuild:
+  Version bump
 
   02 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> flann-1.6.10.ebuild:
   Fix tests by prepackaging the test data, bug 366477
diff --git a/sci-libs/flann/flann-1.6.11.ebuild b/sci-libs/flann/flann-1.6.11.ebuild
new file mode 100644
index 000000000000..8541e71245e4
--- /dev/null
+++ b/sci-libs/flann/flann-1.6.11.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.6.11.ebuild,v 1.1 2011/08/07 00:57:51 bicatali 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 ~x86"
+IUSE="doc mpi octave python static-libs test"
+
+RDEPEND="
+	sci-libs/hdf5[mpi?]
+	mpi? ( dev-libs/boost[mpi] )
+	octave? ( sci-mathematics/octave )
+	python? ( dev-python/numpy )"
+DEPEND="${DEPEND}
+	app-arch/unzip
+	test? ( dev-util/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"
+		$(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 '{}' '+'
+}