summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-03-14 09:37:27 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-03-14 09:37:27 +0000
commitee6e4ecadcff89ef8ec58c123fc5368a690950b0 (patch)
tree55c1c649ff926c64ca180ca8209cc25a3f9ad867 /sci-biology/samtools
parentInitial commit for smokeping (diff)
downloadhistorical-ee6e4ecadcff89ef8ec58c123fc5368a690950b0.tar.gz
historical-ee6e4ecadcff89ef8ec58c123fc5368a690950b0.tar.bz2
historical-ee6e4ecadcff89ef8ec58c123fc5368a690950b0.zip
Drop empty RDEP/DEP, respect CC,LDFLAGS wrt 358563. Thanks to Diego for the report.
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'sci-biology/samtools')
-rw-r--r--sci-biology/samtools/ChangeLog9
-rw-r--r--sci-biology/samtools/Manifest4
-rw-r--r--sci-biology/samtools/samtools-0.1.12a-r1.ebuild (renamed from sci-biology/samtools/samtools-0.1.12a.ebuild)18
3 files changed, 20 insertions, 11 deletions
diff --git a/sci-biology/samtools/ChangeLog b/sci-biology/samtools/ChangeLog
index 614bee7692bd..8ac0f6446300 100644
--- a/sci-biology/samtools/ChangeLog
+++ b/sci-biology/samtools/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-biology/samtools
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/samtools/ChangeLog,v 1.4 2011/02/18 05:05:41 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/samtools/ChangeLog,v 1.5 2011/03/14 09:37:27 xarthisius Exp $
+
+*samtools-0.1.12a-r1 (14 Mar 2011)
+
+ 14 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> -samtools-0.1.12a.ebuild,
+ +samtools-0.1.12a-r1.ebuild:
+ Drop empty RDEP/DEP, respect CC,LDFLAGS wrt 358563. Thanks to Diego for the
+ report.
*samtools-0.1.12a (18 Feb 2011)
diff --git a/sci-biology/samtools/Manifest b/sci-biology/samtools/Manifest
index c504bae7bf7b..c92f6c8c9e3d 100644
--- a/sci-biology/samtools/Manifest
+++ b/sci-biology/samtools/Manifest
@@ -1,5 +1,5 @@
DIST samtools-0.1.12a.tar.bz2 355633 RMD160 e2732e61b216bc2d8e6a1c81aa91c34f296cef29 SHA1 d517cd189aa714251a0e43cb83dea3ae0f29bffa SHA256 377ed5cd2a4bb2b1ad572ca6fcafdd8ed644b67f01ab00fa020618fac11e59ac
EBUILD samtools-0.1.12.ebuild 825 RMD160 945e352ee7f8a2c0726056fa12df4b0d1d0606c8 SHA1 b7d91116e37c1c990e3bbb816b0aad4239f02dff SHA256 b99a0a6d5b03c44f70324eaf5fa7dabad68ddef8707d6e384585d2cc9bab5a45
-EBUILD samtools-0.1.12a.ebuild 1081 RMD160 7ae8db34fcf9daae480327c677152a169ecbca44 SHA1 c0e7d85e8c1e806d0d8e5babb814bc00054baa8e SHA256 10184432904c51bdcd676e8a317aad88a7f682a9cfd9eaef28defef30dd54309
-MISC ChangeLog 913 RMD160 a891e197757793cac041a0f0c18e12af4dfc0adb SHA1 9e5075bedd5f9cfbd957edbf99f5476c6aa0361a SHA256 ddbcc3b9b71757ce3233256cb46fa2c3f5060bda307f0999102901fe89dedb3d
+EBUILD samtools-0.1.12a-r1.ebuild 1213 RMD160 2f5f8c2d4f86aaacdd40fbf1eb6acbfb89a84687 SHA1 e25dce211a2af68a5eb35278dcbc6b68e600d90b SHA256 93d470593346d56c81914e25dc31b67f8a5646b76bb1237238897f4225abf751
+MISC ChangeLog 1153 RMD160 b6584e284a2bba7ccb782a3193f3959d021d8f4b SHA1 369cb4024d7318ca7e52251d1c13bb7851c8d571 SHA256 0ee56ddba88d63c598bda3fe5e15696bff6e384471821bb9985ea41b38609485
MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
diff --git a/sci-biology/samtools/samtools-0.1.12a.ebuild b/sci-biology/samtools/samtools-0.1.12a-r1.ebuild
index 7285c5dc2230..963f27c77d57 100644
--- a/sci-biology/samtools/samtools-0.1.12a.ebuild
+++ b/sci-biology/samtools/samtools-0.1.12a-r1.ebuild
@@ -1,11 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/samtools/samtools-0.1.12a.ebuild,v 1.2 2011/02/18 05:07:16 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/samtools/samtools-0.1.12a-r1.ebuild,v 1.1 2011/03/14 09:37:27 xarthisius Exp $
EAPI="2"
+inherit toolchain-funcs
+
DESCRIPTION="Utilities for SAM (Sequence Alignment/Map), a format for large nucleotide sequence alignments"
-HOMEPAGE="http://${PN}.sourceforge.net/"
+HOMEPAGE="http://samtools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="MIT"
@@ -13,17 +15,17 @@ SLOT="0"
IUSE=""
KEYWORDS="~amd64 ~x86 ~x64-macos"
-DEPEND=""
-RDEPEND=""
-
src_prepare() {
- sed -i 's/^CFLAGS=/CFLAGS+=/' "${S}"/{Makefile,misc/Makefile} || die
+ sed -e '/^CFLAGS=/d' \
+ -e "s/\$(CC) \$(CFLAGS)/& \$(LDFLAGS)/g" \
+ -e "s/-shared/& \$(LDFLAGS)/" \
+ -i "${S}"/{Makefile,misc/Makefile} || die #358563
sed -i 's~/software/bin/python~/usr/bin/env python~' "${S}"/misc/varfilter.py || die
}
src_compile() {
- emake dylib || die
- emake || die
+ emake CC="$(tc-getCC)" dylib || die
+ emake CC="$(tc-getCC)" || die
}
src_install() {