Respect LDFLAGS, #335232

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 57 insertions, 22 deletions

diff --git a/sci-biology/clustalw-mpi/ChangeLog b/sci-biology/clustalw-mpi/ChangeLog
index 75b85ce08aea..0737af626ec5 100644
--- a/sci-biology/clustalw-mpi/ChangeLog
+++ b/sci-biology/clustalw-mpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/clustalw-mpi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalw-mpi/ChangeLog,v 1.6 2009/03/24 21:12:02 ribosome Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalw-mpi/ChangeLog,v 1.7 2011/06/19 10:00:09 jlec Exp $
+
+*clustalw-mpi-0.13-r1 (19 Jun 2011)
+
+  19 Jun 2011; Justin Lecher <jlec@gentoo.org> +files/0.13-gentoo.patch,
+  -clustalw-mpi-0.13.ebuild, +clustalw-mpi-0.13-r1.ebuild:
+  Respect LDFLAGS, #335232
 
   24 Mar 2009; Olivier Fisette <ribosome@gentoo.org> metadata.xml:
   Giving up maintainership of this package.
diff --git a/sci-biology/clustalw-mpi/Manifest b/sci-biology/clustalw-mpi/Manifest
index 7431d60b804b..e53781942032 100644
--- a/sci-biology/clustalw-mpi/Manifest
+++ b/sci-biology/clustalw-mpi/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.13-gentoo.patch 596 RMD160 06c99e27a2d3b413245658faeeae689e4f35082d SHA1 1058f8ff06a71de21c22cc63bf3635681155be01 SHA256 10eb9b964fd565833542075a470f70cb4b5624f436b661f442d6951bcf6ebc4a
 DIST clustalw-mpi-0.13.tar.gz 154911 RMD160 9da3e418efcb0cfd0c5df2705ee217b9dacc3917 SHA1 ae5026e8b4ba58bb0caa5643ea90434d9589df5a SHA256 2fcb0dc0001b034f2931153654fc66d67db360f0bf3fbcde19dc389bbe145845
-EBUILD clustalw-mpi-0.13.ebuild 1236 RMD160 f29c0539cda3118c01944cacdffad794fdfdd183 SHA1 011ddc955f19dc500d8b676c0722b7724b01f510 SHA256 369a3ba3109019a1d9ef22407164b3d3b2bd6312bc6e9ba478190844e407dcf4
-MISC ChangeLog 1032 RMD160 283378345847cb6858ad7f0b3b6f5b772f12c8b2 SHA1 39f85e7bfee472d78b83cc7e92e31e841e6f19a8 SHA256 67813be3025cb4ba75dff19f5c2e44a44869821e4b71444ba8ea16c1408b5c10
+EBUILD clustalw-mpi-0.13-r1.ebuild 1091 RMD160 6d1c363e6373802fb241d98c7278b8446224f6f8 SHA1 92254cb146c15b1675b345f092d6f0b106955e60 SHA256 4b4e9bcb681dbe5b207fa0ef112e85d375e482027dff6bd01b215c201fca67dc
+MISC ChangeLog 1225 RMD160 82a1e4538534c5a17b65198bb7d3878fb5a90335 SHA1 03d1cc81ddb643b4191a05f0af31b61982d6003f SHA256 f8b8e736c5c507e369ac2086f005afd8d8c370787e3660e273a60418ac13991e
 MISC metadata.xml 396 RMD160 7f4dc21e4db4988d477fc8b30fef897201ad8c94 SHA1 30911fd03b91d07b7317aa4afbee079bf072ced7 SHA256 d31fc1e97e2e4085172e3194515bf5bd2ae57287637165a0d7577e3cd2707992
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk39yK4ACgkQgAnW8HDreRa8CACeOjwP20nptdV3z7gQ+g2sKgaX
+IfsAoIqPKfL2nDwskMNsPQk/VQMh7BE7
+=7+E7
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/clustalw-mpi/clustalw-mpi-0.13.ebuild b/sci-biology/clustalw-mpi/clustalw-mpi-0.13-r1.ebuild
index 73fa8a59e2a0..0a24f2937278 100644
--- a/sci-biology/clustalw-mpi/clustalw-mpi-0.13.ebuild
+++ b/sci-biology/clustalw-mpi/clustalw-mpi-0.13-r1.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2006 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/clustalw-mpi/clustalw-mpi-0.13.ebuild,v 1.3 2006/11/02 02:59:50 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalw-mpi/clustalw-mpi-0.13-r1.ebuild,v 1.1 2011/06/19 10:00:09 jlec Exp $
 
-inherit toolchain-funcs
+EAPI=4
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A parallel (MPI) implemention of the Clustal-W general purpose multiple alignment algorithm"
-LICENSE="public-domain"
-HOMEPAGE="http://www.bii.a-star.edu.sg/achievements/applications/clustalw/index.asp"
+HOMEPAGE="http://www.bii.a-star.edu.sg/achievements/applications/clustalw/index.php"
 SRC_URI="http://web.bii.a-star.edu.sg/~kuobin/${PN}/${P}.tar.gz"
 
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="public-domain"
 IUSE="mpi_njtree static_pairalign"
-KEYWORDS="~x86"
 
 DEPEND="virtual/mpi"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "s/CFLAGS  = -c -O3/CFLAGS = -c ${CFLAGS}/" \
-		-e "s/LFLAGS	= -lm/LFLAGS = -lm ${CFLAGS}/" -i Makefile || \
-			die "Failed to apply CFLAGS."
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	if use mpi_njtree; then
 		sed -e "s/TREES_FLAG/#TREES_FLAG/" -i Makefile || \
 			die "Failed to configure MPI code for NJ trees."
@@ -31,11 +30,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
-	emake || die
-}
-
 src_install() {
-	dobin clustalw-mpi || die
-	newdoc README.${PN} README || die
+	dobin ${PN}
+	newdoc README.${PN} README
 }
diff --git a/sci-biology/clustalw-mpi/files/0.13-gentoo.patch b/sci-biology/clustalw-mpi/files/0.13-gentoo.patch
new file mode 100644
index 000000000000..6e36061cbb39
--- /dev/null
+++ b/sci-biology/clustalw-mpi/files/0.13-gentoo.patch
@@ -0,0 +1,23 @@
+ Makefile |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f2107ce..835232b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -25,12 +25,12 @@ TREES_FLAG = -DSERIAL_NJTREE
+ PAIRALIGN_FLAG = -DDYNAMIC_SCHEDULING_PAIRALIGN 
+ #PAIRALIGN_FLAG = -DSTATIC_SCHEDULING_PAIRALIGN
+ 
+-CFLAGS  = -c -O3
++CFLAGS  += -c
+ #CFLAGS  = -c -O3 -funroll-all-loops
+-LFLAGS	= -lm 
++LIBS	= -lm 
+ 
+ clustalw-mpi: $(OBJECTS) 
+-	$(CC) -o $@ $(OBJECTS) $(LFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
+ 
+ interface.o : interface.c $(HEADERS) param.h
+ 	$(CC) $(CFLAGS) $*.c