sci-biology/primer3: Fix test

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 19 insertions, 15 deletions

diff --git a/sci-biology/primer3/ChangeLog b/sci-biology/primer3/ChangeLog
index ecdf98c67cab..8448af12eed4 100644
--- a/sci-biology/primer3/ChangeLog
+++ b/sci-biology/primer3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/primer3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.33 2012/12/12 12:27:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.34 2012/12/12 13:10:00 jlec Exp $
+
+  12 Dec 2012; Justin Lecher <jlec@gentoo.org> primer3-2.3.1.ebuild,
+  primer3-2.3.4.ebuild, metadata.xml:
+  Fix test
 
 *primer3-2.3.4 (12 Dec 2012)
 
diff --git a/sci-biology/primer3/metadata.xml b/sci-biology/primer3/metadata.xml
index ab4edb62b7b6..a72b3a5d05f6 100644
--- a/sci-biology/primer3/metadata.xml
+++ b/sci-biology/primer3/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
-	<longdescription>
+  <herd>sci-biology</herd>
+  <longdescription>
 		Primer3 picks primers for PCR reactions, considering: oligonucleotide
 		melting temperature, size, GC content, and primer-dimer possibilities;
 		PCR product size; positional constraints within the source sequence;
diff --git a/sci-biology/primer3/primer3-2.3.1.ebuild b/sci-biology/primer3/primer3-2.3.1.ebuild
index c42182fb1bbe..590d4105ac07 100644
--- a/sci-biology/primer3/primer3-2.3.1.ebuild
+++ b/sci-biology/primer3/primer3-2.3.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.3.1.ebuild,v 1.1 2012/07/19 12:21:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.3.1.ebuild,v 1.2 2012/12/12 13:10:00 jlec Exp $
 
 EAPI=4
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Primer Design for PCR reactions"
 HOMEPAGE="http://primer3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -19,15 +19,13 @@ DEPEND="dev-lang/perl"
 RDEPEND=""
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3.4-buildsystem.patch
+
 	if [[ ${CHOST} == *-darwin* ]]; then
 		sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile || die
 	fi
-	perl -i -ne 's/\$\(CPP\)/'$(tc-getCXX)'/; print unless /^(CC|CPP|CFLAGS|LDFLAGS)\s*=/' src/Makefile || die
-	sed \
-		-e '/oligotm/s:-o $@:$(LDFLAGS) -o $@:g' \
-		-e '/long_seq_tm_test/s:-o $@:$(LDFLAGS) -o $@:g' \
-		-e 's:CFLAGS:CXXFLAGS:g' \
-		-i src/Makefile || die
+
+	tc-export CC CXX AR RANLIB
 }
 
 src_compile() {
@@ -35,7 +33,8 @@ src_compile() {
 }
 
 src_test () {
-	emake -C test
+	emake -C test | tee "${T}"/test.log
+	grep -q "\[FAILED\]" && die "test failed. See "${T}"/test.log"
 }
 
 src_install () {
diff --git a/sci-biology/primer3/primer3-2.3.4.ebuild b/sci-biology/primer3/primer3-2.3.4.ebuild
index 86815c57eaee..628c567c378d 100644
--- a/sci-biology/primer3/primer3-2.3.4.ebuild
+++ b/sci-biology/primer3/primer3-2.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.3.4.ebuild,v 1.1 2012/12/12 12:27:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.3.4.ebuild,v 1.2 2012/12/12 13:10:00 jlec Exp $
 
 EAPI=4
 
@@ -33,7 +33,8 @@ src_compile() {
 }
 
 src_test () {
-	emake -C test
+	emake -C test | tee "${T}"/test.log
+	grep -q "\[FAILED\]" && die "test failed. See "${T}"/test.log"
 }
 
 src_install () {