summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-03-01 08:16:21 +0000
committerJustin Lecher <jlec@gentoo.org>2013-03-01 08:16:21 +0000
commitcdc3cf02420f578ad1bdfc24abb275b79e1220da (patch)
tree84d03a8dd1b890188ac742edbdda0c47a0cff329 /sci-biology/bamtools
parentAdd arm lovin. (diff)
downloadgentoo-2-cdc3cf02420f578ad1bdfc24abb275b79e1220da.tar.gz
gentoo-2-cdc3cf02420f578ad1bdfc24abb275b79e1220da.tar.bz2
gentoo-2-cdc3cf02420f578ad1bdfc24abb275b79e1220da.zip
sci-biology/bamtools: Update script and correct dep on jsoncpp
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-biology/bamtools')
-rw-r--r--sci-biology/bamtools/ChangeLog6
-rw-r--r--sci-biology/bamtools/bamtools-2.2.3.ebuild4
-rw-r--r--sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch13
3 files changed, 7 insertions, 16 deletions
diff --git a/sci-biology/bamtools/ChangeLog b/sci-biology/bamtools/ChangeLog
index f82bf2197019..525add355e60 100644
--- a/sci-biology/bamtools/ChangeLog
+++ b/sci-biology/bamtools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/bamtools
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/bamtools/ChangeLog,v 1.5 2013/02/28 20:00:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/bamtools/ChangeLog,v 1.6 2013/03/01 08:16:21 jlec Exp $
+
+ 01 Mar 2013; Justin Lecher <jlec@gentoo.org> bamtools-2.2.3.ebuild,
+ files/bamtools-2.2.3-unbundle.patch:
+ Update script and correct dep on jsoncpp
28 Feb 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org> bamtools-2.2.3.ebuild:
Update jsoncpp dependency, bug #452234.
diff --git a/sci-biology/bamtools/bamtools-2.2.3.ebuild b/sci-biology/bamtools/bamtools-2.2.3.ebuild
index 22b225bc810d..5cb0fbf1211b 100644
--- a/sci-biology/bamtools/bamtools-2.2.3.ebuild
+++ b/sci-biology/bamtools/bamtools-2.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/bamtools/bamtools-2.2.3.ebuild,v 1.2 2013/02/28 20:00:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/bamtools/bamtools-2.2.3.ebuild,v 1.3 2013/03/01 08:16:21 jlec Exp $
EAPI=4
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="static-libs"
DEPEND="
- =dev-libs/jsoncpp-0.5.0
+ >=dev-libs/jsoncpp-0.5.0-r1
sys-libs/zlib"
RDEPEND="${DEPEND}"
diff --git a/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch b/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch
index 47d14b54c5a2..318396e75c36 100644
--- a/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch
+++ b/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch
@@ -30,16 +30,3 @@ index 66eb35f..65f4639 100644
# export API headers
include(../ExportHeader.cmake)
-diff --git a/src/toolkit/bamtools_filter.cpp b/src/toolkit/bamtools_filter.cpp
-index 1189981..cf70199 100644
---- a/src/toolkit/bamtools_filter.cpp
-+++ b/src/toolkit/bamtools_filter.cpp
-@@ -16,7 +16,7 @@
- #include <utils/bamtools_utilities.h>
- using namespace BamTools;
-
--#include <jsoncpp/json.h>
-+#include <json/json.h>
- using namespace Json;
-
- #include <cstdio>