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

["Justin Lecher" <jlec@gentoo.org>]

commit:     9238b247f814c25d1c1e20916a701d9203bfe811
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  9 14:35:30 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Nov  9 14:35:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9238b247

sci-biology/bamtools: Drop tree version, merge changes into live version

Package-Manager: portage-2.2.0_alpha142

---
 sci-biology/bamtools/ChangeLog             |    6 ++++-
 sci-biology/bamtools/bamtools-1.0.2.ebuild |   32 ----------------------------
 sci-biology/bamtools/bamtools-9999.ebuild  |   23 +++++++------------
 3 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/sci-biology/bamtools/ChangeLog b/sci-biology/bamtools/ChangeLog
index 7204a88..6ff7212 100644
--- a/sci-biology/bamtools/ChangeLog
+++ b/sci-biology/bamtools/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-biology/bamtools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Nov 2012; Justin Lecher <jlec@gentoo.org> -bamtools-1.0.2.ebuild,
+  bamtools-9999.ebuild:
+  Drop tree version, merge changes into live version
+
 *bamtools-1.0.2 (10 Sep 2011)
 
   10 Sep 2011; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>

diff --git a/sci-biology/bamtools/bamtools-1.0.2.ebuild b/sci-biology/bamtools/bamtools-1.0.2.ebuild
deleted file mode 100644
index 5b6c56e..0000000
--- a/sci-biology/bamtools/bamtools-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION="BamTools provides a fast, flexible C++ API for reading and writing BAM files using modified JsonCPP."
-HOMEPAGE="https://github.com/pezmaster31/bamtools"
-SRC_URI="https://github.com/downloads/pezmaster31/bamtools/"${P}".tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dobin bin/bamtools || die
-	dolib lib/* || die
-	insinto /usr/include/bamtools/api || die
-	doins include/api/* || die
-	insinto /usr/include/bamtools/shared || die
-	doins include/shared/*
-	dodoc README || die
-}

diff --git a/sci-biology/bamtools/bamtools-9999.ebuild b/sci-biology/bamtools/bamtools-9999.ebuild
index ca2fbd2..b92abe0 100644
--- a/sci-biology/bamtools/bamtools-9999.ebuild
+++ b/sci-biology/bamtools/bamtools-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils git-2
 
-DESCRIPTION="BamTools provides a fast, flexible C++ API for reading and writing BAM files using modified JsonCPP."
+DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files"
 HOMEPAGE="https://github.com/pezmaster31/bamtools"
 EGIT_REPO_URI="https://github.com/pezmaster31/bamtools.git"
 
@@ -20,17 +20,12 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/src
 
-src_configure() {
-	cmake-utils_src_configure # this creates "${WORKDIR}"/bamtools-9999_build/ directory for build process
-	#sed -i -e 's/^CXX/#CXX/' Makefile || die "Failed to fix Makefile"
-}
-
 src_install() {
-	dobin bin/bamtools || die
-	dolib lib/* || die
-	insinto /usr/include/bamtools/api || die
-	doins include/api/* || die
-	insinto /usr/include/bamtools/shared || die
+	dobin bin/bamtools
+	dolib lib/*
+	insinto /usr/include/bamtools/api
+	doins include/api/*
+	insinto /usr/include/bamtools/shared
 	doins include/shared/*
-	dodoc README || die
+	dodoc README
 }