[gentoo-commits] gentoo-x86 commit in sci-libs/flann: metadata.xml flann-1.8.4.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in sci-libs/flann: metadata.xml flann-1.8.4.ebuild ChangeLog

[Justin Lecher (jlec)]

jlec        13/11/24 17:02:38

  Modified:             metadata.xml flann-1.8.4.ebuild ChangeLog
  Log:
  sci-libs/flann: Make it multilib compatible
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.6                  sci-libs/flann/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	9 Jul 2013 23:11:10 -0000	1.5
+++ metadata.xml	24 Nov 2013 17:02:38 -0000	1.6
@@ -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>



1.2                  sci-libs/flann/flann-1.8.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild?r1=1.1&r2=1.2

Index: flann-1.8.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flann-1.8.4.ebuild	9 Jul 2013 23:11:10 -0000	1.1
+++ flann-1.8.4.ebuild	24 Nov 2013 17:02:38 -0000	1.2
@@ -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 @@
 	# 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() {



1.19                 sci-libs/flann/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?r1=1.18&r2=1.19

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog	9 Jul 2013 23:11:10 -0000	1.18
+++ ChangeLog	24 Nov 2013 17:02:38 -0000	1.19
@@ -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)