5 files changed, 29 insertions, 53 deletions
diff --git a/sci-biology/primer3/ChangeLog b/sci-biology/primer3/ChangeLog
index 728ed0631d51..58d276b0cbfc 100644
--- a/sci-biology/primer3/ChangeLog
+++ b/sci-biology/primer3/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2011/03/09 11:25:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.26 2011/11/23 08:10:50 jlec Exp $
+
+  23 Nov 2011; Justin Lecher <jlec@gentoo.org> -primer3-1.0.0.ebuild,
+  primer3-1.1.4.ebuild, primer3-1.1.4-r2.ebuild, primer3-2.2.3.ebuild:
+  Dropped old, respect LDFLAGS, don't mix CFLAGS and CXXFLAGS, move KEYWORDS
+  and fixes from ver-1 to 2
 
   09 Mar 2011; Justin Lecher <jlec@gentoo.org> +primer3-1.0.0.ebuild:
   Reanimate last stable version for ppc/ppc64
diff --git a/sci-biology/primer3/primer3-1.0.0.ebuild b/sci-biology/primer3/primer3-1.0.0.ebuild
deleted file mode 100644
index 1d88849c9358..000000000000
--- a/sci-biology/primer3/primer3-1.0.0.ebuild
+++ /dev/null
@@ -1,36 +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.0.0.ebuild,v 1.16 2011/03/09 11:25:06 jlec Exp $
-
-DESCRIPTION="Design primers for PCR reactions."
-HOMEPAGE="http://primer3.sourceforge.net/"
-SRC_URI="http://frodo.wi.mit.edu/${PN}/${PN}_${PV}.tar.gz"
-LICENSE="whitehead"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="dev-lang/perl"
-
-S=${WORKDIR}/${PN}_${PV}/src
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	emake -e || die
-}
-
-src_test () {
-	cd ../test
-	perl primer_test.pl primer3_core || die
-}
-
-src_install () {
-	dobin primer3_core
-	dodoc release_notes ../README ../example
-}
diff --git a/sci-biology/primer3/primer3-1.1.4-r2.ebuild b/sci-biology/primer3/primer3-1.1.4-r2.ebuild
index b12de1503ef0..0076c5ed19fb 100644
--- a/sci-biology/primer3/primer3-1.1.4-r2.ebuild
+++ b/sci-biology/primer3/primer3-1.1.4-r2.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-r2.ebuild,v 1.1 2010/08/31 12:16:41 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-1.1.4-r2.ebuild,v 1.2 2011/11/23 08:10:50 jlec Exp $
 
 EAPI="3"
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Design primers for PCR reactions."
+DESCRIPTION="Primer Design for PCR reactions"
 HOMEPAGE="http://primer3.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="whitehead"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+LICENSE="whitehead"
 IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 DEPEND="dev-lang/perl"
 RDEPEND=""
@@ -21,6 +21,7 @@ RDEPEND=""
 S=${WORKDIR}/src
 
 src_prepare() {
+
 	[[ ${CHOST} == *-darwin* ]] && \
 		sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile
 	epatch "${FILESDIR}"/${P}-ldflags.patch
diff --git a/sci-biology/primer3/primer3-1.1.4.ebuild b/sci-biology/primer3/primer3-1.1.4.ebuild
index 437c3dcf75f8..441d554cd21a 100644
--- a/sci-biology/primer3/primer3-1.1.4.ebuild
+++ b/sci-biology/primer3/primer3-1.1.4.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.2 2009/09/01 16:07:03 ribosome Exp $
+# $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="Design primers for PCR reactions."
+DESCRIPTION="Primer Design for PCR reactions"
 HOMEPAGE="http://primer3.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="whitehead"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+LICENSE="whitehead"
 IUSE=""
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-lang/perl"
-
 RDEPEND=""
 
 S="${WORKDIR}/src"
diff --git a/sci-biology/primer3/primer3-2.2.3.ebuild b/sci-biology/primer3/primer3-2.2.3.ebuild
index dd74e89a4c60..3f10d84c1dde 100644
--- a/sci-biology/primer3/primer3-2.2.3.ebuild
+++ b/sci-biology/primer3/primer3-2.2.3.ebuild
@@ -1,25 +1,32 @@
 # 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-2.2.3.ebuild,v 1.1 2011/02/03 17:08:52 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.2.3.ebuild,v 1.2 2011/11/23 08:10:50 jlec Exp $
 
 EAPI="3"
 
 inherit toolchain-funcs
 
-DESCRIPTION="Design primers for PCR reactions."
+DESCRIPTION="Primer Design for PCR reactions"
 HOMEPAGE="http://primer3.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2"
 IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
-DEPEND=""
+DEPEND="dev-lang/perl"
 RDEPEND=""
 
 src_prepare() {
+	[[ ${CHOST} == *-darwin* ]] && \
+		sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile
 	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() {