Version bump. Fix R/DEPEND.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

5 files changed, 61 insertions, 10 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)
 
diff --git a/dev-perl/Bio-SamTools/Manifest b/dev-perl/Bio-SamTools/Manifest
index c8859ae02d73..4b6fd640e778 100644
--- a/dev-perl/Bio-SamTools/Manifest
+++ b/dev-perl/Bio-SamTools/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST Bio-SamTools-1.29.tar.gz 331127 RMD160 e86b51bdd7ffdfd42076da11b19ab4cbb3a9a93a SHA1 2925e95fc77d70d1bd5dedb3e1f4d7f00b8facd6 SHA256 9f9a6ea320b581a4bc4f61372f17310d063b3c1a534fd2f756e967c44b0f4c06
 DIST Bio-SamTools-1.30.tar.gz 331213 RMD160 e12d66b1da47027e116061efa5d9089f9e0ef1f3 SHA1 64d2cb261a910b9de50798daa4f83dbb92d1c38c SHA256 3d2883837425391b84fb0ff1b91391b0422ddf0380498983a6602e12a9e8ad34
-EBUILD Bio-SamTools-1.290.0.ebuild 915 RMD160 ab319686960bccc17b4a518307cceac5f30d376a SHA1 6149e10afbccd91b07949da36c0974aa3902b60e SHA256 c7bfa8eb7b38ae804f826f772311ab39e5ca86e19f88425a091a9aaf2490343e
-EBUILD Bio-SamTools-1.300.0.ebuild 918 RMD160 b6488d64040d58d099ef11b44662669aa5a8390e SHA1 3bdff7ac6a8019af9751f4a984c3b7f8193b90c5 SHA256 44dfbb6444a5c8ccb3a57a48b9f70ee5f84b50ac234f5f4b51e4a0b5863dfcb6
-MISC ChangeLog 813 RMD160 309d42523f75584638d37deba24b52a8910d9666 SHA1 64cc4d898939318a49eff1f4cc2b30d8127f3474 SHA256 35a75fb949e2d8fea4d79cf2aeba4eca2983859211dcaca4a76600789e398fcb
+DIST Bio-SamTools-1.31.tar.gz 332207 RMD160 c48237b0ae86e2d4f5f6bf18ef4c32f37bcb0490 SHA1 7d6440c149f1964e3efe590664e0767d425a1355 SHA256 df5928a09efd33c45186b84f1649636c8112e8fce0aa19cdc5fc17d963d8efec
+EBUILD Bio-SamTools-1.290.0.ebuild 916 RMD160 2e77881ddd8adf1270ba4b80fda14b598f59ad87 SHA1 427475f6cb46088a1918163968b275a519ca6614 SHA256 d4b571d2f54a933b2a6a8c9e24208046b82b3e451e145e82f2b8ce52a5cae073
+EBUILD Bio-SamTools-1.300.0.ebuild 916 RMD160 dab7270527e4e7b7be3cbc8cafa100e0918dcf13 SHA1 14915717f4c7fc36aa4a0e6e0e62c560c1f30da0 SHA256 3da980c632658f07e351561822da9df8fed69ca234d9b4f26b094b83432331e1
+EBUILD Bio-SamTools-1.310.0.ebuild 925 RMD160 290e8ad594ac7114e60085c3e5294326d6bf8baa SHA1 1d8c8edb38bbf26f3bbe67d8c5c3406f31198b6a SHA256 6b48737d77b6d644e4a1a7d374b1b8f5c0495849c18cfaa138aa9de7d4545f0a
+MISC ChangeLog 1016 RMD160 ebbf0f1c7c516ad5758164c1af8acc6251224b34 SHA1 2e8821083143c03ff9ae8c3a3c2ed05586f177b7 SHA256 4953514cf7c1a7abd74bb5fa959e25db93b21d55bf2eed3f8d3f56b355d696b8
 MISC metadata.xml 357 RMD160 e313d1508f6c44d5532a952747d3ae64befb02d2 SHA1 d68a1814a6a44128c2059bc2504016ccbcecc6c8 SHA256 fd532c6a6e666788525911cf731239741f3bea9e22995e89d49b86c59a29a056
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREIAAYFAk5/FgEACgkQV3J2n04Eauw02ACgi3F+U2xGkiz/md5DxSnKjNWj
+m4QAoKmQo6Aj2q4DxFDeLOAsGS56XDwE
+=HA9P
+-----END PGP SIGNATURE-----