Version Bump, don't mix CFLAGS/CXXFLAGS

Package-Manager: portage-2.2_rc79/cvs/Linux x86_64

4 files changed, 168 insertions, 6 deletions

diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index ebe379dc6a0d..03e04e192654 100644
--- a/sci-libs/neartree/ChangeLog
+++ b/sci-libs/neartree/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/neartree
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.5 2010/07/15 20:23:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.6 2010/09/12 15:00:41 jlec Exp $
+
+*neartree-2.3.1 (12 Sep 2010)
+
+  12 Sep 2010; Justin Lecher <jlec@gentoo.org> +files/2.3.1-gentoo.patch,
+  +neartree-2.3.1.ebuild:
+  Version Bump, don't mix CFLAGS/CXXFLAGS
 
   15 Jul 2010; Markus Meier <maekke@gentoo.org> neartree-2.1.4-r2.ebuild:
   x86 stable, bug #326039
diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index 6f3d2f6ed48c..1aa1bcc30c8f 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -5,14 +5,17 @@ AUX 2.1.4-gcc4.3.patch 616 RMD160 9a3c54f125c8f8d15b026a8799d58aff6c7b9faf SHA1
 AUX 2.1.4-gentoo.patch 4037 RMD160 8e9281b4649e40377ca024de1911ffed61d897a8 SHA1 5f13c7ca2b4de743addf988b30e4d9d93baf6d85 SHA256 2775c71b6655a50e3957be713208f4602d365bfbe0c0ff0a42b3a80c8a4cc79f
 AUX 2.1.4-iterator.patch 845 RMD160 33c451d43b0817680818648e91ce146e5c2f71c2 SHA1 b0e7b24400eedd129a1a0bd4fffeada2a79c80bd SHA256 977f9d70688cbd42baeba9262ad113797bcee76e455629ca7fac26d06e2a7de8
 AUX 2.1.4-test.patch 638 RMD160 8d3352b9c48ed13f724d10e6551cca4df478e466 SHA1 86937e57f7e5d0f5e82d91b91bfe42394502d29b SHA256 0771a2a7ac552d56d8642388300ba1b4b51d781aeb89e7594ef9ea0129d5f0ad
+AUX 2.3.1-gentoo.patch 4523 RMD160 41f68a9635815ff9b03e38ae18edb26d33e4905b SHA1 6297a5f16564c9739a396591d8d4619f8f33f13e SHA256 a02bc900d1a5956b3a0ba8cb00d8e0e539e087c238e7e1b25425c3851fc0315f
 DIST neartree-2.1.4.zip 95970 RMD160 cbf90912f9ce8f162c5440bd67d695168c92c6c3 SHA1 aa5ef6174ed81423423145cf7facdc0f6a4decb8 SHA256 54ba8d6e35734586605221342b62b78ee11e88d7855e2ba34130deed5f70ef55
+DIST neartree-2.3.1.tar.gz 96644 RMD160 1e38897b84716de63268b741fe8a55867b158c03 SHA1 856a678e04a5263b108123074c46ec0782266df1 SHA256 02bd8ea3e14fa8afdb67e7071315b090138bbe4ddc8c674586c7f4723455c056
 EBUILD neartree-2.1.4-r2.ebuild 1226 RMD160 05195270532545b52914b61ad980e8a209c6604c SHA1 b8546ab714455001df5f4919d41eaabd03eec4e8 SHA256 80e2274f10feee3040dd14cef807b629637db85836552fc094d61603b9d7bca8
-MISC ChangeLog 1213 RMD160 fac4c9dc22507b38de876afc658f89be0eac5175 SHA1 887276908d8408cc935865fba18dce1b56b7b6dc SHA256 0d88b10582373260a619a1f4f40c17bcd53793d41c751266845b88f86413a6e5
+EBUILD neartree-2.3.1.ebuild 1158 RMD160 1ce34411d542691528759249c66f1ba0fffaf111 SHA1 2d30d8af8a67e95673b687b8df4501ba40681fd7 SHA256 5945e546542792e5f07df7745ca531e371676f514a28064beb4f400bd1605b54
+MISC ChangeLog 1385 RMD160 42601d322b79b8fc4398df7680ae7ffd79b88de3 SHA1 59f03030cbcbf349fa60d2f1434a525eb4c5d5d7 SHA256 be6ea3d5f9c897c974ad7ea1e58ecf9ed736fa5c54160fa90c1a34b7dbef81cd
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkw/bd4ACgkQkKaRLQcq0GIHbgCfTpeOxNnIPJFIcgNnmCwpZReg
-nRUAn1wRsvFVNBn7f0/Jwp8sSxjZZS2h
-=1+tf
+iEYEARECAAYFAkyM6x4ACgkQgAnW8HDreRafjQCghi095cJUpfT2w5cYB/4tMOcm
+sWUAoJ7RfcmQEDaap2fuDVn2JIAujjuO
+=N4Ls
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/neartree/files/2.3.1-gentoo.patch b/sci-libs/neartree/files/2.3.1-gentoo.patch
new file mode 100644
index 000000000000..63b14961ffa2
--- /dev/null
+++ b/sci-libs/neartree/files/2.3.1-gentoo.patch
@@ -0,0 +1,102 @@
+diff --git a/Makefile b/Makefile
+index 38b63c5..ad91c99 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
+ 
+@@ -110,11 +110,11 @@ 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
++COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CXXFLAGS) $(INCLUDES) $(WARNINGS) -c
++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/neartree-2.3.1.ebuild b/sci-libs/neartree/neartree-2.3.1.ebuild
new file mode 100644
index 000000000000..2cef67ae40b7
--- /dev/null
+++ b/sci-libs/neartree/neartree-2.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.3.1.ebuild,v 1.1 2010/09/12 15:00:41 jlec Exp $
+
+EAPI="3"
+
+inherit base flag-o-matic multilib toolchain-funcs versionator
+
+MY_PN=NearTree
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Function library efficiently solving the Nearest Neighbor Problem(known as the post office 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 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/cvector"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/2.1.4-test.patch
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+
+	sed \
+		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		-i Makefile
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		all || die
+}
+
+src_install() {
+	emake \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		DESTDIR="${D}" install || die
+
+	dodoc README_NearTree.txt || die
+	dohtml *.html || die
+}