Respect CC and LDFLAGS wrt bug 335225. Thanks to Diego for the report.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 42 insertions, 10 deletions

diff --git a/sci-biology/primer3/ChangeLog b/sci-biology/primer3/ChangeLog
index f70008b4d463..4f5fe5fa4781 100644
--- a/sci-biology/primer3/ChangeLog
+++ b/sci-biology/primer3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/primer3
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.22 2010/03/07 20:53:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.23 2010/08/31 12:16:41 xarthisius Exp $
+
+*primer3-1.1.4-r2 (31 Aug 2010)
+
+  31 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -primer3-1.1.4-r1.ebuild, +primer3-1.1.4-r2.ebuild,
+  +files/primer3-1.1.4-ldflags.patch:
+  Respect CC and LDFLAGS wrt bug 335225. Thanks to Diego for the report.
 
 *primer3-1.1.4-r1 (07 Mar 2010)
 
diff --git a/sci-biology/primer3/files/primer3-1.1.4-ldflags.patch b/sci-biology/primer3/files/primer3-1.1.4-ldflags.patch
new file mode 100644
index 000000000000..66a5a52d4e8e
--- /dev/null
+++ b/sci-biology/primer3/files/primer3-1.1.4-ldflags.patch
@@ -0,0 +1,25 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=335225
+
+--- src/Makefile
++++ src/Makefile
+@@ -103,10 +103,10 @@
+ 	$(CC) $(LDFLAGS) -o $@ ntdpal_main.o dpal.o

+ 

+ oligotm: oligotm_main.c oligotm.h $(OLIGOTM_LIB)

+-	$(CC) $(CFLAGS) -o $@ oligotm_main.c $(OLIGOTM_LIB) $(LIBOPTS) $(LDLIBS)

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ oligotm_main.c $(OLIGOTM_LIB) $(LIBOPTS) $(LDLIBS)

+ 

+ long_seq_tm_test: long_seq_tm_test_main.c oligotm.o

+-	$(CC) $(CFLAGS) -o $@ long_seq_tm_test_main.c oligotm.o $(LIBOPTS) $(LDLIBS)

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ long_seq_tm_test_main.c oligotm.o $(LIBOPTS) $(LDLIBS)

+ 

+ boulder_input.o: boulder_input.c boulder_input.h primer3.h primer3_release.h dpal.h

+ 	$(CC) -c $(CFLAGS) $(P_DEFINES) -o $@ boulder_input.c

+@@ -136,4 +136,4 @@
+ primer_test: test

+ 

+ test: $(PRIMER_EXE) ntdpal

+-	cd ../test; make test

++	$(MAKE) -C ../test test

diff --git a/sci-biology/primer3/primer3-1.1.4-r1.ebuild b/sci-biology/primer3/primer3-1.1.4-r2.ebuild
index 65e39e19f6f5..b12de1503ef0 100644
--- a/sci-biology/primer3/primer3-1.1.4-r1.ebuild
+++ b/sci-biology/primer3/primer3-1.1.4-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-1.1.4-r1.ebuild,v 1.1 2010/03/07 20:53:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-1.1.4-r2.ebuild,v 1.1 2010/08/31 12:16:41 xarthisius Exp $
 
 EAPI="3"
 
+inherit eutils toolchain-funcs
+
 DESCRIPTION="Design primers for PCR reactions."
 HOMEPAGE="http://primer3.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -14,27 +16,25 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~spa
 IUSE=""
 
 DEPEND="dev-lang/perl"
-
 RDEPEND=""
 
-S="${WORKDIR}/src"
+S=${WORKDIR}/src
 
 src_prepare() {
 	[[ ${CHOST} == *-darwin* ]] && \
 		sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile
+	epatch "${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_compile() {
-	emake -e || die
+	emake -e CC="$(tc-getCC)" || die
 }
 
 src_test () {
-	make primer_test || die
+	emake primer_test || die
 }
 
 src_install () {
-	dobin long_seq_tm_test ntdpal oligotm primer3_core || die \
-			"Could not install program."
-	dodoc ../{how-to-cite.txt,README.txt,example} || die \
-			"Could not install documentation."
+	dobin long_seq_tm_test ntdpal oligotm primer3_core || die
+	dodoc ../{how-to-cite.txt,README.txt,example} || die
 }