Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/bamtools/files/, sci-biology/bamtools/
Date: Sun, 13 Dec 2015 12:28:40
Message-Id: 1450009707.fb6f77ba92df2b60eb7132ffa0434cfad52875e7.jlec@gentoo
1 commit: fb6f77ba92df2b60eb7132ffa0434cfad52875e7
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 13 12:28:27 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 13 12:28:27 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fb6f77ba
7
8 sci-biology/bamtools: Unbundle jsoncpp
9
10 Package-Manager: portage-2.2.26
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 sci-biology/bamtools/bamtools-9999.ebuild | 23 ++++++++++++----------
14 .../bamtools/files/bamtools-9999-unbundle.patch | 23 ++++++++++++++++++++++
15 2 files changed, 36 insertions(+), 10 deletions(-)
16
17 diff --git a/sci-biology/bamtools/bamtools-9999.ebuild b/sci-biology/bamtools/bamtools-9999.ebuild
18 index 25a6001..f69a02c 100644
19 --- a/sci-biology/bamtools/bamtools-9999.ebuild
20 +++ b/sci-biology/bamtools/bamtools-9999.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2014 Gentoo Foundation
23 +# Copyright 1999-2015 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 # $Id$
26
27 @@ -14,16 +14,19 @@ EGIT_REPO_URI="https://github.com/pezmaster31/bamtools.git"
28 LICENSE="MIT"
29 SLOT="0"
30 KEYWORDS=""
31 -IUSE=""
32 +IUSE="static-libs"
33
34 -S="${WORKDIR}"/src
35 +DEPEND="
36 + >=dev-libs/jsoncpp-0.5.0-r1
37 + <dev-libs/jsoncpp-1
38 + sys-libs/zlib"
39 +RDEPEND="${DEPEND}"
40 +
41 +PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
42
43 src_install() {
44 - dobin bin/bamtools
45 - dolib lib/*
46 - insinto /usr/include/bamtools/api
47 - doins include/api/*
48 - insinto /usr/include/bamtools/shared
49 - doins include/shared/*
50 - dodoc README
51 + cmake-utils_src_install
52 + if ! use static-libs; then
53 + rm "${ED}"/usr/$(get_libdir)/*.a || die
54 + fi
55 }
56
57 diff --git a/sci-biology/bamtools/files/bamtools-9999-unbundle.patch b/sci-biology/bamtools/files/bamtools-9999-unbundle.patch
58 new file mode 100644
59 index 0000000..c07c59d
60 --- /dev/null
61 +++ b/sci-biology/bamtools/files/bamtools-9999-unbundle.patch
62 @@ -0,0 +1,23 @@
63 +--- bamtools-2.3.0/src/api/CMakeLists.txt.ori 2013-08-27 18:00:43.000000000 +0200
64 ++++ bamtools-2.3.0/src/api/CMakeLists.txt 2013-08-27 18:00:47.000000000 +0200
65 +@@ -54,8 +54,8 @@
66 + target_link_libraries( BamTools-static ${APILibs} )
67 +
68 + # set library install destinations
69 +-install( TARGETS BamTools LIBRARY DESTINATION "lib/bamtools" RUNTIME DESTINATION "bin")
70 +-install( TARGETS BamTools-static ARCHIVE DESTINATION "lib/bamtools")
71 ++install( TARGETS BamTools LIBRARY DESTINATION "lib${LIB_SUFFIX}" RUNTIME DESTINATION "bin")
72 ++install( TARGETS BamTools-static ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
73 +
74 + # export API headers
75 + include(../ExportHeader.cmake)
76 +--- bamtools-2.3.0/src/CMakeLists.txt.ori 2013-08-27 18:03:10.000000000 +0200
77 ++++ bamtools-2.3.0/src/CMakeLists.txt 2013-08-27 18:03:23.000000000 +0200
78 +@@ -6,7 +6,6 @@
79 + # ==========================
80 +
81 + add_subdirectory( api )
82 +-add_subdirectory( third_party )
83 + add_subdirectory( toolkit )
84 + add_subdirectory( utils )
85 +