Fix gcc-4.4 issue, bug 294811. Thanks to Martin Mokrejš. Version bump.

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 18 insertions, 10 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/Manifest b/sci-biology/shrimp/Manifest
index a343455102eb..ccd0cad7bb8f 100644
--- a/sci-biology/shrimp/Manifest
+++ b/sci-biology/shrimp/Manifest
@@ -1,6 +1,6 @@
 DIST SHRiMP_1_2_1.src.tar.gz 102426 RMD160 59c241bfa0570b9dcf9222f6b8991ba1f88ac28a SHA1 6b54b5aa38f4d79cc3fd1fc97cd327f650f0d9ee SHA256 8fe55ca7cda3b90e8daa094fa3b4ee902271779fb5eb6a6d6f31bb4ad9a4db0a
-DIST SHRiMP_1_3_0.src.tar.gz 120128 RMD160 67bbcf4651a7c402bc771311b2136462319d216b SHA1 df503391706a6c1473962fff0f8fc237fe1d6f60 SHA256 7607891dbfb148f8dd809efa996a50eadea9169628635201fbaa8a5227d44860
-EBUILD shrimp-1.2.1.ebuild 777 RMD160 0110e4c17b74fe962d4159ed4b570af6bdb0c319 SHA1 6b63deee171c03c235adc757a52776c4253261df SHA256 a20bfe4ecd381bc2274192f74b78f9c4df2d1b60721f073945f323814fc63aac
-EBUILD shrimp-1.3.0.ebuild 779 RMD160 774507066c1da133c5807bfcbef005f3be6a43cb SHA1 10704f9211f3b615b5338292f00ffbbe914c02c0 SHA256 cf184f6bd1eea36edb132108464956efabcb5cb80d456bd4fd748bd0c50949fd
-MISC ChangeLog 916 RMD160 c781d93e8d8b3afc294450c2b1a1da036f4cac3f SHA1 4c9c535c28a910eaeb1b6909cc5ce6447e5a8181 SHA256 b1a07f2e3f31e24099249a3b16340a2c1073d6331a96f71da85fe6738a6056cc
+DIST SHRiMP_1_3_1.src.tar.gz 120929 RMD160 399455b93be51047958945c767a3bdd31dada88e SHA1 ce571eb23ce3172fd1303ffd71deee652e9d395e SHA256 a0847d1e05ca4c277d7be95f315b5f7d12fad0852324985660fe9ea1820487b9
+EBUILD shrimp-1.2.1.ebuild 839 RMD160 88ecf132a12ca3369417db49aebe3dab18b123f9 SHA1 c469ada9ad92df5fc7a8cb8c05c981bbb7e01f98 SHA256 4d6aabd86b1b726fcc0d1491fdc808fd6952656f7a6f770f9e2a059cdcc5809f
+EBUILD shrimp-1.3.1.ebuild 848 RMD160 5b733fa354fc224dcf38428454750d121d6c1bd1 SHA1 704365baf65bf6ff31b1f5afc02a4cc6922124ef SHA256 39044e77d448ebc6f4eb24f8a72e8e5669e2afcdda59f3541feaf093d48ab189
+MISC ChangeLog 1137 RMD160 9870da33ba1d9907b3098244782f18b374520b0b SHA1 f29b9ae226a53205ce9a3566ddf61d679dde6c60 SHA256 f1064617d0e1a0d253d1b1aaa4d324c7e845d382c308d204e585071239ca0d82
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
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
 }