* [gentoo-commits] repo/gentoo:master commit in: sci-biology/bamtools/, sci-biology/bamtools/files/
@ 2015-12-13 14:05 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-12-13 14:05 UTC (permalink / raw
To: gentoo-commits
commit: 17bad73aea37d3a55e0cdff3e7e01117ea24773e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 12:25:33 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 14:05:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17bad73a
sci-biology/bamtools: Add missing die and drop old patch
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-biology/bamtools/bamtools-2.3.0.ebuild | 4 ++-
.../bamtools/files/bamtools-2.2.3-unbundle.patch | 32 ----------------------
2 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/sci-biology/bamtools/bamtools-2.3.0.ebuild b/sci-biology/bamtools/bamtools-2.3.0.ebuild
index 5b6468c..b2d7d62 100644
--- a/sci-biology/bamtools/bamtools-2.3.0.ebuild
+++ b/sci-biology/bamtools/bamtools-2.3.0.ebuild
@@ -25,5 +25,7 @@ PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
src_install() {
cmake-utils_src_install
- use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
+ if ! use static-libs; then
+ rm "${ED}"/usr/$(get_libdir)/*.a || die
+ fi
}
diff --git a/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch b/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch
deleted file mode 100644
index 318396e..0000000
--- a/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- src/CMakeLists.txt | 1 -
- src/api/CMakeLists.txt | 4 ++--
- src/toolkit/bamtools_filter.cpp | 2 +-
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e359695..2bd2185 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -6,7 +6,6 @@
- # ==========================
-
- add_subdirectory( api )
--add_subdirectory( third_party )
- add_subdirectory( toolkit )
- add_subdirectory( utils )
-
-diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
-index 66eb35f..65f4639 100644
---- a/src/api/CMakeLists.txt
-+++ b/src/api/CMakeLists.txt
-@@ -54,8 +54,8 @@ target_link_libraries( BamTools ${APILibs} )
- target_link_libraries( BamTools-static ${APILibs} )
-
- # set library install destinations
--install( TARGETS BamTools LIBRARY DESTINATION "lib/bamtools" RUNTIME DESTINATION "bin")
--install( TARGETS BamTools-static ARCHIVE DESTINATION "lib/bamtools")
-+install( TARGETS BamTools LIBRARY DESTINATION "lib${LIB_SUFFIX}" RUNTIME DESTINATION "bin")
-+install( TARGETS BamTools-static ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-
- # export API headers
- include(../ExportHeader.cmake)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-biology/bamtools/, sci-biology/bamtools/files/
@ 2016-12-15 8:02 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2016-12-15 8:02 UTC (permalink / raw
To: gentoo-commits
commit: d7a2a3ae8f4c468241ac6597f1bea2273b154a53
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 22:50:25 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 08:02:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a2a3ae
sci-biology/bamtools: Remove old
Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3120
sci-biology/bamtools/Manifest | 2 -
sci-biology/bamtools/bamtools-1.0.2-r1.ebuild | 48 ----------------------
sci-biology/bamtools/bamtools-2.3.0.ebuild | 31 --------------
.../bamtools/files/bamtools-2.3.0-unbundle.patch | 23 -----------
4 files changed, 104 deletions(-)
diff --git a/sci-biology/bamtools/Manifest b/sci-biology/bamtools/Manifest
index fa04b1b..f276fed 100644
--- a/sci-biology/bamtools/Manifest
+++ b/sci-biology/bamtools/Manifest
@@ -1,3 +1 @@
-DIST bamtools-1.0.2.tar.gz 207523 SHA256 d3ca75d2bec531f15dbc400a76afbe48d47452ce05552c88943bbce81a0862d8 SHA512 1934d40d50f3fdf2b1fcacb8b59cf954a3c791d3095649ac4f1246563e9d8d4afe385e42a2c6c383f0bb519eede401d12c71203d279b33e01575222f9f84c244 WHIRLPOOL 9fb4d4feb3ff867866a96533231a1b8284fd5156ab142cad727d32f8f3c157e246cca59185c3bdc253b19bde2514404a7107a62443780b060f6e8f270622c990
-DIST bamtools-2.3.0.tar.gz 539446 SHA256 288046e6d5d41afdc5fce8608c5641cf2b8e670644587c1315b90bbe92f039af SHA512 432f66384cffc04ab6bc7dc66d8f7b79c1e468d0068db4cabb5cac05f9b6bef7968eff71ffb3ee51b84e23d9bb66a11ef267024138f40116c25e7f18e7210a5c WHIRLPOOL dd888f67c3d0b0ce2f5f2875e242e5df0d54cefd13693230b5f10eb57dd780304b601027cf65f6598a54061a7166903bf06c6c9a46939f6ce6bbb246cab89993
DIST bamtools-2.4.1.tar.gz 540482 SHA256 933a0c1a83c88c1dac8078c0c0e82f6794c75cb927265399404bc2cc2611204b SHA512 ee674014f27b2dc0aa7c0415e8654ee7c39cfdecafbd9983d970fad6ad29f070a7ff372ee05765956cf7c8f8bb3b9763b6e537e693a0d2d64680148b1a23cfee WHIRLPOOL 6ef73f0713ebf993123eac7095061e32fe6a53db383e28a5dd8967afee92fb211ce56611de9718ce4cce84bdee14157ff968e0a6edcaead4e06b44008b78b84c
diff --git a/sci-biology/bamtools/bamtools-1.0.2-r1.ebuild b/sci-biology/bamtools/bamtools-1.0.2-r1.ebuild
deleted file mode 100644
index dc1b60b..00000000
--- a/sci-biology/bamtools/bamtools-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files"
-HOMEPAGE="https://github.com/pezmaster31/bamtools"
-SRC_URI="mirror://github/pezmaster31/bamtools/"${P}".tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/jsoncpp
- sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- sed \
- -e '/third_party/d' \
- -i src/CMakeLists.txt || die
- rm -r src/third_party || die
-
- sed \
- -e 's:json.h:json/json.h:g' \
- -i src/toolkit/bamtools_filter.cpp || die
-
- cmake-utils_src_prepare
-}
-
-src_install() {
- local i
- for i in bin/bamtools-${PV} lib/libbamtools.so.${PV} lib/libbamtools-utils.so.${PV}; do
- TMPDIR="$(pwd)" scanelf -Xr $i || die
- done
-
- dobin bin/bamtools
- dolib.so lib/*so*
- use static-libs && dolib.a lib/*a
- insinto /usr/include/bamtools
- doins include/api include/shared
- dodoc README
-}
diff --git a/sci-biology/bamtools/bamtools-2.3.0.ebuild b/sci-biology/bamtools/bamtools-2.3.0.ebuild
deleted file mode 100644
index b2d7d62..00000000
--- a/sci-biology/bamtools/bamtools-2.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files"
-HOMEPAGE="https://github.com/pezmaster31/bamtools"
-SRC_URI="https://github.com/pezmaster31/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
- >=dev-libs/jsoncpp-0.5.0-r1
- <dev-libs/jsoncpp-1
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
-
-src_install() {
- cmake-utils_src_install
- if ! use static-libs; then
- rm "${ED}"/usr/$(get_libdir)/*.a || die
- fi
-}
diff --git a/sci-biology/bamtools/files/bamtools-2.3.0-unbundle.patch b/sci-biology/bamtools/files/bamtools-2.3.0-unbundle.patch
deleted file mode 100644
index c07c59d..00000000
--- a/sci-biology/bamtools/files/bamtools-2.3.0-unbundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- bamtools-2.3.0/src/api/CMakeLists.txt.ori 2013-08-27 18:00:43.000000000 +0200
-+++ bamtools-2.3.0/src/api/CMakeLists.txt 2013-08-27 18:00:47.000000000 +0200
-@@ -54,8 +54,8 @@
- target_link_libraries( BamTools-static ${APILibs} )
-
- # set library install destinations
--install( TARGETS BamTools LIBRARY DESTINATION "lib/bamtools" RUNTIME DESTINATION "bin")
--install( TARGETS BamTools-static ARCHIVE DESTINATION "lib/bamtools")
-+install( TARGETS BamTools LIBRARY DESTINATION "lib${LIB_SUFFIX}" RUNTIME DESTINATION "bin")
-+install( TARGETS BamTools-static ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-
- # export API headers
- include(../ExportHeader.cmake)
---- bamtools-2.3.0/src/CMakeLists.txt.ori 2013-08-27 18:03:10.000000000 +0200
-+++ bamtools-2.3.0/src/CMakeLists.txt 2013-08-27 18:03:23.000000000 +0200
-@@ -6,7 +6,6 @@
- # ==========================
-
- add_subdirectory( api )
--add_subdirectory( third_party )
- add_subdirectory( toolkit )
- add_subdirectory( utils )
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-15 8:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-13 14:05 [gentoo-commits] repo/gentoo:master commit in: sci-biology/bamtools/, sci-biology/bamtools/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2016-12-15 8:02 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox