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

[David Seifert]

commit:     f271f6acc55e7d323a78cc9527507834b8bcedea
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 03:30:46 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Nov  2 03:30:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f271f6ac

sci-biology/bamtools: Minor fixes

* Add 'virtual/pkgconfig' to DEPEND
* Delete bundled libs for safety

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sci-biology/bamtools/bamtools-2.4.2.ebuild | 10 +++++++++-
 sci-biology/bamtools/bamtools-9999.ebuild  | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sci-biology/bamtools/bamtools-2.4.2.ebuild 
b/sci-biology/bamtools/bamtools-2.4.2.ebuild
index e6daa826202..bd0157db0d1 100644
--- a/sci-biology/bamtools/bamtools-2.4.2.ebuild
+++ b/sci-biology/bamtools/bamtools-2.4.2.ebuild
@@ -22,6 +22,14 @@ SLOT="0/${PV}" # no stable ABI yet
 RDEPEND="
        >=dev-libs/jsoncpp-1.8.0:=
        sys-libs/zlib:="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
 
 mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
+
+src_prepare() {
+       # delete bundled libs, just to be safe
+       rm -r src/third_party/{gtest-1.6.0,jsoncpp} || die
+
+       cmake-utils_src_prepare
+}

diff --git a/sci-biology/bamtools/bamtools-9999.ebuild 
b/sci-biology/bamtools/bamtools-9999.ebuild
index e6daa826202..bd0157db0d1 100644
--- a/sci-biology/bamtools/bamtools-9999.ebuild
+++ b/sci-biology/bamtools/bamtools-9999.ebuild
@@ -22,6 +22,14 @@ SLOT="0/${PV}" # no stable ABI yet
 RDEPEND="
        >=dev-libs/jsoncpp-1.8.0:=
        sys-libs/zlib:="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
 
 mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
+
+src_prepare() {
+       # delete bundled libs, just to be safe
+       rm -r src/third_party/{gtest-1.6.0,jsoncpp} || die
+
+       cmake-utils_src_prepare
+}