diff options
author | Justin Lecher <jlec@gentoo.org> | 2017-01-02 21:59:32 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2017-01-02 22:09:07 +0000 |
commit | 50670628d60a3512dda601b112178ef2f5b1f2e9 (patch) | |
tree | a6e4faf942bbb1ea4a67d6fa2d54390a91da049f /sci-libs | |
parent | sci-libs/cqrlib: Drop old (diff) | |
download | gentoo-50670628d60a3512dda601b112178ef2f5b1f2e9.tar.gz gentoo-50670628d60a3512dda601b112178ef2f5b1f2e9.tar.bz2 gentoo-50670628d60a3512dda601b112178ef2f5b1f2e9.zip |
sci-libs/neartree: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/neartree/Manifest | 1 | ||||
-rw-r--r-- | sci-libs/neartree/files/2.1.4-test.patch | 20 | ||||
-rw-r--r-- | sci-libs/neartree/files/2.3.1-gentoo.patch | 100 | ||||
-rw-r--r-- | sci-libs/neartree/files/2.3.2-gentoo.patch | 82 | ||||
-rw-r--r-- | sci-libs/neartree/files/2.3.2-notest.patch | 22 | ||||
-rw-r--r-- | sci-libs/neartree/files/3.1.1-gentoo.patch | 98 | ||||
-rw-r--r-- | sci-libs/neartree/files/3.1.1-notest.patch | 34 | ||||
-rw-r--r-- | sci-libs/neartree/files/3.1.1-test.patch | 34 | ||||
-rw-r--r-- | sci-libs/neartree/neartree-3.1.1-r3.ebuild | 33 |
9 files changed, 0 insertions, 424 deletions
diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest index af5efb22fce9..ecc4865a838e 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 382cfd17fa58..000000000000 --- 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 aac9c169f620..000000000000 --- 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 $(LDFLAGS) - BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) --CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES) -+CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CXXFLAGS) $(INCLUDES) - BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -shared -I$(INSTALL_PREFIX)/include - BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs -I$(INSTALL_PREFIX)/include - INSTALL_COMMAND = $(LIBTOOL) --mode=install cp -@@ -221,10 +221,10 @@ all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \ - $(LIB)/libCNearTree.$(LIB_EXT) \ - $(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest - --install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \ -+install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/GENTOOLIBDIR $(INSTALL_PREFIX)/include \ - $(INC) $(LIB)/libCNearTree.$(LIB_EXT) $(INC)/TNear.h $(INC)/CNearTree.h $(INC)/rhrand.h -- $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) -- $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) -+ $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) -+ $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) - -cp $(INSTALL_PREFIX)/include/TNear.h $(INSTALL_PREFIX)/include/TNear_old.h - -cp $(INSTALL_PREFIX)/include/CNearTree.h $(INSTALL_PREFIX)/include/CNearTree_old.h - cp $(INC)/TNear.h $(INSTALL_PREFIX)/include/TNear.h -@@ -233,14 +233,6 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include - chmod 644 $(INSTALL_PREFIX)/include/TNear.h - chmod 644 $(INSTALL_PREFIX)/include/CNearTree.h - chmod 644 $(INSTALL_PREFIX)/include/rhrand.h -- echo "Testing final install dynamic" -- $(BUILD_COMMAND_DYNAMIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \ -- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_dynamic -- $(BIN)/CNearTreeTest_dynamic -- echo "Testing final install static" -- $(BUILD_COMMAND_STATIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \ -- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_static -- $(BIN)/CNearTreeTest_static - - - -@@ -250,8 +242,8 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include - $(INSTALL_PREFIX): - mkdir -p $(INSTALL_PREFIX) - --$(INSTALL_PREFIX)/lib: $(INSTALL_PREFIX) -- mkdir -p $(INSTALL_PREFIX)/lib -+$(INSTALL_PREFIX)/GENTOOLIBDIR: $(INSTALL_PREFIX) -+ mkdir -p $(INSTALL_PREFIX)/GENTOOLIBDIR - - $(INSTALL_PREFIX)/bin: $(INSTALL_PREFIX) - mkdir -p $(INSTALL_PREFIX)/bin diff --git a/sci-libs/neartree/files/2.3.2-gentoo.patch b/sci-libs/neartree/files/2.3.2-gentoo.patch deleted file mode 100644 index 4ddf55f7526b..000000000000 --- a/sci-libs/neartree/files/2.3.2-gentoo.patch +++ /dev/null @@ -1,82 +0,0 @@ - Makefile | 28 ++++++++++++++-------------- - 1 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/Makefile b/Makefile -index 2a5c626..0698510 100644 ---- a/Makefile -+++ b/Makefile -@@ -50,11 +50,11 @@ RELEASE = 2.3.2 - # - # 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 - - # -@@ -74,8 +74,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 -@@ -88,7 +88,7 @@ INC = $(ROOT) - EXAMPLES = $(ROOT) - TESTDATA = $(ROOT) - ifndef INSTALL_PREFIX --INSTALL_PREFIX = /usr/local -+INSTALL_PREFIX = $(DESTDIR)/usr - #INSTALL_PREFIX = $(HOME) - endif - -@@ -113,10 +113,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 $(LDFLAGS) - BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) --CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES) -+CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CXXFLAGS) $(INCLUDES) - BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -shared -I$(INSTALL_PREFIX)/include - BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs -I$(INSTALL_PREFIX)/include - INSTALL_COMMAND = $(LIBTOOL) --mode=install cp -@@ -223,11 +223,11 @@ all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \ - $(LIB)/libCNearTree.$(LIB_EXT) \ - $(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest - --install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \ -+install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/GENTOOLIBDIR $(INSTALL_PREFIX)/include \ - $(INC) $(LIB)/libCNearTree.$(LIB_EXT) $(INC)/TNear.h $(INC)/CNearTree.h \ - $(INC)/rhrand.h $(INC)/triple.h -- $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) -- $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) -+ $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) -+ $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) - -cp $(INSTALL_PREFIX)/include/TNear.h $(INSTALL_PREFIX)/include/TNear_old.h - -cp $(INSTALL_PREFIX)/include/CNearTree.h $(INSTALL_PREFIX)/include/CNearTree_old.h - cp $(INC)/TNear.h $(INSTALL_PREFIX)/include/TNear.h -@@ -255,8 +255,8 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include - $(INSTALL_PREFIX): - mkdir -p $(INSTALL_PREFIX) - --$(INSTALL_PREFIX)/lib: $(INSTALL_PREFIX) -- mkdir -p $(INSTALL_PREFIX)/lib -+$(INSTALL_PREFIX)/GENTOOLIBDIR: $(INSTALL_PREFIX) -+ mkdir -p $(INSTALL_PREFIX)/GENTOOLIBDIR - - $(INSTALL_PREFIX)/bin: $(INSTALL_PREFIX) - mkdir -p $(INSTALL_PREFIX)/bin diff --git a/sci-libs/neartree/files/2.3.2-notest.patch b/sci-libs/neartree/files/2.3.2-notest.patch deleted file mode 100644 index f49d1d7edad7..000000000000 --- a/sci-libs/neartree/files/2.3.2-notest.patch +++ /dev/null @@ -1,22 +0,0 @@ - Makefile | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index 2a5c626..cab4102 100644 ---- a/Makefile -+++ b/Makefile -@@ -238,14 +238,6 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include - chmod 644 $(INSTALL_PREFIX)/include/CNearTree.h - chmod 644 $(INSTALL_PREFIX)/include/rhrand.h - chmod 644 $(INSTALL_PREFIX)/include/triple.h -- echo "Testing final install dynamic" -- $(BUILD_COMMAND_DYNAMIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \ -- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_dynamic -- $(BIN)/CNearTreeTest_dynamic -- echo "Testing final install static" -- $(BUILD_COMMAND_STATIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \ -- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_static -- $(BIN)/CNearTreeTest_static - - - diff --git a/sci-libs/neartree/files/3.1.1-gentoo.patch b/sci-libs/neartree/files/3.1.1-gentoo.patch deleted file mode 100644 index 4f72e022e345..000000000000 --- a/sci-libs/neartree/files/3.1.1-gentoo.patch +++ /dev/null @@ -1,98 +0,0 @@ -From eb88a598f46f835782ba93bfbde68761cb159f4c Mon Sep 17 00:00:00 2001 -Message-Id: <eb88a598f46f835782ba93bfbde68761cb159f4c.1323853429.git.jlec@gentoo.org> -From: Justin Lecher <jlec@gentoo.org> -Date: Wed, 14 Dec 2011 09:50:42 +0100 -Subject: [PATCH 1/2] gentoo.patch - -Conflicts: - - Makefile ---- - Makefile | 30 +++++++++++++++--------------- - 1 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/Makefile b/Makefile -index 5c92d8b..859363e 100644 ---- a/Makefile -+++ b/Makefile -@@ -52,11 +52,10 @@ RELEASE = 3.1 - # --CC = gcc - ifneq ($(MSYSTEM),MINGW32) --CFLAGS = -g -O2 -Wall -ansi -pedantic -DCNEARTREE_SAFE_TRIANG=1 -+CFLAGS += -ansi -DCNEARTREE_SAFE_TRIANG=1 - TIME = time - else --CFLAGS = -g -O2 -Wall -DCNEARTREE_SAFE_TRIANG=1 --TIME = -+CFLAGS += -DCNEARTREE_SAFE_TRIANG=1 -+TIME = - endif - - # -@@ -76,8 +76,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 -@@ -90,7 +90,7 @@ INC = $(ROOT) - EXAMPLES = $(ROOT) - TESTDATA = $(ROOT) - ifndef INSTALL_PREFIX --INSTALL_PREFIX = /usr/local -+INSTALL_PREFIX = $(DESTDIR)/usr - #INSTALL_PREFIX = $(HOME) - endif - -@@ -115,10 +115,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) -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 $(LDFLAGS) - BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) --CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES) -+CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CXXFLAGS) $(INCLUDES) - BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -shared -I$(INSTALL_PREFIX)/include - BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs -I$(INSTALL_PREFIX)/include - INSTALL_COMMAND = $(LIBTOOL) --mode=install cp -@@ -223,13 +223,13 @@ endif - # - all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \ - $(LIB)/libCNearTree.$(LIB_EXT) \ -- $(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest $(BIN)/CNearTreeTestInst -+ $(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest - --install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \ -+install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/GENTOOLIBDIR $(INSTALL_PREFIX)/include \ - $(INC) $(LIB)/libCNearTree.$(LIB_EXT) $(INC)/TNear.h $(INC)/CNearTree.h \ - $(INC)/rhrand.h $(INC)/triple.h -- $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) -- $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) -+ $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) -+ $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) - -cp $(INSTALL_PREFIX)/include/TNear.h $(INSTALL_PREFIX)/include/TNear_old.h - -cp $(INSTALL_PREFIX)/include/CNearTree.h $(INSTALL_PREFIX)/include/CNearTree_old.h - cp $(INC)/TNear.h $(INSTALL_PREFIX)/include/TNear.h -@@ -257,8 +257,8 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include - $(INSTALL_PREFIX): - mkdir -p $(INSTALL_PREFIX) - --$(INSTALL_PREFIX)/lib: $(INSTALL_PREFIX) -- mkdir -p $(INSTALL_PREFIX)/lib -+$(INSTALL_PREFIX)/GENTOOLIBDIR: $(INSTALL_PREFIX) -+ mkdir -p $(INSTALL_PREFIX)/GENTOOLIBDIR - - $(INSTALL_PREFIX)/bin: $(INSTALL_PREFIX) - mkdir -p $(INSTALL_PREFIX)/bin --- -1.7.8 - diff --git a/sci-libs/neartree/files/3.1.1-notest.patch b/sci-libs/neartree/files/3.1.1-notest.patch deleted file mode 100644 index c85a50537894..000000000000 --- a/sci-libs/neartree/files/3.1.1-notest.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c9367aefa380d276590e3e0045f69fc884fed948 Mon Sep 17 00:00:00 2001 -Message-Id: <c9367aefa380d276590e3e0045f69fc884fed948.1323853429.git.jlec@gentoo.org> -In-Reply-To: <eb88a598f46f835782ba93bfbde68761cb159f4c.1323853429.git.jlec@gentoo.org> -References: <eb88a598f46f835782ba93bfbde68761cb159f4c.1323853429.git.jlec@gentoo.org> -From: Justin Lecher <jlec@gentoo.org> -Date: Wed, 14 Dec 2011 09:56:51 +0100 -Subject: [PATCH 2/2] notest.patch - ---- - Makefile | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index 859363e..8de706b 100644 ---- a/Makefile -+++ b/Makefile -@@ -240,14 +240,6 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/GENTOOLIBDIR $(INSTALL_PREFIX) - chmod 644 $(INSTALL_PREFIX)/include/CNearTree.h - chmod 644 $(INSTALL_PREFIX)/include/rhrand.h - chmod 644 $(INSTALL_PREFIX)/include/triple.h -- echo "Testing final install dynamic" -- $(BUILD_COMMAND_DYNAMIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \ -- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_dynamic -- $(BIN)/CNearTreeTest_dynamic -- echo "Testing final install static" -- $(BUILD_COMMAND_STATIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \ -- -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_static -- $(BIN)/CNearTreeTest_static - - - --- -1.7.8 - diff --git a/sci-libs/neartree/files/3.1.1-test.patch b/sci-libs/neartree/files/3.1.1-test.patch deleted file mode 100644 index 2796be6eaf85..000000000000 --- a/sci-libs/neartree/files/3.1.1-test.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6a9ec8e68191a3ff9ad21a34814e71f6baf6f5ce Mon Sep 17 00:00:00 2001 -Message-Id: <6a9ec8e68191a3ff9ad21a34814e71f6baf6f5ce.1323853619.git.jlec@gentoo.org> -From: Justin Lecher <jlec@gentoo.org> -Date: Wed, 14 Dec 2011 10:06:51 +0100 -Subject: [PATCH] 3.1.1-test.patch - ---- - Makefile | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - -diff --git a/Makefile b/Makefile -index 8de706b..73ae0da 100644 ---- a/Makefile -+++ b/Makefile -@@ -339,16 +339,6 @@ tests: $(LIB) $(BIN) $(BIN)/CPPMain $(BIN)/CPPMain_Flip $(BIN)/CPPNearTreeTest - $(TIME) $(BIN)/CPPNearTreeTestInstNoFlip - $(TIME) $(BIN)/CNearTreeTest --debug - $(TIME) $(BIN)/CNearTreeTestInst --debug --ifneq ($(MSYSTEM),MINGW32) -- diff -b -c $(TESTDATA)/CPPMain_orig.lst $(TESTDATA)/CPPMain.lst -- diff -b -c $(TESTDATA)/CPPMain_orig.lst $(TESTDATA)/CPPMain_Flip.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)/CPPMain_MINGW_orig.lst $(TESTDATA)/CPPMain_Flip.lst -- diff -b -c $(TESTDATA)/CMain_MINGW_orig.lst $(TESTDATA)/CMain.lst --endif -- - # - # Remove all non-source files - # --- -1.7.8 - diff --git a/sci-libs/neartree/neartree-3.1.1-r3.ebuild b/sci-libs/neartree/neartree-3.1.1-r3.ebuild deleted file mode 100644 index 15a262c24107..000000000000 --- a/sci-libs/neartree/neartree-3.1.1-r3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -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}/${PN}/${MY_P}/${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() { - cp "${FILESDIR}"/CMakeLists.txt . || die -} - -src_configure() { - local mycmakeargs=( -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" ) - cmake-utils_src_configure -} |