Respect LDFLAGS wrt bug 331823. Thanks to Diego for report.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 35 insertions, 11 deletions

diff --git a/sci-biology/shrimp/ChangeLog b/sci-biology/shrimp/ChangeLog
index 992ca71461d1..8eecaa3b3883 100644
--- a/sci-biology/shrimp/ChangeLog
+++ b/sci-biology/shrimp/ChangeLog
@@ -1,6 +1,9 @@
 # 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.9 2010/07/25 18:01:15 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/ChangeLog,v 1.10 2010/08/09 17:56:29 xarthisius Exp $
+
+  09 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> shrimp-2.0.1.ebuild:
+  Respect LDFLAGS wrt bug 331823. Thanks to Diego for report.
 
 *shrimp-2.0.1 (25 Jul 2010)
 
diff --git a/sci-biology/shrimp/Manifest b/sci-biology/shrimp/Manifest
index 30c23d6909c2..1c801a6f74d6 100644
--- a/sci-biology/shrimp/Manifest
+++ b/sci-biology/shrimp/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST SHRiMP_1_2_1.src.tar.gz 102426 RMD160 59c241bfa0570b9dcf9222f6b8991ba1f88ac28a SHA1 6b54b5aa38f4d79cc3fd1fc97cd327f650f0d9ee SHA256 8fe55ca7cda3b90e8daa094fa3b4ee902271779fb5eb6a6d6f31bb4ad9a4db0a
 DIST SHRiMP_1_3_1.src.tar.gz 120929 RMD160 399455b93be51047958945c767a3bdd31dada88e SHA1 ce571eb23ce3172fd1303ffd71deee652e9d395e SHA256 a0847d1e05ca4c277d7be95f315b5f7d12fad0852324985660fe9ea1820487b9
 DIST SHRiMP_2_0_1.src.tar.gz 158535 RMD160 9153bb3b1cb8648a74df431537b38efa4267929a SHA1 b6b54a2990fc5193b72f2a08f47f95b527fabde3 SHA256 62557cf256421aea17a2b221ef485410be177cfc777a6bb8a3de89718d186f63
 EBUILD shrimp-1.2.1.ebuild 839 RMD160 88ecf132a12ca3369417db49aebe3dab18b123f9 SHA1 c469ada9ad92df5fc7a8cb8c05c981bbb7e01f98 SHA256 4d6aabd86b1b726fcc0d1491fdc808fd6952656f7a6f770f9e2a059cdcc5809f
 EBUILD shrimp-1.3.1.ebuild 845 RMD160 dbabe4f8787f2be0d9afeb5704d34815e2cb32a6 SHA1 cc36b8fbf230f6d460a162785c05beccf7a534b8 SHA256 148eee6a913bb3806918369c26c876b6d4bcd81b65de4ad65d49c95d738c305e
-EBUILD shrimp-2.0.1.ebuild 893 RMD160 2ef5071d8b9f288564f4bb545cc248b2b57f7e63 SHA1 01fdb9610c493071e6596d2db5475c066dcffefc SHA256 070c1a30f314af85e83a383742d902a65d1a79a8f0fce8b2f57858f441aec53a
-MISC ChangeLog 1451 RMD160 579e08f3ba45852064ac4211e06856341fabc3b8 SHA1 533b75c380f5bed2410b2256b863cf56d9327219 SHA256 7e3917a82e804699670a206a73a65d9e3fcedb88dab29f8626673aee61f1805c
+EBUILD shrimp-2.0.1.ebuild 1110 RMD160 02077ebdfb1c8fc1b5f3a3c40c5c2860ba807819 SHA1 bbe025dc55c0c0e4dcca28b26db2bbc0a32754eb SHA256 239745e99f6ae11d1445ea97a5d68a59797002fb014a9a7a6db1e6816d03254e
+MISC ChangeLog 1594 RMD160 f40f758f620d9b5b2a398f29ee56dff403807771 SHA1 63367d7de0d95bd66cb9614f80a29142f2456623 SHA256 5852bd24cdcd611190e2fd7e13ccbacbcf3b5f0fc1e7ce3fc00e0f0a6b2d45f8
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkxgQVYACgkQIiMqcbOVdxTz2AP7BoG5NyIRhJfpCJqgY5Q7uO5U
+0QxSEbgtFprzRXCDySDOaxEo4+zSFCmYEeFCOxlrwuaqVObRYZNuoGE+cg//dWqi
+ILhh9uafd75lyVWSo+D3LNwCM/LGSb/2Eg3JcvjrxhX9UtCPWr/gsWtbqa/lG7ty
+rabFX7eky4+obCPkG0s=
+=qOeU
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/shrimp/shrimp-2.0.1.ebuild b/sci-biology/shrimp/shrimp-2.0.1.ebuild
index a237b857823b..b682f4f95cc8 100644
--- a/sci-biology/shrimp/shrimp-2.0.1.ebuild
+++ b/sci-biology/shrimp/shrimp-2.0.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.0.1.ebuild,v 1.1 2010/07/25 18:01:15 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.0.1.ebuild,v 1.2 2010/08/09 17:56:29 xarthisius Exp $
 
 EAPI="2"
 
+inherit flag-o-matic toolchain-funcs
+
 MY_PV=${PV//./_}
 
 DESCRIPTION="SHort Read Mapping Package"
@@ -16,20 +18,27 @@ IUSE=""
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="sys-devel/gcc[openmp]"
-RDEPEND=""
+RDEPEND="${DEPEND}"  # -lgomp
 
-S="${WORKDIR}/SHRiMP_${MY_PV}"
+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 -fopenmp' \
-		-e 's/-static//' "${S}/Makefile" || die
+	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
+	tc-export CXX
+	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die
 }
 
 src_install() {
-	rm bin/README
+	rm bin/README || die
 	dobin bin/* || die
 	insinto /usr/share/${PN}
 	doins -r utils || die
-	dodoc HISTORY README TODO SPLITTING_AND_MERGING
+	dodoc HISTORY README TODO SPLITTING_AND_MERGING || die
 }