[gentoo-commits] repo/gentoo:master commit in: sci-libs/neartree/files/, sci-libs/neartree/

2021-03-06 Thread Andreas Sturmlechner 
commit: 61334c0a93f068c7bd1d9b33fc7ae1417eef09a2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar  6 11:53:41 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar  6 11:55:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61334c0a

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  gentoo.org>

 sci-libs/neartree/files/CMakeLists.txt  | 12 +++-
 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 cb4375da796..59b64f8c2f8 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 0d1ac609886..01499d4b10a 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
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/neartree/

2018-01-06 Thread Justin Lecher 
commit: 7da9e67c54c9144bcb6eb42de7b5c1d21c7d8c9b
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jan  6 12:38:52 2018 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jan  6 13:35:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da9e67c

sci-libs/neartree: Fix order in src_prepare

Closes: https://bugs.gentoo.org/634548
Signed-off-by: Justin Lecher  gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/neartree/neartree-5.1.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild 
b/sci-libs/neartree/neartree-5.1.1.ebuild
index eff4bd3646c..0d1ac609886 100644
--- a/sci-libs/neartree/neartree-5.1.1.ebuild
+++ b/sci-libs/neartree/neartree-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,8 +22,8 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-   cmake-utils_src_prepare
cp "${FILESDIR}"/CMakeLists.txt . || die
+   cmake-utils_src_prepare
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/neartree/

2017-10-15 Thread David Seifert 
commit: 5ad08810c2cefe84000607796b8decee88a6a5f6
Author: David Seifert  gentoo  org>
AuthorDate: Mon Oct 16 03:04:38 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 16 03:04:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad08810

sci-libs/neartree: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sci-libs/neartree/neartree-5.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild 
b/sci-libs/neartree/neartree-5.1.1.ebuild
index b9631c22612..eff4bd3646c 100644
--- a/sci-libs/neartree/neartree-5.1.1.ebuild
+++ b/sci-libs/neartree/neartree-5.1.1.ebuild
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-   default
+   cmake-utils_src_prepare
cp "${FILESDIR}"/CMakeLists.txt . || die
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/neartree/, sci-libs/neartree/files/

2017-01-02 Thread Justin Lecher 
commit: 50670628d60a3512dda601b112178ef2f5b1f2e9
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Jan  2 21:59:32 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jan  2 22:09:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50670628

sci-libs/neartree: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/neartree/Manifest |   1 -
 sci-libs/neartree/files/2.1.4-test.patch   |  20 --
 sci-libs/neartree/files/2.3.1-gentoo.patch | 100 -
 sci-libs/neartree/files/2.3.2-gentoo.patch |  82 ---
 sci-libs/neartree/files/2.3.2-notest.patch |  22 ---
 sci-libs/neartree/files/3.1.1-gentoo.patch |  98 
 sci-libs/neartree/files/3.1.1-notest.patch |  34 --
 sci-libs/neartree/files/3.1.1-test.patch   |  34 --
 sci-libs/neartree/neartree-3.1.1-r3.ebuild |  33 --
 9 files changed, 424 deletions(-)

diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index af5efb2..ecc4865 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -1,2 +1 @@
-DIST neartree-3.1.1.tar.gz 124848 SHA256 
5f26d0bef816f492d3939fbe06b8523a495a1fe4d06e9f8283f68a55436961ae SHA512 
dca94cdc46610f3636f958cb361eecdc2b8ba7cf2192043810262f902b1999229eb4d00823cd96790f35c15305f6ecbef85710328776a2f1d306d9d3d4ca39eb
 WHIRLPOOL 
a16efe30e73ce07bb6ee149718db4b6a72f8edbc38a196867bb4a13e502919149cc1dace8eb4b84d8505d967752e8c2c4c691191f3761ccd68b55a431de572a7
 DIST neartree-5.1.1.tar.gz 167695 SHA256 
b951eb23bb4235ada82cef85b9f129bf74a14e45d992097431e7bfb6bdca6642 SHA512 
36f2ab878319153440914325bed67d111dafcac724cbef73d439285f4ad82979b05d2987fa3802c440aa4a037499bf7961ef9b09fa3658364731b5a405854b00
 WHIRLPOOL 
1b878510835bd5139483f9ba27a61376bed0640af18e4f9f77f729bb880b7d3cac7d4a473954eb58645faeb512c92529fd9a300dde413b6872415d7ada5db2cd

diff --git a/sci-libs/neartree/files/2.1.4-test.patch 
b/sci-libs/neartree/files/2.1.4-test.patch
deleted file mode 100644
index 382cfd1..
--- a/sci-libs/neartree/files/2.1.4-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 10e9ba2..b9a349b 100644
 a/Makefile
-+++ b/Makefile
-@@ -303,14 +303,7 @@ tests:$(LIB) $(BIN) $(BIN)/CPPMain 
$(BIN)/CPPNearTreeTest \
-   $(BIN)/CMain 3458923 > $(TESTDATA)/CMain.lst
-   $(BIN)/CPPNearTreeTest
-   $(BIN)/CNearTreeTest
--ifneq ($(MSYSTEM),MINGW32)
--  diff -b -c $(TESTDATA)/CPPMain_orig.lst 
$(TESTDATA)/CPPMain.lst
--  diff -b -c $(TESTDATA)/CMain_orig.lst 
$(TESTDATA)/CMain.lst
--else
--  diff -b -c $(TESTDATA)/CPPMain_MINGW_orig.lst 
$(TESTDATA)/CPPMain.lst
--  diff -b -c $(TESTDATA)/CMain_MINGW_orig.lst 
$(TESTDATA)/CMain.lst
--endif
--  
-+
- #
- # Remove all non-source files
- #

diff --git a/sci-libs/neartree/files/2.3.1-gentoo.patch 
b/sci-libs/neartree/files/2.3.1-gentoo.patch
deleted file mode 100644
index aac9c16..
--- a/sci-libs/neartree/files/2.3.1-gentoo.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 38b63c5..4e6bc40 100644
 a/Makefile
