Version Bump, notified by euscan

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

5 files changed, 154 insertions, 12 deletions

diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index 0f2f23c42e93..05f1eb8394ab 100644
--- a/sci-libs/neartree/ChangeLog
+++ b/sci-libs/neartree/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/neartree
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.10 2011/01/25 12:46:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.11 2011/05/05 16:17:48 jlec Exp $
+
+*neartree-2.3.2 (05 May 2011)
+
+  05 May 2011; Justin Lecher <jlec@gentoo.org> +files/2.3.2-gentoo.patch,
+  neartree-2.3.1.ebuild, neartree-2.3.1-r1.ebuild, +neartree-2.3.2.ebuild:
+  Version Bump, notified by euscan
 
   25 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
   neartree-2.3.1-r1.ebuild:
diff --git a/sci-libs/neartree/files/2.3.2-gentoo.patch b/sci-libs/neartree/files/2.3.2-gentoo.patch
new file mode 100644
index 000000000000..4ddf55f7526b
--- /dev/null
+++ b/sci-libs/neartree/files/2.3.2-gentoo.patch
@@ -0,0 +1,82 @@
+ 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/neartree-2.3.1-r1.ebuild b/sci-libs/neartree/neartree-2.3.1-r1.ebuild
index 56acac34b3dc..acad4f6f6783 100644
--- a/sci-libs/neartree/neartree-2.3.1-r1.ebuild
+++ b/sci-libs/neartree/neartree-2.3.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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-r1.ebuild,v 1.4 2011/01/25 12:46:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.3.1-r1.ebuild,v 1.5 2011/05/05 16:17:48 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit base flag-o-matic multilib toolchain-funcs versionator
 
@@ -10,7 +10,7 @@ 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"
+HOMEPAGE="http://neartree.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -24,8 +24,9 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/2.1.4-test.patch
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	epatch \
+		"${FILESDIR}"/2.1.4-test.patch \
+		"${FILESDIR}"/${PV}-gentoo.patch
 
 	sed \
 		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
diff --git a/sci-libs/neartree/neartree-2.3.1.ebuild b/sci-libs/neartree/neartree-2.3.1.ebuild
index 2cef67ae40b7..f51c6801fd59 100644
--- a/sci-libs/neartree/neartree-2.3.1.ebuild
+++ b/sci-libs/neartree/neartree-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.3.1.ebuild,v 1.2 2011/05/05 16:17:48 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit base flag-o-matic multilib toolchain-funcs versionator
 
@@ -10,7 +10,7 @@ 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"
+HOMEPAGE="http://neartree.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -24,8 +24,9 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/2.1.4-test.patch
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	epatch \
+		"${FILESDIR}"/2.1.4-test.patch \
+		"${FILESDIR}"/${PV}-gentoo.patch
 
 	sed \
 		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
diff --git a/sci-libs/neartree/neartree-2.3.2.ebuild b/sci-libs/neartree/neartree-2.3.2.ebuild
new file mode 100644
index 000000000000..de8084d7a787
--- /dev/null
+++ b/sci-libs/neartree/neartree-2.3.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.3.2.ebuild,v 1.1 2011/05/05 16:17:48 jlec Exp $
+
+EAPI=4
+
+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 ~ppc ~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 \
+		"${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
+}
+
+src_install() {
+	emake \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		DESTDIR="${D}" install
+
+	dodoc README_NearTree.txt
+	dohtml *.html
+}