Respect CFLAGS

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

4 files changed, 67 insertions, 11 deletions

diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index 03e04e192654..f1cd43b33c26 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.6 2010/09/12 15:00:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.7 2010/09/13 19:10:59 jlec Exp $
+
+*neartree-2.3.1-r1 (13 Sep 2010)
+
+  13 Sep 2010; Justin Lecher <jlec@gentoo.org> files/2.3.1-gentoo.patch,
+  +neartree-2.3.1-r1.ebuild:
+  Respect CFLAGS
 
 *neartree-2.3.1 (12 Sep 2010)
 
diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index 1aa1bcc30c8f..6e1f2fb9cc4a 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -5,17 +5,18 @@ 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
+AUX 2.3.1-gentoo.patch 4422 RMD160 fb2773f84bd00f891499362978225426136b7e94 SHA1 4affc0201cf4c719321304c9361d9447fa4a10fb SHA256 50babce2d4716e04443d97389b86971ded740c2cdd7597dcf335a83552149688
 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
+EBUILD neartree-2.3.1-r1.ebuild 1161 RMD160 62464338bc452a7d73783fc7df0414fca18eb392 SHA1 b66265deb923483ff9d10af46a05eccc97327613 SHA256 bf52626ebeec2cc4b55ba9687d960f17c10e2d06086e03f716eb922005285991
 EBUILD neartree-2.3.1.ebuild 1158 RMD160 1ce34411d542691528759249c66f1ba0fffaf111 SHA1 2d30d8af8a67e95673b687b8df4501ba40681fd7 SHA256 5945e546542792e5f07df7745ca531e371676f514a28064beb4f400bd1605b54
-MISC ChangeLog 1385 RMD160 42601d322b79b8fc4398df7680ae7ffd79b88de3 SHA1 59f03030cbcbf349fa60d2f1434a525eb4c5d5d7 SHA256 be6ea3d5f9c897c974ad7ea1e58ecf9ed736fa5c54160fa90c1a34b7dbef81cd
+MISC ChangeLog 1539 RMD160 f52368070e4e2161bc17bb8fe437cbebee0915ad SHA1 c97d751d474b61a9d8b6453c207ba07fe00eb12a SHA256 46b7fb515b044a0650bdcba3c14f923af95bb6f7940abc576c40fffad07d7ffb
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyM6x4ACgkQgAnW8HDreRafjQCghi095cJUpfT2w5cYB/4tMOcm
-sWUAoJ7RfcmQEDaap2fuDVn2JIAujjuO
-=N4Ls
+iEYEARECAAYFAkyOd0gACgkQgAnW8HDreRZU9wCdH5ci3gCuANWxMI0jYMTUuS62
+BWsAoKxBgVEYalUrTGBYDIOZMN+wYo4z
+=VKVa
 -----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
index 63b14961ffa2..aac9c169f620 100644
--- a/sci-libs/neartree/files/2.3.1-gentoo.patch
+++ b/sci-libs/neartree/files/2.3.1-gentoo.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 38b63c5..ad91c99 100644
+index 38b63c5..4e6bc40 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -42,17 +42,17 @@
@@ -44,14 +44,12 @@ index 38b63c5..ad91c99 100644
  #INSTALL_PREFIX  = $(HOME)
  endif
  
-@@ -110,11 +110,11 @@ CPPLIBRARIES = -lm
- #
+@@ -111,10 +111,10 @@ CPPLIBRARIES = -lm
  CLIBRARIES = $(CVECTOR_LIBLOC) -lCVector -lm
  
--COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+ 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)
diff --git a/sci-libs/neartree/neartree-2.3.1-r1.ebuild b/sci-libs/neartree/neartree-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..5261ed85dc2e
--- /dev/null
+++ b/sci-libs/neartree/neartree-2.3.1-r1.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-r1.ebuild,v 1.1 2010/09/13 19:10:59 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
+}