From: David Seifert <soap@gentoo.org>
Date: Thu, 2 Nov 2017 03:30:46 +0000 (+0100)
Subject: sci-biology/bamtools: Minor fixes
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f271f6acc55e7d323a78cc9527507834b8bcedea;p=gentoo.git

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
---

diff --git a/sci-biology/bamtools/bamtools-2.4.2.ebuild b/sci-biology/bamtools/bamtools-2.4.2.ebuild
index e6daa8262028..bd0157db0d12 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 e6daa8262028..bd0157db0d12 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
+}