summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kislyuk <weaver@gentoo.org>2009-12-09 18:52:14 +0000
committerAndrey Kislyuk <weaver@gentoo.org>2009-12-09 18:52:14 +0000
commit49b14f41658654e651f28ec14a402bbe60b6102d (patch)
tree7a6e55255ceb843eea51125fd8b4604aef9be0b0 /sci-biology
parentsparc stable wrt #294573 (diff)
downloadgentoo-2-49b14f41658654e651f28ec14a402bbe60b6102d.tar.gz
gentoo-2-49b14f41658654e651f28ec14a402bbe60b6102d.tar.bz2
gentoo-2-49b14f41658654e651f28ec14a402bbe60b6102d.zip
Fix gcc-4.4 issue, bug 294811. Thanks to Martin Mokrejš. Version bump.
(Portage version: 2.2_rc30/cvs/Linux x86_64)
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/shrimp/ChangeLog8
-rw-r--r--sci-biology/shrimp/shrimp-1.2.1.ebuild5
-rw-r--r--sci-biology/shrimp/shrimp-1.3.1.ebuild (renamed from sci-biology/shrimp/shrimp-1.3.0.ebuild)7
3 files changed, 14 insertions, 6 deletions
diff --git a/sci-biology/shrimp/ChangeLog b/sci-biology/shrimp/ChangeLog
index a0cacc928d93..8215032d0c55 100644
--- a/sci-biology/shrimp/ChangeLog
+++ b/sci-biology/shrimp/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-biology/shrimp
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/ChangeLog,v 1.5 2009/10/29 01:47:54 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/ChangeLog,v 1.6 2009/12/09 18:52:14 weaver Exp $
+
+*shrimp-1.3.1 (09 Dec 2009)
+
+ 09 Dec 2009; Andrey Kislyuk <weaver@gentoo.org> shrimp-1.2.1.ebuild,
+ -shrimp-1.3.0.ebuild, +shrimp-1.3.1.ebuild:
+ Fix gcc-4.4 issue, bug 294811. Thanks to Martin Mokrejš. Version bump.
*shrimp-1.3.0 (28 Oct 2009)
diff --git a/sci-biology/shrimp/shrimp-1.2.1.ebuild b/sci-biology/shrimp/shrimp-1.2.1.ebuild
index c5bce7640991..12291b1270e1 100644
--- a/sci-biology/shrimp/shrimp-1.2.1.ebuild
+++ b/sci-biology/shrimp/shrimp-1.2.1.ebuild
@@ -1,6 +1,6 @@
# 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.4 2009/09/22 14:08:40 maekke Exp $
+# $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"
@@ -20,7 +20,8 @@ RDEPEND=""
S="${WORKDIR}/SHRiMP_${MY_PV}"
-src_configure() {
+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
}
diff --git a/sci-biology/shrimp/shrimp-1.3.0.ebuild b/sci-biology/shrimp/shrimp-1.3.1.ebuild
index c9e10ef40666..2577757ffa68 100644
--- a/sci-biology/shrimp/shrimp-1.3.0.ebuild
+++ b/sci-biology/shrimp/shrimp-1.3.1.ebuild
@@ -1,6 +1,6 @@
# 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.3.0.ebuild,v 1.1 2009/10/29 01:47:54 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-1.3.1.ebuild,v 1.1 2009/12/09 18:52:14 weaver Exp $
EAPI="2"
@@ -20,7 +20,8 @@ RDEPEND=""
S="${WORKDIR}/SHRiMP_${MY_PV}"
-src_configure() {
+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
}
@@ -30,5 +31,5 @@ src_install() {
dobin bin/* || die
insinto /usr/share/${PN}
doins -r utils || die
- dodoc HISTORY README TODO
+ dodoc HISTORY README TODO MEMORY
}