Version bump. Fix R/DEPEND.

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

4 files changed, 46 insertions, 7 deletions

diff --git a/dev-perl/Bio-SamTools/Bio-SamTools-1.290.0.ebuild b/dev-perl/Bio-SamTools/Bio-SamTools-1.290.0.ebuild
index 92c8c76bd10f..9a9971717aeb 100644
--- a/dev-perl/Bio-SamTools/Bio-SamTools-1.290.0.ebuild
+++ b/dev-perl/Bio-SamTools/Bio-SamTools-1.290.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bio-SamTools/Bio-SamTools-1.290.0.ebuild,v 1.1 2011/09/01 13:02:36 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bio-SamTools/Bio-SamTools-1.290.0.ebuild,v 1.2 2011/09/25 11:52:27 tove Exp $
 
 EAPI=4
 
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sci-biology/bioperl
+RDEPEND="sci-biology/bioperl
 	sci-biology/samtools"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-CBuilder
 	virtual/perl-Module-Build
 "
diff --git a/dev-perl/Bio-SamTools/Bio-SamTools-1.300.0.ebuild b/dev-perl/Bio-SamTools/Bio-SamTools-1.300.0.ebuild
index 498469d5f999..208e36db3c0b 100644
--- a/dev-perl/Bio-SamTools/Bio-SamTools-1.300.0.ebuild
+++ b/dev-perl/Bio-SamTools/Bio-SamTools-1.300.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bio-SamTools/Bio-SamTools-1.300.0.ebuild,v 1.1 2011/09/05 18:07:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bio-SamTools/Bio-SamTools-1.300.0.ebuild,v 1.2 2011/09/25 11:52:27 tove Exp $
 
 EAPI=4
 
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sci-biology/bioperl
+RDEPEND="sci-biology/bioperl
 	sci-biology/samtools"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-CBuilder
 	virtual/perl-Module-Build
 "
diff --git a/dev-perl/Bio-SamTools/Bio-SamTools-1.310.0.ebuild b/dev-perl/Bio-SamTools/Bio-SamTools-1.310.0.ebuild
new file mode 100644
index 000000000000..4c38aafc4fab
--- /dev/null
+++ b/dev-perl/Bio-SamTools/Bio-SamTools-1.310.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bio-SamTools/Bio-SamTools-1.310.0.ebuild,v 1.1 2011/09/25 11:52:27 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=LDS
+MODULE_VERSION=1.31
+inherit perl-module
+
+DESCRIPTION="Read SAM/BAM database files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sci-biology/bioperl
+	>=sci-biology/samtools-0.1.16"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	virtual/perl-Module-Build
+"
+
+SRC_TEST=do
+
+src_prepare() {
+	sed -i -e 's|my $HeaderFile = "bam.h";|my $HeaderFile = "bam/bam.h";|' \
+		-e 's|my $LibFile    = "libbam.a";|my $LibFile    = "libbam.so";|' Build.PL || die
+	sed -i -e 's|#include "bam.h"|#include "bam/bam.h"|' \
+		-e 's|#include "khash.h"|#include "bam/khash.h"|' \
+		-e 's|#include "faidx.h"|#include "bam/faidx.h"|' lib/Bio/DB/Sam.xs || die
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Bio-SamTools/ChangeLog b/dev-perl/Bio-SamTools/ChangeLog
index 4eca3ee318ba..f63062ecd46d 100644
--- a/dev-perl/Bio-SamTools/ChangeLog
+++ b/dev-perl/Bio-SamTools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/Bio-SamTools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bio-SamTools/ChangeLog,v 1.4 2011/09/05 18:07:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Bio-SamTools/ChangeLog,v 1.5 2011/09/25 11:52:27 tove Exp $
+
+*Bio-SamTools-1.310.0 (25 Sep 2011)
+
+  25 Sep 2011; Torsten Veller <tove@gentoo.org> Bio-SamTools-1.290.0.ebuild,
+  Bio-SamTools-1.300.0.ebuild, +Bio-SamTools-1.310.0.ebuild:
+  Version bump. Fix R/DEPEND.
 
 *Bio-SamTools-1.300.0 (05 Sep 2011)