summaryrefslogtreecommitdiff
path: root/sci-libs/neartree
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-12 21:55:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-12 21:55:15 +0000
commit7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree56fae051db521b8fce8014cbc8b11484885b14b3 /sci-libs/neartree
parent6d691ad5b6239929063441bbd14c489e92e7396e (diff)
gentoo resync : 12.03.2021
Diffstat (limited to 'sci-libs/neartree')
-rw-r--r--sci-libs/neartree/Manifest4
-rw-r--r--sci-libs/neartree/files/CMakeLists.txt12
-rw-r--r--sci-libs/neartree/neartree-5.1.1.ebuild22
3 files changed, 17 insertions, 21 deletions
diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index 9f5facefe6d8..daecf09970a7 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -1,4 +1,4 @@
-AUX CMakeLists.txt 713 BLAKE2B e27870916b4f17c7cc17d0b1b385e797d8e8a87e195e71a848b0ca9b05f4f881c5e8716167de27e26a58db880e10c6b138cb17201ed1c3b7eba9e542ae69c470 SHA512 038c8e23c642c6e5f6651b9c2cf29f8764a983294b9add97f9af8ac5d14ee52c1b47afa45791a21e8d783cb0e74801df17a34c1fbb08df1d7dd27ef2b4825b94
+AUX CMakeLists.txt 746 BLAKE2B 9c85308c3aa59cdc38c057dadf9c2af01fd35c0941192d6c17f1db98f2abae6491695956f7d550377f62519cc1b14b089a72b4a77ceea2a1ca32c0792b79871f SHA512 254bad915a43babe87e5c9d0c88ce9dce15c5e876f1b18628be356114ba13735af80c7dd00d7661e15589bf4485c58eb80cb09cf318ed212594169b19dba9826
DIST neartree-5.1.1.tar.gz 167695 BLAKE2B 238f9d4f6c900938b53d692b9694044685cd2d906776c95c33f4f3619a35ed33ef2b85ddc7c2876219c7faa3930c234a3854266f539cd0a4b48d15b4a5e96040 SHA512 36f2ab878319153440914325bed67d111dafcac724cbef73d439285f4ad82979b05d2987fa3802c440aa4a037499bf7961ef9b09fa3658364731b5a405854b00
-EBUILD neartree-5.1.1.ebuild 734 BLAKE2B 38fc1363fa89f30f5aa805c9d800f4be8e9d81b2095c3327de850263ed21fc8dfe34763ba18eae0c6d836dd32416c57b08924e6d8d952d834b979a9301968d54 SHA512 69b7d429378360b91404df353b682e7df5a02095b3f239f373b4948972208ad25369180e38a3c45360cac3a521144c15c77406860597793fd8df109afd673a33
+EBUILD neartree-5.1.1.ebuild 600 BLAKE2B 89779dc40ca1c364d118971463d2501377b068f2a2e90deae5962167d719b32a1f00153d7f696a950b77d65d6049237f4c8965bacef5c7eeef45f5aef6430a6b SHA512 d174a87518a0e6691730949229321f3240866a3ed109c55f260f6c42da400009c8a6640c23f97c74f769a12b97ab505b36d7deff4bce9e7ef9f282b0ee79d065
MISC metadata.xml 331 BLAKE2B 4e9085e10412f2d378efb037793cb9c8469b2b2aad9e00f34c0b54943f9042978ef0acce7b1afc7396ae9033bbd4068801797eedb484bcbcf898108724fb42a1 SHA512 3c16cfbd9d2ccac961a78b3d0cd4a0424933f2002a536a25fb192a5347e320282381c92a8f939c1e8c3437ef23a9c843c2b09369a6a6cd6fd7e38a51731d14d9
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
}