summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2016-02-08 22:31:10 +0100
committerDavid Seifert <soap@gentoo.org>2016-02-08 22:31:27 +0100
commit7debc3735baec3b152ad93cf7b436ed64002705f (patch)
tree77568a19e78a501ff8ca8880aa7bc16bfadbd79d /sci-biology/mira
parentMerge remote-tracking branch 'github/pr/817'. (diff)
downloadgentoo-7debc3735baec3b152ad93cf7b436ed64002705f.tar.gz
gentoo-7debc3735baec3b152ad93cf7b436ed64002705f.tar.bz2
gentoo-7debc3735baec3b152ad93cf7b436ed64002705f.zip
sci-biology/mira: Add missing <sys-devel/flex-2.6.0 dependency
Gentoo-Bug: 574172 * Fix GCC5 explicit conversion of 'nullptr' to 'bool' * Fix overlong DESCRIPTION Package-Manager: portage-2.2.27
Diffstat (limited to 'sci-biology/mira')
-rw-r--r--sci-biology/mira/files/mira-4.0.2-cout.patch11
-rw-r--r--sci-biology/mira/mira-4.0.2.ebuild5
2 files changed, 14 insertions, 2 deletions
diff --git a/sci-biology/mira/files/mira-4.0.2-cout.patch b/sci-biology/mira/files/mira-4.0.2-cout.patch
index 14feb0284c9f..78e7168cb49d 100644
--- a/sci-biology/mira/files/mira-4.0.2-cout.patch
+++ b/sci-biology/mira/files/mira-4.0.2-cout.patch
@@ -14,3 +14,14 @@ index 47e5ee8..060b6f3 100644
// make the "tcmalloc: large alloc" messages from TCMallom disappear
// by setting the reporting environment variable to a very large value
// see: http://groups.google.com/group/google-perftools/browse_thread/thread/24a003fc35f3d470?pli=1
+--- a/src/mira/parameters.C
++++ b/src/mira/parameters.C
+@@ -2222,7 +2222,7 @@
+ MIRANOTIFY(Notify::FATAL, "File not found: " << pfile);
+ }
+
+- parse(fin, Pv, nullptr);
++ parse(fin, Pv, false);
+
+ fin.close();
+
diff --git a/sci-biology/mira/mira-4.0.2.ebuild b/sci-biology/mira/mira-4.0.2.ebuild
index b89246b2304b..9b04aac4a3a6 100644
--- a/sci-biology/mira/mira-4.0.2.ebuild
+++ b/sci-biology/mira/mira-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,7 +9,7 @@ MY_PV="${PV/_}" # convert from mira-4.0_rc2 (Gentoo ebuild filename derived) to
inherit autotools eutils multilib
-DESCRIPTION="Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Solexa / Illumina"
+DESCRIPTION="Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Illumina"
HOMEPAGE="http://www.chevreux.org/projects_mira.html"
SRC_URI="
http://sourceforge.net/projects/mira-assembler/files/MIRA/stable/"${PN}"-"${MY_PV}".tar.bz2
@@ -28,6 +28,7 @@ CDEPEND="
dev-libs/boost[threads]
dev-util/google-perftools"
DEPEND="${CDEPEND}
+ <sys-devel/flex-2.6.0
app-editors/vim-core
dev-libs/expat"
RDEPEND="${CDEPEND}"