From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/nanoflann/
Date: Sun, 26 Nov 2017 23:33:25 +0000 (UTC) [thread overview]
Message-ID: <1511739190.eb4a7f129dfe3acbc85a72262dbc3a55caf1d45b.soap@gentoo> (raw)
commit: eb4a7f129dfe3acbc85a72262dbc3a55caf1d45b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 14:37:46 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 23:33:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb4a7f12
sci-libs/nanoflann: [QA] Add cmake-utils_src_prepare
Closes: https://bugs.gentoo.org/638490
Package-Manager: Portage-2.3.16, Repoman-2.3.6
sci-libs/nanoflann/Manifest | 2 +-
sci-libs/nanoflann/nanoflann-1.2.3.ebuild | 22 ++++++++++++----------
sci-libs/nanoflann/nanoflann-9999.ebuild | 16 +++++-----------
3 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/sci-libs/nanoflann/Manifest b/sci-libs/nanoflann/Manifest
index 09abb93da95..231a1015624 100644
--- a/sci-libs/nanoflann/Manifest
+++ b/sci-libs/nanoflann/Manifest
@@ -1 +1 @@
-DIST nanoflann-1.2.3.tar.gz 1157793 SHA256 5ef4dfb23872379fe9eb306aabd19c9df4cae852b72a923af01aea5e8d7a59c3 SHA512 01d5226fb669c9ef21e1bd36bddb07c7bf8bbbf9798e90bfa7966de4ae01e05c669c33a73d37340c41c79fcab81c91c3991077d799a211985b2d0a2a365a8878 WHIRLPOOL 2a1c9a21dbd7571e4c680a2b5e3636086df4e06142d885b390983228a3cf3d36f01d0389fe712f1d9a9106a55887353a1ea7c057a289c727e98b9bf5308c1b20
+DIST nanoflann-1.2.3.tar.gz 1157793 BLAKE2B e6b3947c5c99689da5d3759e0217deca691bada8089cdd1e3cd41902b0db2533908fab1ff5474851064d3f2ab6a5a70429320bbf432a0381df4aec0139a6b2f4 SHA512 01d5226fb669c9ef21e1bd36bddb07c7bf8bbbf9798e90bfa7966de4ae01e05c669c33a73d37340c41c79fcab81c91c3991077d799a211985b2d0a2a365a8878
diff --git a/sci-libs/nanoflann/nanoflann-1.2.3.ebuild b/sci-libs/nanoflann/nanoflann-1.2.3.ebuild
index e82a84965d8..4db99558405 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 2c8467c0046..4db99558405 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
}
next reply other threads:[~2017-11-26 23:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-26 23:33 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-30 16:59 [gentoo-commits] repo/gentoo:master commit in: sci-libs/nanoflann/ Matthias Maier
2025-08-30 16:59 Matthias Maier
2021-11-02 19:43 Sam James
2021-01-24 13:49 David Seifert
2021-01-24 13:49 David Seifert
2021-01-24 13:49 David Seifert
2017-08-14 16:04 Matthias Maier
2017-08-14 16:04 Matthias Maier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1511739190.eb4a7f129dfe3acbc85a72262dbc3a55caf1d45b.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox