public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/bamtools/
Date: Sun, 13 Dec 2015 09:54:03 +0000 (UTC)	[thread overview]
Message-ID: <1449998352.8deb276adb49578cf19bce5ef8fe9394aa90db6f.jlec@gentoo> (raw)

commit:     8deb276adb49578cf19bce5ef8fe9394aa90db6f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 09:19:12 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 09:19:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8deb276a

sci-biology/bamtools: Unbundle dev-libs/jsoncpp

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=568090

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 ...tools-1.0.2.ebuild => bamtools-1.0.2-r1.ebuild} | 33 ++++++++++++++++------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/sci-biology/bamtools/bamtools-1.0.2.ebuild b/sci-biology/bamtools/bamtools-1.0.2-r1.ebuild
similarity index 53%
rename from sci-biology/bamtools/bamtools-1.0.2.ebuild
rename to sci-biology/bamtools/bamtools-1.0.2-r1.ebuild
index 08c40d0..dc1b60b 100644
--- a/sci-biology/bamtools/bamtools-1.0.2.ebuild
+++ b/sci-biology/bamtools/bamtools-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit cmake-utils
 
@@ -15,19 +15,34 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
+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 lib/*
-	insinto /usr/include/bamtools/api
-	doins include/api/*
-	insinto /usr/include/bamtools/shared
-	doins include/shared/*
+	dolib.so lib/*so*
+	use static-libs && dolib.a lib/*a
+	insinto /usr/include/bamtools
+	doins include/api include/shared
 	dodoc README
 }


             reply	other threads:[~2015-12-13  9:54 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-13  9:54 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-06-20 20:04 [gentoo-commits] repo/gentoo:master commit in: sci-biology/bamtools/ David Seifert
2021-06-20 20:04 David Seifert
2020-04-14  8:35 Joonas Niilola
2019-11-13 18:16 David Seifert
2018-12-13 14:08 David Seifert
2018-06-02 13:25 David Seifert
2017-12-23 18:45 David Seifert
2017-12-23 18:45 David Seifert
2017-12-23 18:45 David Seifert
2017-11-02  3:31 David Seifert
2017-11-02  3:19 David Seifert
2017-11-02  3:19 David Seifert
2015-08-16 11:30 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449998352.8deb276adb49578cf19bce5ef8fe9394aa90db6f.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox