diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-03-06 12:53:41 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-03-06 12:55:56 +0100 |
| commit | 61334c0a93f068c7bd1d9b33fc7ae1417eef09a2 (patch) | |
| tree | de7a25fd48eb70f84cda3052939f6c95544f5a7c /sci-libs | |
| parent | dev-db/4store: Remove last-rited package (diff) | |
| download | gentoo-61334c0a93f068c7bd1d9b33fc7ae1417eef09a2.tar.gz gentoo-61334c0a93f068c7bd1d9b33fc7ae1417eef09a2.tar.bz2 gentoo-61334c0a93f068c7bd1d9b33fc7ae1417eef09a2.zip | |
sci-libs/neartree: EAPI-7 bump, use cmake.eclass, use GNUInstallDirs
Drop superfluous src_configure.
Drop superfluous IUSE="static-libs".
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/neartree/files/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | sci-libs/neartree/neartree-5.1.1.ebuild | 22 |
2 files changed, 15 insertions, 19 deletions
diff --git a/sci-libs/neartree/files/CMakeLists.txt b/sci-libs/neartree/files/CMakeLists.txt index cb4375da7964..59b64f8c2f8d 100644 --- a/sci-libs/neartree/files/CMakeLists.txt +++ b/sci-libs/neartree/files/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12) project (Neartree C) SET (LIB_MAJOR 5) @@ -7,6 +7,8 @@ SET (LIB_RELEASE 0) SET (_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE}) +include(GNUInstallDirs) + include_directories ("${PROJECT_SOURCE_DIR}") add_library(CNearTree SHARED CNearTree.c) @@ -14,8 +16,8 @@ target_link_libraries(CNearTree CVector m) set_target_properties(CNearTree PROPERTIES SOVERSION ${LIB_MAJOR} VERSION ${_soversion}) -INSTALL(TARGETS CNearTree DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) +INSTALL(TARGETS CNearTree DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES CNearTree.h rhrand.h TNear.h triple.h - DESTINATION ${CMAKE_INSTALL_PREFIX}/include) -install(FILES README_NearTree.txt DESTINATION ${DOC_DIR}) -install(FILES README_NearTree.html index.html DESTINATION ${DOC_DIR}/html) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(FILES README_NearTree.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}) +install(FILES README_NearTree.html index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/html) diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild b/sci-libs/neartree/neartree-5.1.1.ebuild index 0d1ac6098867..01499d4b10a1 100644 --- a/sci-libs/neartree/neartree-5.1.1.ebuild +++ b/sci-libs/neartree/neartree-5.1.1.ebuild @@ -1,32 +1,26 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils - -MY_PN=NearTree -MY_P="${MY_PN}-${PV}" +MY_P="NearTree-${PV}" +inherit cmake DESCRIPTION="Function library efficiently solving the Nearest Neighbor Problem" HOMEPAGE="http://neartree.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" RDEPEND="dev-libs/cvector" DEPEND="${RDEPEND}" -S="${WORKDIR}/${MY_P}" +DOCS=( README_NearTree.txt ) src_prepare() { cp "${FILESDIR}"/CMakeLists.txt . || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" ) - cmake-utils_src_configure + cmake_src_prepare } |