Respect LDFLAGS wrt bug 334781. Thanks to Diego for the report. Drop old.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 14 insertions, 37 deletions

diff --git a/sci-biology/mothur/ChangeLog b/sci-biology/mothur/ChangeLog
index f221850c13f8..e7eb46ee2ec5 100644
--- a/sci-biology/mothur/ChangeLog
+++ b/sci-biology/mothur/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/mothur
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mothur/ChangeLog,v 1.5 2010/02/06 13:06:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mothur/ChangeLog,v 1.6 2010/08/27 09:28:47 xarthisius Exp $
+
+*mothur-1.7.2-r1 (27 Aug 2010)
+
+  27 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> -mothur-1.4.1.ebuild,
+  -mothur-1.7.2.ebuild, +mothur-1.7.2-r1.ebuild:
+  Respect LDFLAGS wrt bug 334781. Thanks to Diego for the report.
+  Remove old.
 
   06 Feb 2010; Markos Chandras <hwoarang@gentoo.org> mothur-1.6.0.ebuild:
   Stable on amd64 wrt bug #298777
diff --git a/sci-biology/mothur/mothur-1.4.1.ebuild b/sci-biology/mothur/mothur-1.4.1.ebuild
deleted file mode 100644
index d5ca31c44ab7..000000000000
--- a/sci-biology/mothur/mothur-1.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mothur/mothur-1.4.1.ebuild,v 1.1 2009/07/07 18:09:18 weaver Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A suite of algorithms for ecological bioinformatics"
-HOMEPAGE="http://schloss.micro.umass.edu/mothur/Main_Page"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-#S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e 's/CC_OPTIONS =/CC_OPTIONS = ${CXXFLAGS} /' \
-		-e 's|CC = g++|CC = '$(tc-getCXX)'|' "${S}/makefile" || die
-}
-
-src_install() {
-	dobin mothur || die
-}
diff --git a/sci-biology/mothur/mothur-1.7.2.ebuild b/sci-biology/mothur/mothur-1.7.2-r1.ebuild
index e32acc04c3ae..79e5c5168da5 100644
--- a/sci-biology/mothur/mothur-1.7.2.ebuild
+++ b/sci-biology/mothur/mothur-1.7.2-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/mothur/mothur-1.7.2.ebuild,v 1.1 2009/12/30 03:20:16 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mothur/mothur-1.7.2-r1.ebuild,v 1.1 2010/08/27 09:28:47 xarthisius Exp $
 
 EAPI="2"
 
@@ -18,11 +18,11 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="app-arch/unzip"
 RDEPEND=""
 
-S="${WORKDIR}/Mothur.source"
+S=${WORKDIR}/Mothur.source
 
-src_prepare() {
-	sed -i -e 's/CC_OPTIONS =/CC_OPTIONS = ${CXXFLAGS} /' \
-		-e 's|CC = g++|CC = '$(tc-getCXX)'|' "${S}/makefile" || die
+src_compile() {
+	emake CC_OPTIONS="${CXXFLAGS}" CC="$(tc-getCXX)" \
+		LNK_OPTIONS="${LDFLAGS}" ||	die
 }
 
 src_install() {