summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-10 08:00:35 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-10 08:00:35 +0000
commit4f416891c9e770357f1bed245444e63544d118d2 (patch)
treea95d5693d952966524dad55504074ff9f7da9c71 /sci-biology
parentFix building with GCC 4.4+ by removing -Werror wrt #260919. (diff)
downloadgentoo-2-4f416891c9e770357f1bed245444e63544d118d2.tar.gz
gentoo-2-4f416891c9e770357f1bed245444e63544d118d2.tar.bz2
gentoo-2-4f416891c9e770357f1bed245444e63544d118d2.zip
Fix building with GCC 4.4+ wrt #277246.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/prank/ChangeLog6
-rw-r--r--sci-biology/prank/files/prank-081202-gcc44.patch35
-rw-r--r--sci-biology/prank/prank-081202.ebuild11
3 files changed, 45 insertions, 7 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/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"
}