Fix building with GCC 4.4+ wrt #277246.

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

4 files changed, 48 insertions, 9 deletions

diff --git a/sci-biology/prank/ChangeLog b/sci-biology/prank/ChangeLog
index b013dd8dfe1d..78972dfda257 100644
--- a/sci-biology/prank/ChangeLog
+++ b/sci-biology/prank/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/prank
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/ChangeLog,v 1.1 2009/04/09 12:05:11 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/ChangeLog,v 1.2 2009/08/10 08:00:34 ssuominen Exp $
+
+  10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> prank-081202.ebuild,
+  +files/prank-081202-gcc44.patch:
+  Fix building with GCC 4.4+ wrt #277246.
 
 *prank-081202 (09 Apr 2009)
 
diff --git a/sci-biology/prank/Manifest b/sci-biology/prank/Manifest
index 15f1c9e97904..920a31a13150 100644
--- a/sci-biology/prank/Manifest
+++ b/sci-biology/prank/Manifest
@@ -1,4 +1,5 @@
+AUX prank-081202-gcc44.patch 1445 RMD160 6fc96d90cec6099b355ccac7af2ffb731e40ca10 SHA1 d93df76032d00d81e6faa4e70d7e402110c46504 SHA256 f0de65c36df7ce1fa2368053743c221bf5e431a6715493118a2564ee8f21c957
 DIST prank.src.081202.tgz 127430 RMD160 fa2710350c4e1fcc6f5093687bfd77ac7ac74f15 SHA1 cb3394a7fca63339138ba20d667a9d1ef3bb3071 SHA256 8ce5349b77c323bb230a7f4cb9de85a1c0e1bb3f46af81b9519ac5c34d441a78
-EBUILD prank-081202.ebuild 629 RMD160 ef16e351bd6aa8fd7a6ac3c498336126dd349f85 SHA1 3c9052a7b79030f142bb5e926770110a8c41882a SHA256 1f225eb2aed9bf0813ae75480bbc50881f2ce52c5f2bca86315b54ff39a59ba2
-MISC ChangeLog 362 RMD160 d9cc6e4865e28a353fb2aa141144e782b34e6008 SHA1 d4de9443450bf1dd24e6b2a7222c243281902b8f SHA256 318750846f3386c6e63817f270d5445258c34e96072069aa4ddf5a8be80cb585
+EBUILD prank-081202.ebuild 677 RMD160 10ed14418400612db53f8c3a6e72262b9b7e62da SHA1 a411c2a0885f11541df5175e640cd184b5711031 SHA256 f090cb49fb4e7d0aa144b0b1341269be2d72624fcd583f734783ad53a8d00c31
+MISC ChangeLog 518 RMD160 5601a7df9b3e37636b6fbd056f5843d3482fc812 SHA1 aa5d9eb44de88355771f7bd1aac9dbdddd223539 SHA256 b92e9810d481392bb4f9959609b37499d3dfc2d1e037209a0a08ca831ff9c38e
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
diff --git a/sci-biology/prank/files/prank-081202-gcc44.patch b/sci-biology/prank/files/prank-081202-gcc44.patch
new file mode 100644
index 000000000000..d3e25444bbaa
--- /dev/null
+++ b/sci-biology/prank/files/prank-081202-gcc44.patch
@@ -0,0 +1,35 @@
+diff -ur prank.orig/src/guidetree.cpp prank/src/guidetree.cpp
+--- prank.orig/src/guidetree.cpp	2008-11-28 17:06:39.000000000 +0200
++++ prank/src/guidetree.cpp	2009-08-10 10:58:57.000000000 +0300
+@@ -18,6 +18,8 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ 
++#include <stdio.h>
++
+ #include "guidetree.h"
+ #include "pwhirschberg.h"
+ #include "pwsite.h"
+diff -ur prank.orig/src/node.cpp prank/src/node.cpp
+--- prank.orig/src/node.cpp	2008-12-02 15:24:08.000000000 +0200
++++ prank/src/node.cpp	2009-08-10 11:00:53.000000000 +0300
+@@ -18,6 +18,7 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ 
++#include <cstdio>
+ #include <cstdlib>
+ #include <cmath>
+ #include <iostream>
+diff -ur prank.orig/src/terminalnode.cpp prank/src/terminalnode.cpp
+--- prank.orig/src/terminalnode.cpp	2008-09-04 16:13:51.000000000 +0300
++++ prank/src/terminalnode.cpp	2009-08-10 11:01:41.000000000 +0300
+@@ -17,6 +17,8 @@
+  *   Free Software Foundation, Inc.,                                       *
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
++
++#include <cstdio>
+ #include <cstdlib>
+ #include "terminalnode.h"
+ #include "config.h"
diff --git a/sci-biology/prank/prank-081202.ebuild b/sci-biology/prank/prank-081202.ebuild
index 229b4d07c866..39a871fb684c 100644
--- a/sci-biology/prank/prank-081202.ebuild
+++ b/sci-biology/prank/prank-081202.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-081202.ebuild,v 1.2 2009/04/09 12:06:16 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-081202.ebuild,v 1.3 2009/08/10 08:00:34 ssuominen Exp $
 
 EAPI=2
+inherit eutils
 
 DESCRIPTION="Probabilistic Alignment Kit"
 HOMEPAGE="http://www.ebi.ac.uk/goldman-srv/prank/prank/"
@@ -13,15 +14,13 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/src"
+S=${WORKDIR}/src
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 	perl -i -pe 's/(CC|CXX|CFLAGS|CXXFLAGS)\s*=/#/' "${S}/Makefile" || die
 }
 
 src_install() {
-	dobin prank || die
+	dobin prank || die "dobin failed"
 }