sci-libs/flann: Fix compilation problem with cuda; depend on fixed octave version for gcc-4.8, #492488; patch cmake and send patches upstream instead of sedding, add missing deps; use cuda.eclass; fix HOMEPAGE

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

11 files changed, 371 insertions, 43 deletions

diff --git a/sci-libs/flann/ChangeLog b/sci-libs/flann/ChangeLog
index 2352512f6b41..0c0e13870729 100644
--- a/sci-libs/flann/ChangeLog
+++ b/sci-libs/flann/ChangeLog
@@ -1,6 +1,18 @@
 # 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.20 2013/12/01 19:05:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.21 2013/12/07 19:10:22 jlec Exp $
+
+*flann-9999 (07 Dec 2013)
+*flann-1.8.4-r1 (07 Dec 2013)
+
+  07 Dec 2013; Justin Lecher <jlec@gentoo.org> flann-1.7.1.ebuild,
+  -flann-1.8.4.ebuild, +flann-1.8.4-r1.ebuild, +flann-9999.ebuild,
+  +files/flann-1.8.4-CUDA_NVCC_FLAGS.patch, +files/flann-1.8.4-cuda5.5.patch,
+  +files/flann-1.8.4-docdir.patch, +files/flann-1.8.4-examples.patch,
+  +files/flann-1.8.4-multilib.patch, +files/flann-1.8.4-options.patch:
+  Fix compilation problem with cuda; depend on fixed octave version for
+  gcc-4.8, #492488; patch cmake and send patches upstream instead of sedding,
+  add missing deps; use cuda.eclass; fix HOMEPAGE
 
   01 Dec 2013; Justin Lecher <jlec@gentoo.org> flann-1.8.4.ebuild:
   only depend on hdf5 with USE=mpi and tests, #492584; thanks nikoli for the
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index e0b8bd2a892f..f8d75b45a901 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,28 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX flann-1.8.4-CUDA_NVCC_FLAGS.patch 618 SHA256 62e8810e965e57c83b45ab1c2d2f316df7ad8dc898751df8d2fc5204ffc8cfda SHA512 8a6e385b0b36386288861bb795fda34cc636d73862c1321fc4482855dd5032179bf3ea0016bd7c51e8d6abf0da3b70f6d22058d8fd2da414db09b2e2bb662a7b WHIRLPOOL 382d0706a09a9438204dc6a0849631d858565a35d7d0521f3ea6e84bb6a965777fec1d96996391de605d83d8ce250d559d7030ccba344f8f82895075b203575f
+AUX flann-1.8.4-cuda5.5.patch 2227 SHA256 c205148fe5184334f37dfed4a0c4d5beac3db2b7dbd6fa30dd16f7487a12d3f0 SHA512 628367450c5d1a45dc69817ce58e90f87602d1593244a2663703ce02967e98a1fb323ec636700bd20b9278640d89b4453330d1e08e49ebdbfffce65ab5c7ba74 WHIRLPOOL 21d21b512f64ce085ac58744dbce05a29303271569433277816d98c776dd4f5dc6696d1b61bc82f850f66e0ec72c805ac321b56a51d9491699d52986b7d2854c
+AUX flann-1.8.4-docdir.patch 571 SHA256 9feb1fe865a8364babd3dc64f5f22b9de7e4a1aab02f602c05f64882e6d5f70f SHA512 ef2fc88ff254afebf75a75bebad5021ec5aa00077cf3ed3b31242a7e7c17ee872d3cff71064b6bd6ecaf7c284dba31032aa0d0f71ba6257e1ebd01513036978c WHIRLPOOL f68a4d95d59b88b0fcb3471a72e5e2464afd450bd598f117a055704b860f11bed5ce146c9766b596bb97d03ebef44fd9be1ce27978d994944b2a58ab6397166a
+AUX flann-1.8.4-examples.patch 1020 SHA256 5c664f93bad2b77ec2159dc856aeb1be8b8b1b18887434b69f5a760d0b1a0f87 SHA512 5baeb594d2b4a1a8456135c9f0bec72a3182dcacbdebd398b079f13982e5e7a1722500313699ea25b7085f1dca3cab4ea355992d9014135e011452168e65fc83 WHIRLPOOL e2c2136e47be52f4ec3b9b138c95afe896928a033b16ecc1c197d7efb73489acd08570eb3952dda083f49652c70399b7ec8121351143ee7ba2ad8a74beffb153
+AUX flann-1.8.4-multilib.patch 570 SHA256 320df5839e9904a25db9f94e6283576fcef426ee4167a45cc5b729656c8df505 SHA512 1f5a72920af200f23a318b3205cce498a6f193eb8f89b85fcc9b8ef45c49b4b98143cc9cc6996821e63cdb709eeac0f13b46c129471aa82a06ec22be1f4ec8f6 WHIRLPOOL 153dc2c739d7427fa4a114390b49727adb129a9604fa045a7e2c4581f7f994fca31be031dc346b0144e828388bf02a4c8b7c843a7eab5c71fd914d7307ed81a5
+AUX flann-1.8.4-options.patch 1485 SHA256 3d547a6e4c1658a37011aefc60d4215c5dd04bc5caf6f965a6717df4bad4f4af SHA512 2335ddf683d883f0b5247b4d7e688644231c2d6a914c0d271965b0024270e77a36ccded142ab666651833712cb64a427eb753f76757cf5eb765f130b170f4251 WHIRLPOOL b7285c92c904e07fe729fe46e0689067039914eb719a0997c71e994fe523f30f0a4aab3b0d7dfab638e82cd95871ee55693f89a7dff4786a5b6e158f9e52cc27
 DIST flann-1.6.10-testdata.tar.xz 26425552 SHA256 5cfd556cae36b5901b929d82492523754dc98c7535338b7c87d55e0a63e14364 SHA512 819428c9088b8cd661f21d063594c2f79a378ec3d49fb9713fc24146f4c7f8fd3d1dcb5c5ea77064f17895959289af64de750d9559f7958b1ca0f32b73132a44 WHIRLPOOL 7b9194068a8331887946338bbd7af5fea923565c44c790f47624dc7275cca98d6bfd1e482a59acd46b3cf05c50552bdaad6eebed34a78ac89cbb8bc31a4867f0
 DIST flann-1.7.1-src.zip 582517 SHA256 eafb8c07cf59ff050be149b15d620ca3dd162e3fce9cb6748cde5d92e0dac775 SHA512 a94f6acb6a23603c8f7e5347b317d15d50de134707389f27f22896ec99f4a0ae576fbeb56203cd1bff57707d4353f7fb98c85f1a2e976810734506049068efb0 WHIRLPOOL 16c3f931e738e31bbf75aa8d6f1365e0a0b790c037624b3af1a2df306549dd95e2ab60da9f5ca4e09587341d9afe72ef7b999109f630f8757daddb1af64dcb85
 DIST flann-1.8.4-src.zip 561057 SHA256 dfbb9321b0d687626a644c70872a2c540b16200e7f4c7bd72f91ae032f445c08 SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a WHIRLPOOL f7722d8c0a8482809920927353421ebb578464fe6746a4dba20a6c7b6f941715529d5be33aebd1726db36eae3b5d4080c6ae86b0f807e6e384af32b87735b83b
 DIST flann-1.8.4-testdata.tar.xz 26744244 SHA256 4eaecf3a221ea6611e841fa2f459a17b6a5fdd633338bb5bc46c434e37667141 SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb WHIRLPOOL e49e5a594464955241ebc9bdfa908bac8b93b2fb465fc08ab73ec4d57194a8b71361ecb67985cdc641013fb8c3fb51ea2033769f41e558ab86e8f71e477b97da
-EBUILD flann-1.7.1.ebuild 2512 SHA256 3b610bc021437ae54dec67bb87fea13a0a601076d17553436781f82a592390bf SHA512 f3c4fec376a0d28df1e102cc71fc2dc7b7ff4f74f736a14a82c082947b8fbdfd64e1a902f5b3eca5967c4eb3f70953770852a42fec561a4c006b6bf705d66f97 WHIRLPOOL df5d60505e62120b20f6ffb66fb36e4ae123f8b74a1e67c0ccd52f210e1cae9863aa1c0536f72b81404a22cd6246185b9af20d94964daf636c168e7657912813
-EBUILD flann-1.8.4.ebuild 2832 SHA256 1b4d08b798372318478d1e2c5af711ccf4ec307d65597a31154908c9cd4bc828 SHA512 7a821f812c387b9191ec91840f96f3f4dd947381357d945e2a9b7640500c28975f5c0788306655ec03c6fd27feaf322b0cabd9487ab751ef13fc102030542bb9 WHIRLPOOL 3c47e4b38f6f39af8f43adf3335278afdaaa63fb46f0e4e39e6ea0df09dea9653972b574f3af0769d649f71bc1d9b94623d845f6b11905c95f7d61a1659b101d
-MISC ChangeLog 3006 SHA256 0fcbc1adbe9da7069627426bf28b08fb78cd4f6fafa3d9fc443d28794072b9c4 SHA512 eafc86b1c3989c322e7eac5489320022aeaa4c7b18da5dae15d4cec1cc2ad6782938221d825111f52241e999491a4e43c12d1434113123e1cb4a5bb90447b677 WHIRLPOOL 512f8fdbf93cc9d337ab2e905086de96834e3fe2b03215e9ab561f131c48de423748a3340b694d625632136f6cb9c82cf0e36d781550347061308ad2340a59f2
+EBUILD flann-1.7.1.ebuild 2492 SHA256 1dbdc8ce13378d3f25289f7820f807fe03fc50b29ab3fcab8e9b5cf89356039e SHA512 8a7aac8edd08ca89759135ddc34c186d77f86e77f90530f71e65ed19dbc003e475252e0f231778a7b0638ab28faef7ee365849bde00e081619776841ed533575 WHIRLPOOL 2510d237b0ad58b169535cd9efec040e3c811f51e00fe912767239d318d408b4131bafebd6406903d2584de908560def0d8dc2c0bb52502c1c9e88ef24e1479e
+EBUILD flann-1.8.4-r1.ebuild 2817 SHA256 09e55bb810346ba14b87e6a1d4111becfd97069f64770651156abec26773d3ce SHA512 5c6b407bfe690243fec59efb9b9f0ded29957d70d5cbbfeefaff725184f94e5c45c2c48f42994b4a7efb69fb9a21cec69ba4bdd809d2ac3a72e19e93cefc45af WHIRLPOOL 6a244242c01e15f980052638a8a5682cb8ba7ecf49aebe38c86d125dd2dc69ec67ab2f328dd70883d5caf23f49d09dbfd1f034e058f547cea77af58068cdd836
+EBUILD flann-9999.ebuild 2842 SHA256 71942889d79ba37b75aa1046f54ad0dc7704f6e990cb88ca8f26a7c0aa17b837 SHA512 88c8c5c5583699a9f78c6e6472228449b2c5b7d47eb03c26c5a3367396c2d90a70e3324be82a8873a81821fcb690184cf139e805373015a9227ffeb14e93a966 WHIRLPOOL 7ca5e380fbca765e84e428ec8f0b3544fa7ed2645f1866446ab902cfd442d1b98ab07b3efaddda34a828f7f7de75f3397519bfd9712c8e52b852fe9f9fadf451
+MISC ChangeLog 3617 SHA256 ad55ab5868d5d604dd5e7e0e8c43e18cdab36c09ab10d59e7c1dc44509b7a849 SHA512 10be8f0c50eb4a50aa7e79f251dd0d55146bd7b103990a273f7ac02e6af2dacb7ed080bdba486b070852cdaad1e80d4fb95734cedc75e00d7c30dc826c1f5fb1 WHIRLPOOL d24f4916d4638eb75546b858ae832fa657c2a8d8522e472f6f31e22f9c84470f9e1a4d80f701a9cdd41224c95afb41f1b22c5e96b08fbd05730cd63fb3cdb4e6
 MISC metadata.xml 781 SHA256 12ae40e2fdb97ee12b0360dfef3bd7c1a73d0556f7f2d8e354112f895b5077df SHA512 b7279686066f4c4c37db5cce0865b5b6292fdc3d7f1cca7e8d8630f18bee433add75dcc235e8a1af5c57bcaee4067e01eb595c510dd8824387f39934bacd5628 WHIRLPOOL 0d48219b90f11ada95d6a4991cfa9a1749cfa64ec7282009e88ff67979c9cbe353f43436973b01b75f4d70cedec612910eee47f8f547e9c22f22462c1d21a5d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSm4ifAAoJELnU8jG9FVir5BAQAJzUNy6vTaK913/RiG/E+5bi
-amhYY8rZxMbKsxxstoa1CLQ6BbfXw8ZE/7IQJPV1tMfJ/uuF7galqFnaCohb7odq
-KvP5/u/NPtHMpm/oUqkI7b3Hw3gLotsxlajT0zCHWUj+kXgztQTUO/6/aWdI7cAo
-D/URDp+tfmgAWLfFQEQ3pWHu24/9AoKYWPHeauvTLybUGCfMslIA1ZAEcTHN7Y0G
-SJtQ9u88WjDAHlVOxYOTe7ZmzG3gwEhChxgHEhM0iBnj/GFwUQiUZcKxupfOsrdN
-cVnBIuQaORZhwBKFRZp3wat7ApiRz4JQp5tlAelH8qIAr/mI4OdeBh5HZqrf3tY4
-EGYGVG7fozchyxJHFB7ZHNHZpjJ+ZqUnY627+DoqILu+WWYCc13UD+4MkCkGRlPI
-318iGsQ4wZK+97sHfqi3P6BurWbpqMnr6WKfmSsBKIHb/JJXxfZhl9q1QfCW/XB5
-GM16wdHRIfHtDqD+/4fYthbjizYzbpn84+TeuRp4+A3CxPx7bUz6kbj8Z7/KZhCP
-M4wiKcNpQxUsJn/8J26RAFRpFnuZUIqbGLJhX1HtL3Et5hQaD7ueKhj1n6x9wCec
-Kunu32cApUE2lSOQ89/B6hjGfB4HPuYDghNYQH9C4SnJWQPGB7aN6lH05L4bpiQ+
-XaRnbG4DaBgzQPTkEZtx
-=QZ7m
+iQIcBAEBCgAGBQJSo3KfAAoJELnU8jG9FVirpGUQAJahCemod3v05yymJt7PDxWS
+XY2YyBfXB5oPKz4P6u5JfL+RmFGBkqzI1irmsL4f0GOgGKs8BHMAgsEBpXmw2B3M
+lmbYJGKU/6xAkTIbX6YhsWsTar2hOh0bxIVdE6TT2uEQllhJKgp2+Sm0CjD3qGtQ
+Z+GbtH6/CLWnenxbhQuGE2zWYP8aLiTpP9YSD4rHgXBhGTpwusSPS6yfvRdDNRVL
+LBv6OsZTUmY22/7XubOJuuwNlObSLR37X6fTFJHoPaXhfsuZPvM2o4cLBVY/ZF4/
+IsrFu9FonF8SOomm6w5VXIvZG/Ugh8h40C091eub7Fw737D5sBKSvp8CFnf29Iwi
+I7L2mC6D01RJtgzH6mtzkyD4erUvgU8bTQxXviYeip8EbyTLOw+hkxTxeqIfO5Yh
+5deCSlr8QL668ATZfndonh8HQl7Vj6s0Mz5228XCf2gEctkLt4oPW3HVhJaPnnM0
+7euqo6Xq+nR3/6joqKd4LVRJ94s7MnLEsO+Piol+MfgOyMe9zHmsDG/YSueQG8//
+CIJNbtOeeCDt7nk8HP/NbyN1tP9P+XSPNlz32U7/ThBiJ/Zjpn95B21hooP9YnBz
+9Qj6JTYxIV9xaL52IW/ZGac5gl8YQWgXi0EWGfut+q5v2nbDMEU4E/TemDz3NXef
+rt3wFbE97ZIoAQzzP1Y/
+=grZ5
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch b/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch
new file mode 100644
index 000000000000..1a068af28351
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch
@@ -0,0 +1,16 @@
+ src/cpp/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
+index 8e72409..a4b35b1 100644
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
+@@ -15,7 +15,7 @@ endif()
+ set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA)
+ 
+ if (BUILD_CUDA_LIB)
+-    SET(CUDA_NVCC_FLAGS -DFLANN_USE_CUDA)
++    SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA")
+     if(CMAKE_COMPILER_IS_GNUCC)
+ 		set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Xcompiler;-fPIC;-arch=sm_13" )
+         if (NVCC_COMPILER_BINDIR)
diff --git a/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch b/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch
new file mode 100644
index 000000000000..046b3252c36f
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch
@@ -0,0 +1,61 @@
+ src/cpp/flann/util/cuda/result_set.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/cpp/flann/util/cuda/result_set.h b/src/cpp/flann/util/cuda/result_set.h
+index 9ac8111..324ca1e 100644
+--- a/src/cpp/flann/util/cuda/result_set.h
++++ b/src/cpp/flann/util/cuda/result_set.h
+@@ -54,7 +54,7 @@ struct SingleResultSet
+     DistanceType bestDist;
+     const DistanceType epsError;
+ 
+-    __device__
++    __device__ __host__
+     SingleResultSet( DistanceType eps ) : bestIndex(-1),bestDist(INFINITY), epsError(eps){ }
+ 
+     __device__
+@@ -129,7 +129,7 @@ struct KnnResultSet
+     const DistanceType epsError;
+ 
+ 
+-    __device__
++    __device__ __host__
+     KnnResultSet(int knn, bool sortResults, DistanceType eps) : foundNeighbors(0),largestHeapDist(INFINITY),k(knn), sorted(sortResults), epsError(eps){ }
+ 
+     //          __host__ __device__
+@@ -229,7 +229,7 @@ struct CountingRadiusResultSet
+     DistanceType radius_sq_;
+     int max_neighbors_;
+ 
+-    __device__
++    __device__ __host__
+     CountingRadiusResultSet(DistanceType radius, int max_neighbors) : count_(0),radius_sq_(radius), max_neighbors_(max_neighbors){ }
+ 
+     __device__
+@@ -279,7 +279,7 @@ struct RadiusKnnResultSet
+     //          int count_;
+ 
+ 
+-    __device__
++    __device__ __host__
+     RadiusKnnResultSet(DistanceType radius, int knn, int* segment_starts, bool sortResults) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), radius_sq_(radius),segment_starts_(segment_starts) { }
+ 
+     //          __host__ __device__
+@@ -381,7 +381,7 @@ struct KnnRadiusResultSet
+     const DistanceType radius_sq;
+ 
+ 
+-    __device__
++    __device__ __host__
+     KnnRadiusResultSet(int knn, bool sortResults, DistanceType eps, DistanceType radius) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), epsError(eps),radius_sq(radius){ }
+ 
+     //          __host__ __device__
+@@ -484,7 +484,7 @@ struct RadiusResultSet
+     int count_;
+     bool sorted_;
+ 
+-    __device__
++    __device__ __host__
+     RadiusResultSet(DistanceType radius, int* segment_starts, bool sorted) : radius_sq_(radius), segment_starts_(segment_starts), count_(0), sorted_(sorted){ }
+ 
+     __device__
diff --git a/sci-libs/flann/files/flann-1.8.4-docdir.patch b/sci-libs/flann/files/flann-1.8.4-docdir.patch
new file mode 100644
index 000000000000..4b16684de14d
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.8.4-docdir.patch
@@ -0,0 +1,24 @@
+ doc/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 2d8eb24..aeac8ed 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1,4 +1,8 @@
+ find_package(LATEX)
++
++if (NOT DOCDIR)
++  set(DOCDIR share/doc/flann)
++endif ()
+  
+ if (EXISTS ${PDFLATEX_COMPILER} AND EXISTS ${BIBTEX_COMPILER})
+     include(${PROJECT_SOURCE_DIR}/cmake/UseLATEX.cmake)
+@@ -14,6 +18,6 @@ endif()
+ 
+ install(
+     FILES manual.pdf
+-    DESTINATION share/doc/flann
++    DESTINATION ${DOCDIR}
+     OPTIONAL
+ )
diff --git a/sci-libs/flann/files/flann-1.8.4-examples.patch b/sci-libs/flann/files/flann-1.8.4-examples.patch
new file mode 100644
index 000000000000..b3346b35f73c
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.8.4-examples.patch
@@ -0,0 +1,35 @@
+From 3922081fbd6710f4b72421069f6bf24dc37d35a8 Mon Sep 17 00:00:00 2001
+From: Casey Goodlett <casey.goodlett@kitware.com>
+Date: Thu, 8 Aug 2013 18:42:45 -0400
+Subject: [PATCH] Option to disable example building
+
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b19367..410a8f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,6 +53,7 @@ option(BUILD_C_BINDINGS "Build C bindings" ON)
+ option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
+ option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
+ option(BUILD_CUDA_LIB "Build CUDA library" OFF)
++option(BUILD_EXAMPLES "Build examples" ON)
+ option(USE_OPENMP "Use OpenMP multi-threading" ON)
+ option(USE_MPI "Use MPI" OFF)
+ 
+@@ -154,7 +155,9 @@ endif()
+ 
+ add_subdirectory( cmake )
+ add_subdirectory( src )
+-add_subdirectory( examples )
++if (BUILD_EXAMPLES)
++  add_subdirectory( examples )
++endif(BUILD_EXAMPLES)
+ add_subdirectory( test )
+ add_subdirectory( doc )
+ 
+-- 
+1.8.5.1
+
diff --git a/sci-libs/flann/files/flann-1.8.4-multilib.patch b/sci-libs/flann/files/flann-1.8.4-multilib.patch
new file mode 100644
index 000000000000..17a9d65dd778
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.8.4-multilib.patch
@@ -0,0 +1,15 @@
+ cmake/flann_utils.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake
+index 1a10939..afe4742 100644
+--- a/cmake/flann_utils.cmake
++++ b/cmake/flann_utils.cmake
+@@ -1,6 +1,6 @@
+ macro(GET_OS_INFO)
+     string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
+-    set(FLANN_LIB_INSTALL_DIR "lib")
++    set(FLANN_LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+     set(FLANN_INCLUDE_INSTALL_DIR
+         "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
+ endmacro(GET_OS_INFO)
diff --git a/sci-libs/flann/files/flann-1.8.4-options.patch b/sci-libs/flann/files/flann-1.8.4-options.patch
new file mode 100644
index 000000000000..dd212aca66a4
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.8.4-options.patch
@@ -0,0 +1,41 @@
+ CMakeLists.txt | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 410a8f9..b6244a4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,6 +54,8 @@ option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
+ option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
+ option(BUILD_CUDA_LIB "Build CUDA library" OFF)
+ option(BUILD_EXAMPLES "Build examples" ON)
++option(BUILD_TESTS "Build tests" ON)
++option(BUILD_DOC "Build documentation" ON)
+ option(USE_OPENMP "Use OpenMP multi-threading" ON)
+ option(USE_MPI "Use MPI" OFF)
+ 
+@@ -158,8 +160,12 @@ add_subdirectory( src )
+ if (BUILD_EXAMPLES)
+   add_subdirectory( examples )
+ endif(BUILD_EXAMPLES)
+-add_subdirectory( test )
+-add_subdirectory( doc )
++if (BUILD_TESTS)
++  add_subdirectory( test )
++endif (BUILD_TESTS)
++if (BUILD_DOC)
++  add_subdirectory( doc )
++endif (BUILD_DOC)
+ 
+ 
+ # CPACK options
+@@ -202,6 +208,9 @@ include(CPack)
+ message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
+ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
+ message(STATUS "Building C bindings: ${BUILD_C_BINDINGS}")
++message(STATUS "Building examples: ${BUILD_EXAMPLES}")
++message(STATUS "Building tests: ${BUILD_TESTS}")
++message(STATUS "Building documentation: ${BUILD_DOC}")
+ message(STATUS "Building python bindings: ${BUILD_PYTHON_BINDINGS}")
+ message(STATUS "Building matlab bindings: ${BUILD_MATLAB_BINDINGS}")
+ message(STATUS "Building CUDA library: ${BUILD_CUDA_LIB}")
diff --git a/sci-libs/flann/flann-1.7.1.ebuild b/sci-libs/flann/flann-1.7.1.ebuild
index 4ef2177e2d21..1e3669b93853 100644
--- a/sci-libs/flann/flann-1.7.1.ebuild
+++ b/sci-libs/flann/flann-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.7.1.ebuild,v 1.4 2012/08/03 17:33:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.5 2013/12/07 19:10:22 jlec Exp $
 
 EAPI=3
 
@@ -9,7 +9,7 @@ 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/"
+HOMEPAGE="http://www.cs.ubc.ca/research/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 )"
 
diff --git a/sci-libs/flann/flann-1.8.4.ebuild b/sci-libs/flann/flann-1.8.4-r1.ebuild
index e1f543b3db73..cf012d9f79e6 100644
--- a/sci-libs/flann/flann-1.8.4.ebuild
+++ b/sci-libs/flann/flann-1.8.4-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.3 2013/12/01 19:05:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.8.4-r1.ebuild,v 1.1 2013/12/07 19:10:22 jlec Exp $
 
 EAPI=5
 
-inherit cmake-utils eutils multilib toolchain-funcs
+inherit cmake-utils cuda 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/"
+HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
 SRC_URI="
 	http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
 	test? ( http://dev.gentoo.org/~bicatali/distfiles/${P}-testdata.tar.xz )"
@@ -15,22 +15,33 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc mpi openmp octave python static-libs test"
+IUSE="cuda doc examples mpi openmp octave static-libs test"
 
 RDEPEND="
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
 	mpi? (
 		sci-libs/hdf5[mpi]
 		dev-libs/boost[mpi]
 	)
-	octave? ( sci-mathematics/octave )"
+	!mpi? ( !sci-libs/hdf5[mpi] )
+	octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
+	doc? ( dev-tex/latex2html )
 	test? (
 		dev-cpp/gtest
 		cuda? ( sci-libs/hdf5 )
 	)
 "
-PDEPEND="python? ( ~dev-python/pyflann-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-examples.patch
+	"${FILESDIR}"/${P}-options.patch
+	"${FILESDIR}"/${P}-CUDA_NVCC_FLAGS.patch
+	"${FILESDIR}"/${P}-cuda5.5.patch
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-docdir.patch
+)
 
 S="${WORKDIR}"/${P}-src
 
@@ -45,11 +56,7 @@ pkg_setup() {
 
 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
+	use mpi && export CXX=mpicxx
 	# produce pure octave files
 	# octave gentoo installation for .m files respected
 	sed -i \
@@ -59,19 +66,8 @@ src_prepare() {
 		-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
 	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
 }
 
@@ -81,11 +77,19 @@ src_configure() {
 		-DBUILD_C_BINDINGS=ON
 		-DBUILD_PYTHON_BINDINGS=OFF
 		-DPYTHON_EXECUTABLE=
+		-DDOCDIR=share/doc/${PF}
 		$(cmake-utils_use_build cuda CUDA_LIB)
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use_build doc)
+		$(cmake-utils_use_build test TESTS)
 		$(cmake-utils_use_build octave MATLAB_BINDINGS)
 		$(cmake-utils_use_use mpi)
 		$(cmake-utils_use_use openmp)
 	)
+	use cuda && \
+		mycmakeargs+=(
+		-DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
+		)
 	cmake-utils_src_configure
 }
 
@@ -99,5 +103,7 @@ src_test() {
 src_install() {
 	cmake-utils_src_install
 	dodoc README.md
-	use static-libs || find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+'
+	if ! use static-libs; then
+		find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
+	fi
 }
diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild
new file mode 100644
index 000000000000..294f73dd3c96
--- /dev/null
+++ b/sci-libs/flann/flann-9999.ebuild
@@ -0,0 +1,111 @@
+# 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-9999.ebuild,v 1.1 2013/12/07 19:10:22 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils cuda eutils git-r3 multilib toolchain-funcs
+
+DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
+HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
+SRC_URI="test? ( http://dev.gentoo.org/~bicatali/distfiles/${PN}-1.8.4-testdata.tar.xz )"
+EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda doc examples mpi openmp octave static-libs test"
+
+RDEPEND="
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+	mpi? (
+		sci-libs/hdf5[mpi]
+		dev-libs/boost[mpi]
+	)
+	!mpi? ( !sci-libs/hdf5[mpi] )
+	octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( dev-tex/latex2html )
+	test? (
+		dev-cpp/gtest
+		cuda? ( sci-libs/hdf5 )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.4-options.patch
+	"${FILESDIR}"/${PN}-1.8.4-CUDA_NVCC_FLAGS.patch
+	"${FILESDIR}"/${PN}-1.8.4-cuda5.5.patch
+	"${FILESDIR}"/${PN}-1.8.4-multilib.patch
+	"${FILESDIR}"/${PN}-1.8.4-docdir.patch
+)
+
+pkg_setup() {
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+	fi
+}
+
+src_unpack() {
+	default
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	# bug #302621
+	use mpi && export CXX=mpicxx
+
+	# 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
+	use cuda && cuda_src_prepare
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# python bindings are split
+	local mycmakeargs=(
+		-DBUILD_C_BINDINGS=ON
+		-DBUILD_PYTHON_BINDINGS=OFF
+		-DPYTHON_EXECUTABLE=
+		-DDOCDIR=share/doc/${PF}
+		$(cmake-utils_use_build cuda CUDA_LIB)
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use_build doc)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_build octave MATLAB_BINDINGS)
+		$(cmake-utils_use_use mpi)
+		$(cmake-utils_use_use openmp)
+	)
+	use cuda && \
+		mycmakeargs+=(
+		-DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
+		)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	ln -s "${WORKDIR}"/testdata/* test/ || die
+	# -j1 to avoid obversubscribing jobs
+	LD_LIBRARY_PATH="${BUILD_DIR}/lib" \
+		cmake-utils_src_compile -j1 test
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README.md
+	if ! use static-libs; then
+		find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
+	fi
+}