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

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

4 files changed, 51 insertions, 16 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/Manifest b/sci-biology/primer3/Manifest
index 48dfcff9d598..35c76261eb1f 100644
--- a/sci-biology/primer3/Manifest
+++ b/sci-biology/primer3/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX primer3-1.1.4-ldflags.patch 882 RMD160 c67d4e03fc68155d2a74276bbc7e409bc8e8096b SHA1 5346c976c80b6a474e352f3a27c6153648d58a2b SHA256 10ef0f1491df83c60f5919fcc461a0864e12a0303d8242f4e3ea1c2f8963c436
 DIST primer3-1.1.4.tar.gz 974628 RMD160 87535d123d4c00b64eb763e4e567c5c83fde6b54 SHA1 fcabf7d8aa31c5568bd130b318c3ead4a1b9aa3a SHA256 1cb045791afd3c4033956a65687ca0c1b1a6607ac84705bf4ed7d7151691980b
 DIST primer3_1.0.0.tar.gz 936696 RMD160 c08329cafcb8bf702a1654b4348a418b20e55c88 SHA1 0227f1f26c8b45dff9033543bee4387ade173c73 SHA256 fcbcf2e540e0062f3fa0d723b443b04a1c31e3e03e3aa5d97e3b2f910499f34b
 EBUILD primer3-1.0.0.ebuild 737 RMD160 1272a7c0f374709842089c42eb6259e1a5f5d8ae SHA1 02176df438d96fcf199a2ab10afa3e233ad224c5 SHA256 15d1a3be8db86847824d344970b9e9e41140537132198b829c5239f97176306e
-EBUILD primer3-1.1.4-r1.ebuild 953 RMD160 09421a5f0e3ad8abb7e96908bb68612afdd678a3 SHA1 50e636c82269a7f98f035ebc22a7b02ece6fbe45 SHA256 26ae7495eb971b1bac3d7692015e98414781f3eb874f774b54f9417614e98450
+EBUILD primer3-1.1.4-r2.ebuild 973 RMD160 1ad7270638ba327822f85e884d2d6ad1b5f45edd SHA1 0b6d49ca6506919e27d3706eee65d9a17cc1ff47 SHA256 0d256c50aaf34f381b82e4793220a3c846c1b95a74fd3133b2c8145499688e25
 EBUILD primer3-1.1.4.ebuild 784 RMD160 bac03e8b11917a1143deff34626dae8efdc0cd44 SHA1 5a1d7ff14dd1350960b570eb8d0f18946a570cf9 SHA256 dc43587ef1b94b22632f4307120b52fea1b3bad7d94bdc68ae083f1ffc8443fb
-MISC ChangeLog 3432 RMD160 616a3145a17d683e1b86203a3f87c3776411295c SHA1 f394e9c64ad5db273dd5424b97aeb8c9dd6c72c7 SHA256 7b6eaf33b7d95fc93f60bf8e56a8a717d5c2b5bee5b127953c8e321bac426825
+MISC ChangeLog 3691 RMD160 164ec0c589dabd8461457e193668cfccdd89031e SHA1 24659bd78bff5fad79105a5b2219d9ca41888ffa SHA256 8158bf7879fcda5678d76f2a532ade502ee8634e18f4e14b9a3904fdab08313f
 MISC metadata.xml 624 RMD160 b9c9f7ed6eb37504dbe39d7fd2c12ea7c0e2b557 SHA1 ecbd008512496eeefae63e1d36bdbe66e71e63fc SHA256 f612edc94f6538c9acf99caadc2a7d6e33cac6f933db9deafae777c7a45505bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkuUEkEACgkQgAnW8HDreRZLLACgyLbS9wpuX+5HABhr2Un/j0Js
-m04AniSZSwYOeX+CqhOq4fZBtmqWvdXg
-=hwxm
+iJwEAQECAAYFAkx88rIACgkQIiMqcbOVdxT/mAQAnMYihTADtLJp7uWJp+6zOj5B
+WuOhlpkBmP14A6n7fkadME7wXiVyMqwPBrZAnjlJAtwUGaFNt0ei1Db1eGd+fGx+
+ZkvVoM2Kpka1+wipvVQQw49K94CinjuYXhxTvgqnU+mCGTmUi3VaozvxCZGcPfW3
+c0JafOdAhozP4qvCNog=
+=cG6P
 -----END PGP SIGNATURE-----
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
 }