-+++ b/Makefile
-@@ -42,17 +42,17 @@
- 
- # Version string
- VERSION = 3:0:0
--RELEASE = 2.3
-+RELEASE = 2.3.1
- 
- 
- #
- # Compiler and compilation flags
- #
--CC= gcc
-+CC?= gcc
- ifneq ($(MSYSTEM),MINGW32)
--CFLAGS  = -g -O2  -Wall  -ansi -pedantic -DCNEARTREE_SAFE_TRIANG=1
-+CFLAGS  += -ansi -DCNEARTREE_SAFE_TRIANG=1
- else
--CFLAGS  = -g -O2 -Wall  -DCNEARTREE_SAFE_TRIANG=1
-+CFLAGS  += -DCNEARTREE_SAFE_TRIANG=1
- endif
- 
- #
-@@ -72,8 +72,8 @@ endif
- # Uncomment the next two lines if CVector is installed locally in 
$(HOME)/include
- # and $(HOME)/lib
- #
--#CVECTOR_INCLUDE = -I$(HOME)/include 
--#CVECTOR_LIBLOC = -L$(HOME)/lib
-+CVECTOR_INCLUDE = -I/usr/include
-+CVECTOR_LIBLOC = -L/usr/GENTOOLIBDIR
- 
- #
- # Directories
-@@ -86,7 +86,7 @@ INC  = $(ROOT)
- EXAMPLES = $(ROOT)
- TESTDATA = $(ROOT)
- ifndef INSTALL_PREFIX
--INSTALL_PREFIX = /usr/local
-+INSTALL_PREFIX = $(DESTDIR)/usr
- #INSTALL_PREFIX  = $(HOME)
- endif
- 
-@@ -111,10 +111,10 @@ CPPLIBRARIES = -lm
- CLIBRARIES = $(CVECTOR_LIBLOC) -lCVector -lm
- 
- COMPILE_COMMAND=  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) 
$(INCLUDES) $(WARNINGS) -c
--CPPCOMPILE_COMMAND =  $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) 
$(INCLUDES) $(WARNINGS) -c
--LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info 
$(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
-+CPPCOMPILE_COMMAND =  $(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) 
$(INCLUDES) $(WARNINGS) -c
-+LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info 
$(VERSION) -release $(RELEASE) -no-undefined -rpath 
$(INSTALL_PREFIX)/GENTOOLIBDIR

[gentoo-commits] repo/gentoo:master commit in: sci-libs/neartree/

2016-12-20 Thread Tobias Klausmann 
commit: a62cb4033c693c06111fd288bc7c81bb978dad62
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Dec 20 15:29:37 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Dec 20 15:29:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62cb403

sci-libs/neartree-5.1.1-r0: stable on amd64

Gentoo-Bug: 593028

 sci-libs/neartree/neartree-5.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild 
b/sci-libs/neartree/neartree-5.1.1.ebuild
index 794d164..e5e6069 100644
--- a/sci-libs/neartree/neartree-5.1.1.ebuild
+++ b/sci-libs/neartree/neartree-5.1.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://neartree.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/cvector"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/neartree/

2016-09-06 Thread David Seifert 
commit: 347b05726522c6a5e49cf28c24085bc89dcba9d5
Author: Gerhard Bräunlich  gmx  net>
AuthorDate: Tue Sep  6 11:41:26 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Sep  6 20:10:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347b0572

sci-libs/neartree: Version bump to 5.1.1

* EAPI=6

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2255

Signed-off-by: David Seifert  gentoo.org>

 sci-libs/neartree/Manifest  |  1 +
 sci-libs/neartree/neartree-5.1.1.ebuild | 33 +
 2 files changed, 34 insertions(+)

diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index 6a6335d..af5efb2 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -1 +1,2 @@
 DIST neartree-3.1.1.tar.gz 124848 SHA256 
5f26d0bef816f492d3939fbe06b8523a495a1fe4d06e9f8283f68a55436961ae SHA512 
dca94cdc46610f3636f958cb361eecdc2b8ba7cf2192043810262f902b1999229eb4d00823cd96790f35c15305f6ecbef85710328776a2f1d306d9d3d4ca39eb
 WHIRLPOOL 
a16efe30e73ce07bb6ee149718db4b6a72f8edbc38a196867bb4a13e502919149cc1dace8eb4b84d8505d967752e8c2c4c691191f3761ccd68b55a431de572a7
+DIST neartree-5.1.1.tar.gz 167695 SHA256 
b951eb23bb4235ada82cef85b9f129bf74a14e45d992097431e7bfb6bdca6642 SHA512 
36f2ab878319153440914325bed67d111dafcac724cbef73d439285f4ad82979b05d2987fa3802c440aa4a037499bf7961ef9b09fa3658364731b5a405854b00
 WHIRLPOOL 
1b878510835bd5139483f9ba27a61376bed0640af18e4f9f77f729bb880b7d3cac7d4a473954eb58645faeb512c92529fd9a300dde413b6872415d7ada5db2cd

diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild 
b/sci-libs/neartree/neartree-5.1.1.ebuild
new file mode 100644
index ..794d164
--- /dev/null
+++ b/sci-libs/neartree/neartree-5.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PN=NearTree
+MY_P="${MY_PN}-${PV}"
+
+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"
+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}"
+
+src_prepare() {
+   default
+   cp "${FILESDIR}"/CMakeLists.txt . || die
+}
+
+src_configure() {
+   local mycmakeargs=( -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" )
+   cmake-utils_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/neartree/

2016-09-06 Thread David Seifert 
commit: d7b369bc234583de43140342683da79562790ca2
Author: David Seifert  gentoo  org>
AuthorDate: Tue Sep  6 20:10:13 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Sep  6 20:10:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b369bc

sci-libs/neartree: Fix overlong DESCRIPTION

Package-Manager: portage-2.3.0

 sci-libs/neartree/neartree-3.1.1-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/neartree/neartree-3.1.1-r3.ebuild 
b/sci-libs/neartree/neartree-3.1.1-r3.ebuild
index de89d71..15a262c 100644
--- a/sci-libs/neartree/neartree-3.1.1-r3.ebuild
+++ b/sci-libs/neartree/neartree-3.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ inherit cmake-utils
 MY_PN=NearTree
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="Function library efficiently solving the Nearest Neighbor 
Problem(known as the post office problem)"
+DESCRIPTION="Function library efficiently solving the Nearest Neighbor Problem"
 HOMEPAGE="http://neartree.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz -> 
${P}.tar.gz"