sci-biology/prank: Fix compilation with gcc-4.7, #422581

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

5 files changed, 52 insertions, 21 deletions

diff --git a/sci-biology/prank/ChangeLog b/sci-biology/prank/ChangeLog
index fcbbc89f24ab..8e4ba15a89bd 100644
--- a/sci-biology/prank/ChangeLog
+++ b/sci-biology/prank/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/prank
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/ChangeLog,v 1.8 2012/02/28 05:37:06 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/ChangeLog,v 1.9 2012/06/20 21:12:38 jlec Exp $
+
+  20 Jun 2012; Justin Lecher <jlec@gentoo.org> prank-100701.ebuild,
+  prank-111130.ebuild, +files/prank-111130-gcc-4.7.patch:
+  Fix compilation with gcc-4.7, #422581
 
 *prank-111130 (28 Feb 2012)
 
diff --git a/sci-biology/prank/Manifest b/sci-biology/prank/Manifest
index a42940dd1af6..19954771cb83 100644
--- a/sci-biology/prank/Manifest
+++ b/sci-biology/prank/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX prank-111130-gcc-4.7.patch 351 RMD160 4acc8f0be73440ae5b01a9f12e5c8e12550f94f5 SHA1 2bf8f692ddc99f9df36bafae412de6791921ab4c SHA256 33f64995a02d937dd844149bff3df62af518304801ea85a1a9a70daa886088ca
 DIST prank.src.100701.tgz 115444 RMD160 f1c2b6bb321beb3c168fb8888dc6fe62d8e2e280 SHA1 796433bb4db1cc433153bad48d5be790c3824b8c SHA256 2ba63fc8f998a86e6fc688170b03f831eeb8d8deda95cbf0986e8a3a3b09ec79
 DIST prank.src.111130.tgz 133330 RMD160 2397a3e31a51bbaf27dd93fa391466aeabd42cbe SHA1 e87713c3435f9531a420ff26dc91182387dc1661 SHA256 61473a6b7b199f2d05e35a31adf813a2813decc9aa1429de118b62a51d7aac14
-EBUILD prank-100701.ebuild 745 RMD160 4f9491ac9c9b5594a5a3551e97ad76425abdbd82 SHA1 7e465a5ae58117bfe1672b2ab84b66c6dc91541d SHA256 36a72dd415884706be51f3f21ae41c6a95bd5a710d7070e269de4e1e0241931e
-EBUILD prank-111130.ebuild 774 RMD160 8f225b67b57bf1052a8e698e22ac3b7139f42a70 SHA1 afa654d871d613d75f9a1f6160b718767c0f0f3a SHA256 cbcffd809255f50d3dcad9e14769c808243c29c8b2db582313f02d1f37b3b088
-MISC ChangeLog 1377 RMD160 c3967af26921b9295e48ca5f9c189d8f7b3f149d SHA1 93e670d92c86d2375e7bbffbf469a1bff5fe9de1 SHA256 23894de72b3fc50fbcd30e632b2990f11d8adec66f1e4ccdf904c55df3927e73
+EBUILD prank-100701.ebuild 735 RMD160 a21144666b1d1c5ab9a9313ba749ae6aff3be982 SHA1 d54c2ad76ac5cb0deff69e6bb13359f3fe9e276a SHA256 81dd817ae4547fb0a70853bcfb5d38971c0e34c4b57ca5650254592dce0f6c6e
+EBUILD prank-111130.ebuild 886 RMD160 803233949fc81ab0720085feadc172d2d73a1893 SHA1 82b4bb55272497260fa25ebd1247f2d054fb1087 SHA256 77bf107fc51c705beca372e74f41e8b4d97a50e5853c57f4e8338df69d8d0aab
+MISC ChangeLog 1542 RMD160 b0715d94f6cc234086815fcc774b69d62a279481 SHA1 eaeb88f72a85f1eb7e058d45765bd90968cc69bc SHA256 0240df9b218997907c9774ae04732e3412c1089f9424c5bff3146d7e32397a7e
 MISC metadata.xml 338 RMD160 6ce6f8d7e974765f5fd539b2799007aca6c526dc SHA1 78a52aeb65ad483c87fd558d108db414155f6120 SHA256 165a8cd0d31cc057932587458c504471f2cf005f1d95a3de66245ad4c547cec2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk93T2IACgkQ/ejvha5XGaPsTACfSr/0jXZt6wSIPdf2Nw+HmevN
-LUEAoJrcgY8GaaB/Ug/KvCLYX1SmKXN9
-=bC5a
+iEYEAREKAAYFAk/iPMsACgkQgAnW8HDreRYMlQCfRgxOrpjs7jsoapx+4X6Y4UCZ
+4MMAoMrSN+7Gx/P3nq7dVQHGWKvkkHA4
+=YK30
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/prank/files/prank-111130-gcc-4.7.patch b/sci-biology/prank/files/prank-111130-gcc-4.7.patch
new file mode 100644
index 000000000000..d7defbcadfec
--- /dev/null
+++ b/sci-biology/prank/files/prank-111130-gcc-4.7.patch
@@ -0,0 +1,15 @@
+ src/check_version.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/check_version.cpp b/src/check_version.cpp
+index e968a05..6dfa062 100644
+--- a/src/check_version.cpp
++++ b/src/check_version.cpp
+@@ -8,6 +8,7 @@
+ #include <string>
+ #include <sstream>
+ #include <iostream>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
diff --git a/sci-biology/prank/prank-100701.ebuild b/sci-biology/prank/prank-100701.ebuild
index f8a32ec5de8f..096358fc9c0c 100644
--- a/sci-biology/prank/prank-100701.ebuild
+++ b/sci-biology/prank/prank-100701.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-100701.ebuild,v 1.2 2010/08/09 17:26:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-100701.ebuild,v 1.3 2012/06/20 21:12:38 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit toolchain-funcs
 
@@ -22,10 +22,13 @@ src_prepare() {
 }
 
 src_compile() {
-	emake LINK="$(tc-getCXX)" CFLAGS="${CFLAGS}" \
-		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" || die
+	emake \
+		LINK="$(tc-getCXX)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}"
 }
 
 src_install() {
-	dobin prank || die
+	dobin prank
 }
diff --git a/sci-biology/prank/prank-111130.ebuild b/sci-biology/prank/prank-111130.ebuild
index 1f97dbf0ad4b..3640e23a06dc 100644
--- a/sci-biology/prank/prank-111130.ebuild
+++ b/sci-biology/prank/prank-111130.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-111130.ebuild,v 1.1 2012/02/28 05:37:06 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-111130.ebuild,v 1.2 2012/06/20 21:12:38 jlec Exp $
 
 EAPI=4
 
-inherit toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Probabilistic Alignment Kit"
 HOMEPAGE="http://code.google.com/p/prank-msa/ http://www.ebi.ac.uk/goldman-srv/prank/prank/"
@@ -18,14 +18,21 @@ KEYWORDS="~amd64 ~x86"
 S="${WORKDIR}/prank-msa/src"
 
 src_prepare() {
-	sed -i -e "s/\$(LINK)/& \$(LDFLAGS)/" Makefile || die
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+	sed \
+		-e "s/\$(LINK)/& \$(LDFLAGS)/" \
+		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		-i Makefile || die
 }
 
 src_compile() {
-	emake LINK="$(tc-getCXX)" CFLAGS="${CFLAGS}" \
-		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" || die
+	emake \
+		LINK="$(tc-getCXX)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}"
 }
 
 src_install() {
-	dobin prank || die
+	dobin prank
 }