[gentoo-commits] repo/gentoo:master commit in: sci-biology/bamtools/, sci-biology/bamtools/files/

[Justin Lecher]

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)