From 8b9da1b38a9ef43caa6c246f9563c8d3d7c9375e Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 24 Nov 2013 17:02:38 +0000
Subject: sci-libs/flann: Make it multilib compatible

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
---
 sci-libs/flann/ChangeLog          |  6 +++++-
 sci-libs/flann/flann-1.8.4.ebuild | 12 +++++++++---
 sci-libs/flann/metadata.xml       | 12 ++++++------
 3 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'sci-libs')

diff --git a/sci-libs/flann/ChangeLog b/sci-libs/flann/ChangeLog
index 4ef85f6f85b3..f69af7a38f28 100644
--- a/sci-libs/flann/ChangeLog
+++ b/sci-libs/flann/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/flann
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.18 2013/07/09 23:11:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.19 2013/11/24 17:02:38 jlec Exp $
+
+  24 Nov 2013; Justin Lecher <jlec@gentoo.org> flann-1.8.4.ebuild,
+  metadata.xml:
+  Make it multilib compatible
 
 *flann-1.8.4 (09 Jul 2013)
 
diff --git a/sci-libs/flann/flann-1.8.4.ebuild b/sci-libs/flann/flann-1.8.4.ebuild
index f8cff1ef55be..81a51e514a8f 100644
--- a/sci-libs/flann/flann-1.8.4.ebuild
+++ b/sci-libs/flann/flann-1.8.4.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild,v 1.1 2013/07/09 23:11:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild,v 1.2 2013/11/24 17:02:38 jlec Exp $
 
 EAPI=5
 
-inherit cmake-utils eutils toolchain-funcs
+inherit cmake-utils eutils multilib toolchain-funcs
 
 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
+SRC_URI="
+	http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
 	test? ( http://dev.gentoo.org/~bicatali/distfiles/${P}-testdata.tar.xz )"
 
 LICENSE="BSD"
@@ -61,6 +62,11 @@ src_prepare() {
 	# avoid automatic installation of pdf
 	use doc || sed -i -e '/doc/d' CMakeLists.txt
 	use cuda && cuda_src_prepare
+
+	sed \
+		-e "/FLANN_LIB_INSTALL_DIR/s:lib:$(get_libdir):g" \
+		-i cmake/flann_utils.cmake || die
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/sci-libs/flann/metadata.xml b/sci-libs/flann/metadata.xml
index fb60ba5e8d10..3b08417e4cab 100644
--- a/sci-libs/flann/metadata.xml
+++ b/sci-libs/flann/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   FLANN is a library for performing fast approximate nearest neighbor
   searches in high dimensional spaces. It contains a collection of
   algorithms we found to work best for nearest neighbor search and a
@@ -11,9 +11,9 @@
   FLANN is written in C++ and contains bindings for the following
   languages: C, MATLAB and Python.
 </longdescription>
-<use>
-  <flag name="octave">Add bindings for
+  <use>
+    <flag name="octave">Add bindings for
   <pkg>sci-mathematics/octave</pkg></flag>
-  <flag name="cuda">Enable support for nVidia CUDA</flag>
-</use>
+    <flag name="cuda">Enable support for nVidia CUDA</flag>
+  </use>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad