From 407525b571b48cfd65e1ad7a02d250a927c967c9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 1 Dec 2017 03:04:39 +0000
Subject: gentoo resync : 01.12.2017

---
 sci-libs/nanoflann/Manifest               |  6 +++---
 sci-libs/nanoflann/nanoflann-1.2.3.ebuild | 22 ++++++++++++----------
 sci-libs/nanoflann/nanoflann-9999.ebuild  | 16 +++++-----------
 3 files changed, 20 insertions(+), 24 deletions(-)

(limited to 'sci-libs/nanoflann')

diff --git a/sci-libs/nanoflann/Manifest b/sci-libs/nanoflann/Manifest
index 868e7b849148..dbc2f1aafd70 100644
--- a/sci-libs/nanoflann/Manifest
+++ b/sci-libs/nanoflann/Manifest
@@ -1,4 +1,4 @@
-DIST nanoflann-1.2.3.tar.gz 1157793 SHA256 5ef4dfb23872379fe9eb306aabd19c9df4cae852b72a923af01aea5e8d7a59c3 SHA512 01d5226fb669c9ef21e1bd36bddb07c7bf8bbbf9798e90bfa7966de4ae01e05c669c33a73d37340c41c79fcab81c91c3991077d799a211985b2d0a2a365a8878 WHIRLPOOL 2a1c9a21dbd7571e4c680a2b5e3636086df4e06142d885b390983228a3cf3d36f01d0389fe712f1d9a9106a55887353a1ea7c057a289c727e98b9bf5308c1b20
-EBUILD nanoflann-1.2.3.ebuild 668 BLAKE2B 5118462b76bd0632691fbbf0da85144a156d97c25585a8e3bd024251f25d525dad08ed818b0b8ca5a8e5edd258b80fe35be5b5e74550584e09f954d1f1f1adfe SHA512 12a9b256fbfae49248dfa89addbff82666e849a243ee0b59d441c406fcbf2fee267b5c7e74daa1cedec7376906df4e8c3aff61cd7084a81979e31df040b35532
-EBUILD nanoflann-9999.ebuild 808 BLAKE2B 387c899f4a4e91f0cb2996fe903ee04243ad5555b9f79ab327fc73bcba92f2f74cc2d4a1dd1c6ff4813ff7e2a8f355f9663baea0473205beaebc5b684d7504ca SHA512 6dac181d2af1839ed77969dc9d4bb77327266bc7c33871c42fac1afb9aad67d55e80de0c6ec7192e465c5a44abc6b7ad5eaf1cf761073749a721266b637a4f37
+DIST nanoflann-1.2.3.tar.gz 1157793 BLAKE2B e6b3947c5c99689da5d3759e0217deca691bada8089cdd1e3cd41902b0db2533908fab1ff5474851064d3f2ab6a5a70429320bbf432a0381df4aec0139a6b2f4 SHA512 01d5226fb669c9ef21e1bd36bddb07c7bf8bbbf9798e90bfa7966de4ae01e05c669c33a73d37340c41c79fcab81c91c3991077d799a211985b2d0a2a365a8878
+EBUILD nanoflann-1.2.3.ebuild 756 BLAKE2B 204bbc4525b6fd29e23db6392600411011e7a1fac0c71d36e53b78f6073294fb63c183713842b93e129a1825c6bee76cba8087c4275af3fd1319772c1f236db3 SHA512 0d00c70727915b2bd08ff8358202e3c34dbac4f728ceda19ef4d2929c385c7048ff0f671f586f59ca14c4c746c2b75d60c659c86c4a105f59a96dae6efb50e43
+EBUILD nanoflann-9999.ebuild 756 BLAKE2B 204bbc4525b6fd29e23db6392600411011e7a1fac0c71d36e53b78f6073294fb63c183713842b93e129a1825c6bee76cba8087c4275af3fd1319772c1f236db3 SHA512 0d00c70727915b2bd08ff8358202e3c34dbac4f728ceda19ef4d2929c385c7048ff0f671f586f59ca14c4c746c2b75d60c659c86c4a105f59a96dae6efb50e43
 MISC metadata.xml 686 BLAKE2B 508f3d4325543a5ac416b88524623ce4f70f67fe5d5409e73dd29d13d5770e2300250d6c6199822978bf59afffecec0cf65fa489a3d90ff3e351966be18e7d15 SHA512 d1d1537c6ad899475df91a307393fada1c593e84448c56e7b843a0eb1534725c7b0660a0f5c5feced6a6cf1bf5f25c997dc1339b3a96e7b2ef87d4f70c0a8c34
diff --git a/sci-libs/nanoflann/nanoflann-1.2.3.ebuild b/sci-libs/nanoflann/nanoflann-1.2.3.ebuild
index e82a84965d8b..4db99558405a 100644
--- a/sci-libs/nanoflann/nanoflann-1.2.3.ebuild
+++ b/sci-libs/nanoflann/nanoflann-1.2.3.ebuild
@@ -7,27 +7,29 @@ inherit cmake-utils
 
 DESCRIPTION="C++ header-only library for Nearest Neighbor (NN) search wih KD-trees"
 HOMEPAGE="https://github.com/jlblancoc/nanoflann"
-SRC_URI="https://github.com/jlblancoc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/jlblancoc/nanoflann.git"
+else
+	SRC_URI="https://github.com/jlblancoc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-cpp/eigen:*"
+RDEPEND="dev-cpp/eigen:3"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	eapply_user
+	cmake-utils_src_prepare
 
 	# do not compile examples
-	sed -ie 's/add_subdirectory(examples)//g' CMakeLists.txt || die "sed failed"
+	cmake_comment_add_subdirectory examples
 }
 
 src_test() {
-	cd "${BUILD_DIR}" && emake -j1 test
-}
-
-src_compile() {
-	:
+	"${CMAKE_MAKEFILE_GENERATOR}" -C "${BUILD_DIR}" -j1 test
 }
diff --git a/sci-libs/nanoflann/nanoflann-9999.ebuild b/sci-libs/nanoflann/nanoflann-9999.ebuild
index 2c8467c00469..4db99558405a 100644
--- a/sci-libs/nanoflann/nanoflann-9999.ebuild
+++ b/sci-libs/nanoflann/nanoflann-9999.ebuild
@@ -8,11 +8,9 @@ inherit cmake-utils
 DESCRIPTION="C++ header-only library for Nearest Neighbor (NN) search wih KD-trees"
 HOMEPAGE="https://github.com/jlblancoc/nanoflann"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://github.com/jlblancoc/nanoflann.git"
-	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/jlblancoc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -22,20 +20,16 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-cpp/eigen:*"
+RDEPEND="dev-cpp/eigen:3"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	eapply_user
+	cmake-utils_src_prepare
 
 	# do not compile examples
-	sed -ie 's/add_subdirectory(examples)//g' CMakeLists.txt || die "sed failed"
+	cmake_comment_add_subdirectory examples
 }
 
 src_test() {
-	cd "${BUILD_DIR}" && emake -j1 test
-}
-
-src_compile() {
-	:
+	"${CMAKE_MAKEFILE_GENERATOR}" -C "${BUILD_DIR}" -j1 test
 }
-- 
cgit v1.2.3