3 files changed, 56 insertions, 34 deletions
diff --git a/sci-biology/primer3/ChangeLog b/sci-biology/primer3/ChangeLog
index 5b9a2dab0ce0..13868f38f3a1 100644
--- a/sci-biology/primer3/ChangeLog
+++ b/sci-biology/primer3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/primer3
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.29 2011/12/03 10:58:16 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.30 2012/02/28 05:41:15 weaver Exp $
+
+*primer3-2.3.0 (28 Feb 2012)
+
+  28 Feb 2012; Andrey Kislyuk <weaver@gentoo.org> -primer3-1.1.4.ebuild,
+  +primer3-2.3.0.ebuild:
+  Version bump, remove old
 
   03 Dec 2011; Markos Chandras <hwoarang@gentoo.org> primer3-2.2.3.ebuild:
   convert test statement to if;fi block because || die does not work on a
diff --git a/sci-biology/primer3/primer3-1.1.4.ebuild b/sci-biology/primer3/primer3-1.1.4.ebuild
deleted file mode 100644
index 441d554cd21a..000000000000
--- a/sci-biology/primer3/primer3-1.1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 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.ebuild,v 1.3 2011/11/23 08:10:50 jlec Exp $
-
-DESCRIPTION="Primer Design for PCR reactions"
-HOMEPAGE="http://primer3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="whitehead"
-IUSE=""
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-S="${WORKDIR}/src"
-
-src_compile() {
-	emake -e || die
-}
-
-src_test () {
-	make 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."
-}
diff --git a/sci-biology/primer3/primer3-2.3.0.ebuild b/sci-biology/primer3/primer3-2.3.0.ebuild
new file mode 100644
index 000000000000..eb61728f235a
--- /dev/null
+++ b/sci-biology/primer3/primer3-2.3.0.ebuild
@@ -0,0 +1,48 @@
+# 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.0.ebuild,v 1.1 2012/02/28 05:41:15 weaver Exp $
+
+EAPI="3"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Primer Design for PCR reactions"
+HOMEPAGE="http://primer3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+src_prepare() {
+	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
+}
+
+src_compile() {
+	emake -C src || die
+}
+
+src_test () {
+	emake -C test || die
+}
+
+src_install () {
+	dobin src/{long_seq_tm_test,ntdpal,oligotm,primer3_core} || die \
+		"Could not install program."
+	dodoc src/release_notes.txt example primer3_manual.htm || die \
+		"Could not install documentation."
+	insinto /opt/primer3_config
+	doins -r src/primer3_config/* primer3*settings.txt || die
+}