From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BEA0A1384B4 for ; Sun, 13 Dec 2015 09:54:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F231C21C030; Sun, 13 Dec 2015 09:54:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D8C421C02C for ; Sun, 13 Dec 2015 09:54:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBB14340771 for ; Sun, 13 Dec 2015 09:54:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 610759A1 for ; Sun, 13 Dec 2015 09:54:03 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1449998352.8deb276adb49578cf19bce5ef8fe9394aa90db6f.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/bamtools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/bamtools/bamtools-1.0.2-r1.ebuild sci-biology/bamtools/bamtools-1.0.2.ebuild X-VCS-Directories: sci-biology/bamtools/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8deb276adb49578cf19bce5ef8fe9394aa90db6f X-VCS-Branch: master Date: Sun, 13 Dec 2015 09:54:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0b6ba319-63ea-441c-b569-9a77781d6264 X-Archives-Hash: 77fa4a6c70673c471e12ebf5b6ef8c55 commit: 8deb276adb49578cf19bce5ef8fe9394aa90db6f Author: Justin Lecher gentoo org> AuthorDate: Sun Dec 13 09:19:12 2015 +0000 Commit: Justin Lecher gentoo 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 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 }