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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 42 insertions, 13 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/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
 }