summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-03-01 08:16:22 +0000
committerJustin Lecher <jlec@gentoo.org>2013-03-01 08:16:22 +0000
commitcc5bf7711a21b0f83b3e330bdd342b35b4754b63 (patch)
tree5d9023b39d97584fe96c91e15fa65fc8604abaf3 /sci-biology/bamtools
parentAdd arm lovin. (diff)
downloadhistorical-cc5bf7711a21b0f83b3e330bdd342b35b4754b63.tar.gz
historical-cc5bf7711a21b0f83b3e330bdd342b35b4754b63.tar.bz2
historical-cc5bf7711a21b0f83b3e330bdd342b35b4754b63.zip
sci-biology/bamtools: Update script and correct dep on jsoncpp
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x70EB7916
Diffstat (limited to 'sci-biology/bamtools')
-rw-r--r--sci-biology/bamtools/ChangeLog6
-rw-r--r--sci-biology/bamtools/Manifest12
-rw-r--r--sci-biology/bamtools/bamtools-2.2.3.ebuild4
-rw-r--r--sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch13
4 files changed, 13 insertions, 22 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/Manifest b/sci-biology/bamtools/Manifest
index 35bcd18a6d12..d7678deaf09b 100644
--- a/sci-biology/bamtools/Manifest
+++ b/sci-biology/bamtools/Manifest
@@ -1,17 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX bamtools-2.2.3-unbundle.patch 1520 SHA256 4af6f0273e5035720c90d01a89b8c27f0aadc461f3b60c930f59a770a4ed18e2 SHA512 a089ba6c54b1854cf050b152b84876c0e89888ba568abfe026fb4225df92521f594e3681e842b89167bf64e7fa845be4affb8f310f158781fb3880b14256452c WHIRLPOOL db80d8dc0c1937b05c71478e92d91a62bedb86958d55fde40014499bcfb2b602df649dc2c75a29e37e7fab5198d8a7568a447e38bcddd9c80587d2527aa080a7
+AUX bamtools-2.2.3-unbundle.patch 1154 SHA256 4ade9a27aae5f6dc7dc9fe6abfb6de15415225b0b4d75ffe7192e3c386f6ec4a SHA512 4cdbf362a0a5b98b983c9498f8ecc271af99c0ec26f429627a6b46790578df7c53aa3a606259fefb53ab1aaebb45759daa742dd1ebd050867d9c63c4837b3c2d WHIRLPOOL 4ff35916e778957cb557bcad98da060aad6666062a8f56545baa458db1ae9cd2d879b34786755980330ac3d87d3d61c6c51b14d2a5e5bb988ecfada99ee67a4d
DIST bamtools-1.0.2.tar.gz 207523 SHA256 d3ca75d2bec531f15dbc400a76afbe48d47452ce05552c88943bbce81a0862d8 SHA512 1934d40d50f3fdf2b1fcacb8b59cf954a3c791d3095649ac4f1246563e9d8d4afe385e42a2c6c383f0bb519eede401d12c71203d279b33e01575222f9f84c244 WHIRLPOOL 9fb4d4feb3ff867866a96533231a1b8284fd5156ab142cad727d32f8f3c157e246cca59185c3bdc253b19bde2514404a7107a62443780b060f6e8f270622c990
DIST bamtools-2.2.3.tar.gz 538074 SHA256 92ddef44801a1f8f01ce1a397f83e0f8b5e1ae8ad92c620f2dafaaf8d54cf178 SHA512 904823605875c160c4553ec34c307583c511a3e5469f06048d44196e1d3d35dab3f582360a914fcbb3ff214316dc49e68bf57f2bb40fb854fb37dfe329d308bc WHIRLPOOL 603e233f5f3d0b546844038716f0540dbb0541e84a25cb62fb706bdfa2b16fbe491526ea5b753be0ef93eb69bb8d8f56074b6904558ef7814e0e6e1698a0ebbf
EBUILD bamtools-1.0.2.ebuild 865 SHA256 28f29f02a2ae970cbe2929e71bb566eaa12c865d94429857fcb5dc2e30d6fbb5 SHA512 5654a0e2c9c6a88ea0894ad218caf57853685a5ceb32661c1ef25f8405f14aa87a26ca34cea88293c6ff1115f2269fdee1bf9a58ac7cfb9b38874557ddb3227f WHIRLPOOL 915c84863356b62503c4fae5d5d8475487cf34095ed92fdca391ab49326456065253b48ac182e5ec7a9eb69e16d284173c2caebd4b06b3c7a399bb89ff1ab831
-EBUILD bamtools-2.2.3.ebuild 756 SHA256 ab6c06e20b2a3788871a3c15c481980b045d59d23af1c7a4c3d84152b3369c69 SHA512 ed68428e17d2632aa9fff895068ee05ad1690af6daca32d00ebe7b49f7453883d5d1bbcd7616c7b2a7faa60400ab2e5fb936d2a7c4cb5796b834471133c03b8d WHIRLPOOL 8035f6c19a262e93b80999b0251b01f24bb8214f5423844983654e39a9620095b1f5737c7dcc449d13db6dfe2108e4c23f4a34c96b7d1d61c07543ac111ffd32
-MISC ChangeLog 1512 SHA256 80923258efb41bd5a0f5c9ed7eec74370bffdd4f6508966082cb47684a4864f2 SHA512 83b00b994175196da2ef64eefc17ef8cd380bb565244bc535286b4289f73a24e4dea8747aded3510302a77c9c3031e7d1841ecb8b02a69ceaec772d065a3076c WHIRLPOOL 1b722b96389c6a63b6f71dbc76a5470650dba0d3df70f2170e9a793d2a7697c19ccb6e57766092a7cc31abf6e11cc6b9a99a33f9e4cc864d2fa04a68ee6727be
+EBUILD bamtools-2.2.3.ebuild 754 SHA256 e0bba0c1728bf14927af6f29a718b67b995d1243bd6973db46e1b137317d4756 SHA512 bcce78fb0b57434dae1c1749f58ece906748e2e4ea3463d5895a1233f0ba7bf14def4fb7f7cb551288fd4dbc77a213b896fa2a13caa533ce5d21a9869ecac4a6 WHIRLPOOL d124a68431f5c66a3be884e39d8c6b6084af628797d51608ec89e59a291afaaf2c872dbb7df0bf71f277e28b9a3f1deebb47f46f113d63ab31d3ba640cb89eae
+MISC ChangeLog 1659 SHA256 8b145a44dfc14bf9089df3126d2399a817dd372091c1d645b715762ab3f6b7fb SHA512 2c2cb8d9199560118c851cd4d3cad496942c12b26399c1dc6a9624617bd0a178d9a23d3d3d7b18e0556d5c5a17b6f30ae8a436d89428dacc9ef5cc5bcf646035 WHIRLPOOL 6bc63fbe2d37f175c632f882e2683674aebeea10b1485acb57eff7301884598ae85cba35489077e9d89f7acc2c1c92fa1f4b7af0af3f0f2219f6d25afa75682e
MISC metadata.xml 663 SHA256 68b3e029b2b44a71be2e2c06197701a3f5c41e397885999bcb0a28446cd63048 SHA512 39cd07a89dffcd158dc059826c302b7558887a0a58b05f136ff2e0665d0b0f18b8d50ccd00bd87d428adf12289af0e24e3b52652aaf396068ad18747b1692a8c WHIRLPOOL 5bdf86bbf2351501e5daecec9f37c0cf52eb2f91a5f54481cb232f5cc41f951c1641209ae4c8f08d0a8ff3dee2a466a9d1fb6db7c1bcbebb3161a7ec75d7f0ea
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlEvt3oACgkQuUQtlDBCeQJCrACdGRAYF5dL1nPRqBjvik0F6nNE
-uAEAn1SsCfmNFy3HOQWzaVvIQQmvHj20
-=hJYp
+iEYEAREIAAYFAlEwY9YACgkQgAnW8HDreRYfuQCgiqIdKMg8ZKEMUNZp07ylhzDZ
+HB4AoKxE7CsWjwADTyUexYIlVxotcHn/
+=E152
-----END PGP SIGNATURE-----
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>