Respect FLAGS and fix as-needed issues wrt bug 295199. Thanks Diego for reporting.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 49 insertions, 9 deletions

diff --git a/sci-biology/fasttree/ChangeLog b/sci-biology/fasttree/ChangeLog
index 12a8588208c2..82652a68d239 100644
--- a/sci-biology/fasttree/ChangeLog
+++ b/sci-biology/fasttree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-biology/fasttree
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/fasttree/ChangeLog,v 1.1 2009/09/10 23:14:22 weaver Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/fasttree/ChangeLog,v 1.2 2010/06/20 18:20:40 xarthisius Exp $
+
+  20 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> fasttree-2.0.1.ebuild,
+  +files/fasttree-2.0.1-asneeded.patch:
+  Respect FLAGS and fix as-needed issues wrt bug 295199. Thanks Diego for
+  reporting.
 
 *fasttree-2.0.1 (10 Sep 2009)
 
diff --git a/sci-biology/fasttree/Manifest b/sci-biology/fasttree/Manifest
index 46566c6c32a4..7516d30ba856 100644
--- a/sci-biology/fasttree/Manifest
+++ b/sci-biology/fasttree/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fasttree-2.0.1-asneeded.patch 455 RMD160 84639c58a269a9e7b15ca22ee4f2211149e5f733 SHA1 271eeebb286a5fe8613dcf9d32355c9065b36a6a SHA256 f43ec50d2d4284d60b438e62a407686a5149a31e9c5e389744d894b9e55243eb
 DIST fasttree-2.0.1.tar.bz2 149279 RMD160 af98fa4a206e130edfa59a12d12d88e1eeca6949 SHA1 b85f0add3d232a9ef188de7502c8cba84e5d22fe SHA256 968a42f126c67f471a21c6ffe621cbedb3ed406838a3d80e799487aedc137fb4
-EBUILD fasttree-2.0.1.ebuild 670 RMD160 89e58c0cc90db788690ed36709aced79ccc01ef4 SHA1 3ffff9214586b0acd022ee6247c1b3ea0cbf29d5 SHA256 a8b0f573ee7bf308cd58c0ff9da46156f117bca2e5ff161576d0ae918fd95b07
-MISC ChangeLog 372 RMD160 1a48331397ebdb71911e72c82cbc830a5d7cf6d8 SHA1 71ad66a0c56edcbff962f4fad5489e7e0caf9312 SHA256 23c2b82df084ac87d0443df03f7e79390d00f754bdf172ba96e0c7afb3b66e85
+EBUILD fasttree-2.0.1.ebuild 783 RMD160 564386bf3f2b2429b0454283e31a93906ff2505a SHA1 10d7f1d26bc1391cd2219f6e89bf8119412d0f78 SHA256 61f547093efad5df2ca57caa7fa35cf9c2b194c8b677fac5a008aecd3d744548
+MISC ChangeLog 581 RMD160 6f3d65653ccdcab0f3c755e0d5be8511088472b9 SHA1 9a7607f569328f2e7c2d555d0bde5818134b301e SHA256 d912319fc38b73d4c70d93fb56c2045716afcce3f65829db31f11e644db8053d
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkweXAEACgkQIiMqcbOVdxThpAQAmMphgkD0UqfJvjd1Owa8g9N6
+hePhPNboL+gs7SjJ7MNxYoKqPupIx7BuUss6a6TcSkw0ob1n/oO9kNk28tXh7ApA
+ZqwWw890jMjlOnePxcgBopbxyma16+O4NHfN3sjeHjkt9Rr06SE3xS2j/4p/rlBG
+R8Y8FcC/DgQB+/sqoGo=
+=hoSx
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/fasttree/fasttree-2.0.1.ebuild b/sci-biology/fasttree/fasttree-2.0.1.ebuild
index 532fe31e824f..7a2691703290 100644
--- a/sci-biology/fasttree/fasttree-2.0.1.ebuild
+++ b/sci-biology/fasttree/fasttree-2.0.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/fasttree/fasttree-2.0.1.ebuild,v 1.1 2009/09/10 23:14:22 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/fasttree/fasttree-2.0.1.ebuild,v 1.2 2010/06/20 18:20:40 xarthisius Exp $
 
 EAPI="2"
 
+inherit eutils toolchain-funcs
+
 DESCRIPTION="Fast inference of approximately-maximum-likelihood phylogenetic trees"
 HOMEPAGE="http://www.microbesonline.org/fasttree/"
 #SRC_URI="http://www.microbesonline.org/fasttree/FastTree.c"
@@ -14,12 +16,17 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=""
-RDEPEND=""
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
 
 src_install() {
 	dobin FastTree FastTreeUPGMA || die
 	insinto /usr/share/${PN}
 	doins *.pl *.pm || die
-	dodoc README*
+	dodoc README* || die
 }
diff --git a/sci-biology/fasttree/files/fasttree-2.0.1-asneeded.patch b/sci-biology/fasttree/files/fasttree-2.0.1-asneeded.patch
new file mode 100644
index 000000000000..faef13e735aa
--- /dev/null
+++ b/sci-biology/fasttree/files/fasttree-2.0.1-asneeded.patch
@@ -0,0 +1,15 @@
+Respect FLAGS and fix as-needed issues
+
+https://bugs.gentoo.org/show_bug.cgi?id=295199
+
+--- Makefile
++++ Makefile
+@@ -1,6 +1,5 @@
+-CFLAGS := ${CFLAGS} -Wall -O3 -finline-functions -funroll-loops 
+ LIBS := -lm
+ 
+ all:
+-	${CC} ${CFLAGS} ${LIBS} -o FastTree FastTree.c
+-	${CC} ${CFLAGS} ${LIBS} -o FastTreeUPGMA FastTreeUPGMA.c
++	${CC} ${CFLAGS} ${LDFLAGS} -o FastTree FastTree.c ${LIBS}
++	${CC} ${CFLAGS} ${LDFLAGS} -o FastTreeUPGMA FastTreeUPGMA.c ${LIBS}