public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-libs/flann: flann-1.7.1.ebuild ChangeLog
@ 2012-06-17 17:44 Jeff Horelick (jdhore)
  0 siblings, 0 replies; 4+ messages in thread
From: Jeff Horelick (jdhore) @ 2012-06-17 17:44 UTC (permalink / raw
  To: gentoo-commits

jdhore      12/06/17 17:44:14

  Modified:             flann-1.7.1.ebuild ChangeLog
  Log:
  marked x86 per bug 420303
  
  (Portage version: 2.2.0_alpha110/cvs/Linux i686)

Revision  Changes    Path
1.3                  sci-libs/flann/flann-1.7.1.ebuild

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

Index: flann-1.7.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flann-1.7.1.ebuild	16 Jun 2012 13:09:57 -0000	1.2
+++ flann-1.7.1.ebuild	17 Jun 2012 17:44:14 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.2 2012/06/16 13:09:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.3 2012/06/17 17:44:14 jdhore Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc mpi octave python static-libs test"
 # cuda needs to be implemented!
 



1.15                 sci-libs/flann/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	16 Jun 2012 13:09:57 -0000	1.14
+++ ChangeLog	17 Jun 2012 17:44:14 -0000	1.15
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/flann
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.14 2012/06/16 13:09:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.15 2012/06/17 17:44:14 jdhore Exp $
+
+  17 Jun 2012; Jeff Horelick <jdhore@gentoo.org> flann-1.7.1.ebuild:
+  marked x86 per bug 420303
 
   16 Jun 2012; Agostino Sarubbo <ago@gentoo.org> flann-1.7.1.ebuild:
   Stable for amd64, wrt bug #420303






^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/flann: flann-1.7.1.ebuild ChangeLog
@ 2012-08-03 17:33 Sebastien Fabbro (bicatali)
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2012-08-03 17:33 UTC (permalink / raw
  To: gentoo-commits

bicatali    12/08/03 17:33:35

  Modified:             flann-1.7.1.ebuild ChangeLog
  Log:
  keyword amd64-linux x86-linux
  
  (Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  sci-libs/flann/flann-1.7.1.ebuild

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

Index: flann-1.7.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- flann-1.7.1.ebuild	17 Jun 2012 17:44:14 -0000	1.3
+++ flann-1.7.1.ebuild	3 Aug 2012 17:33:35 -0000	1.4
@@ -1,6 +1,6 @@
 # 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.3 2012/06/17 17:44:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.4 2012/08/03 17:33:35 bicatali Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc mpi octave python static-libs test"
 # cuda needs to be implemented!
 
@@ -39,7 +39,7 @@
 	# python standard installation directory respected
 	sed -i \
 		-e "/share/d" \
-		-e "/COMMAND/s:install:install --root="${ED}" --no-compile:" \
+		-e "/COMMAND/s:install:install --root="${D}" --no-compile:" \
 		src/python/CMakeLists.txt || die
 	# produce pure octave files
 	# octave gentoo installation for .m files respected



1.16                 sci-libs/flann/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	17 Jun 2012 17:44:14 -0000	1.15
+++ ChangeLog	3 Aug 2012 17:33:35 -0000	1.16
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/flann
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.15 2012/06/17 17:44:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.16 2012/08/03 17:33:35 bicatali Exp $
+
+  03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> flann-1.7.1.ebuild:
+  keyword amd64-linux x86-linux
 
   17 Jun 2012; Jeff Horelick <jdhore@gentoo.org> flann-1.7.1.ebuild:
   marked x86 per bug 420303
@@ -59,4 +62,3 @@
   30 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   +flann-1.6.8.ebuild, +metadata.xml:
   New library, dependency for media-libs/opencv-2.2
-





^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/flann: flann-1.7.1.ebuild ChangeLog
@ 2012-06-16 13:09 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 4+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-06-16 13:09 UTC (permalink / raw
  To: gentoo-commits

ago         12/06/16 13:09:57

  Modified:             flann-1.7.1.ebuild ChangeLog
  Log:
  Stable for amd64, wrt bug #420303
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-libs/flann/flann-1.7.1.ebuild

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

Index: flann-1.7.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flann-1.7.1.ebuild	19 Feb 2012 22:34:54 -0000	1.1
+++ flann-1.7.1.ebuild	16 Jun 2012 13:09:57 -0000	1.2
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.2 2012/06/16 13:09:57 ago Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc mpi octave python static-libs test"
 # cuda needs to be implemented!
 



1.14                 sci-libs/flann/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	19 Feb 2012 22:34:54 -0000	1.13
+++ ChangeLog	16 Jun 2012 13:09:57 -0000	1.14
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/flann
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.14 2012/06/16 13:09:57 ago Exp $
+
+  16 Jun 2012; Agostino Sarubbo <ago@gentoo.org> flann-1.7.1.ebuild:
+  Stable for amd64, wrt bug #420303
 
 *flann-1.7.1 (19 Feb 2012)
 






^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/flann: flann-1.7.1.ebuild ChangeLog
@ 2012-02-19 22:34 Andreas HAttel (dilfridge)
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2012-02-19 22:34 UTC (permalink / raw
  To: gentoo-commits

dilfridge    12/02/19 22:34:54

  Modified:             ChangeLog
  Added:                flann-1.7.1.ebuild
  Log:
  Version bump. Needs still implementation of cuda support.
  
  (Portage version: 2.1.10.47/cvs/Linux x86_64)

Revision  Changes    Path
1.13                 sci-libs/flann/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog	11 Nov 2011 20:12:59 -0000	1.12
+++ ChangeLog	19 Feb 2012 22:34:54 -0000	1.13
@@ -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:



1.1                  sci-libs/flann/flann-1.7.1.ebuild

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

Index: flann-1.7.1.ebuild
===================================================================
# 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 '{}' '+'
}






^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-08-03 17:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-17 17:44 [gentoo-commits] gentoo-x86 commit in sci-libs/flann: flann-1.7.1.ebuild ChangeLog Jeff Horelick (jdhore)
  -- strict thread matches above, loose matches on Subject: below --
2012-08-03 17:33 Sebastien Fabbro (bicatali)
2012-06-16 13:09 Agostino Sarubbo (ago)
2012-02-19 22:34 Andreas HAttel (dilfridge)

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