Version bump, drop old

(Portage version: 2.2_rc86/cvs/Linux x86_64)

3 files changed, 55 insertions, 37 deletions

diff --git a/sci-biology/shrimp/ChangeLog b/sci-biology/shrimp/ChangeLog
index 111c6530f1ef..7b1e8a197e32 100644
--- a/sci-biology/shrimp/ChangeLog
+++ b/sci-biology/shrimp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/shrimp
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/ChangeLog,v 1.11 2010/08/09 18:19:28 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/ChangeLog,v 1.12 2011/02/03 00:13:49 weaver Exp $
+
+*shrimp-2.1.0 (03 Feb 2011)
+
+  03 Feb 2011; Andrey Kislyuk <weaver@gentoo.org> -shrimp-1.2.1.ebuild,
+  +shrimp-2.1.0.ebuild:
+  Version bump, drop old
 
   09 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> shrimp-2.0.1.ebuild:
   Fix dependency on openmp.
diff --git a/sci-biology/shrimp/shrimp-1.2.1.ebuild b/sci-biology/shrimp/shrimp-1.2.1.ebuild
deleted file mode 100644
index 12291b1270e1..000000000000
--- a/sci-biology/shrimp/shrimp-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-1.2.1.ebuild,v 1.5 2009/12/09 18:52:14 weaver Exp $
-
-EAPI="2"
-
-MY_PV=${PV//./_}
-
-DESCRIPTION="SHort Read Mapping Package"
-HOMEPAGE="http://compbio.cs.toronto.edu/shrimp/"
-SRC_URI="http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_${MY_PV}.src.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/SHRiMP_${MY_PV}"
-
-src_prepare() {
-	sed -i -e '1 a #include <stdint.h>' common/dag_glue.cpp || die
-	sed -i -e '1 a CXXFLAGS+= -O3 -mmmx -msse -msse2' \
-		-e 's/-static//' "${S}/Makefile" || die
-}
-
-src_install() {
-	rm bin/README
-	dobin bin/* || die
-	insinto /usr/share/${PN}
-	doins -r utils || die
-	dodoc HISTORY README TODO
-}
diff --git a/sci-biology/shrimp/shrimp-2.1.0.ebuild b/sci-biology/shrimp/shrimp-2.1.0.ebuild
new file mode 100644
index 000000000000..b6e235263f49
--- /dev/null
+++ b/sci-biology/shrimp/shrimp-2.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.1.0.ebuild,v 1.1 2011/02/03 00:13:49 weaver Exp $
+
+EAPI="2"
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV=${PV//./_}
+
+DESCRIPTION="SHort Read Mapping Package"
+HOMEPAGE="http://compbio.cs.toronto.edu/shrimp/"
+SRC_URI="http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_${MY_PV}.src.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=sys-devel/gcc-4.3[openmp]"
+RDEPEND="${DEPEND}"  # -lgomp
+
+S=${WORKDIR}/SHRiMP_${MY_PV}
+
+pkg_setup() {
+	tc-has-openmp || die "At least gcc-4.3 is required for openmp support."
+}
+
+src_prepare() {
+	sed -i -e '1 a #include <stdint.h>' common/dag_glue.cpp || die #294811
+	# respect LDFLAGS wrt 331823
+	sed -i -e "s/LDFLAGS/LIBS/" -e "s/\$(LD)/& \$(LDFLAGS)/" \
+		-e 's/-static//' Makefile || die
+}
+
+src_compile() {
+	append-flags -fopenmp -O3 # per instructions in BUILDING
+	tc-export CXX
+	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin bin/* || die
+	insinto /usr/share/${PN}
+	doins -r utils || die
+	dodoc HISTORY README TODO SPLITTING_AND_MERGING || die
+}