commit: 5b0d5724ba788d179d9a596a5e4424f601e5b794
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 07:21:06 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu May 15 07:21:06 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b0d5724
sci-biology/khmer: Version BUmp
Package-Manager: portage-2.2.10
---
sci-biology/khmer/ChangeLog | 6 ++++
sci-biology/khmer/khmer-0.8.ebuild | 2 +-
.../khmer/{khmer-0.8.ebuild => khmer-1.0.1.ebuild} | 35 ++++++++++++++++++----
3 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/sci-biology/khmer/ChangeLog b/sci-biology/khmer/ChangeLog
index 47af4ab..9b61d89 100644
--- a/sci-biology/khmer/ChangeLog
+++ b/sci-biology/khmer/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*khmer-1.0.1 (15 May 2014)
+
+ 15 May 2014; Justin Lecher <[email protected]> khmer-0.8.ebuild,
+ +khmer-1.0.1.ebuild:
+ Version BUmp
+
28 Mar 2014; Martin Mokrejs <[email protected]> khmer-9999.ebuild:
sci-biology/khmer: upstream dropped the bundled zlib/bzip2 use if it is
available system-wide, upstream https://github.com/ged-lab/khmer/pull/346
diff --git a/sci-biology/khmer/khmer-0.8.ebuild
b/sci-biology/khmer/khmer-0.8.ebuild
index 3cbc048..a90628f 100644
--- a/sci-biology/khmer/khmer-0.8.ebuild
+++ b/sci-biology/khmer/khmer-0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=""
diff --git a/sci-biology/khmer/khmer-0.8.ebuild
b/sci-biology/khmer/khmer-1.0.1.ebuild
similarity index 52%
copy from sci-biology/khmer/khmer-0.8.ebuild
copy to sci-biology/khmer/khmer-1.0.1.ebuild
index 3cbc048..e5f3c26 100644
--- a/sci-biology/khmer/khmer-0.8.ebuild
+++ b/sci-biology/khmer/khmer-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=""
@@ -29,12 +29,35 @@ python_prepare_all(){
-i lib/read_parsers.hh lib/counting.cc || die
sed \
- -e "/extra_objects/d" \
- -e "s:'nose >= 1.0', ::g" \
- -e "s:'sphinx',::g" \
- -e '/libraries/s:, ]:, "z", "bz2", ]:g' \
- -e "s:'-O3',::g" \
+ -e "/^EXTRA_COMPILE_ARGS/s:=.*:=[]:g" \
-i setup.py || die
+ cat > setup.cfg <<- EOF
+ [nosetests]
+ verbosity = 2
+ stop = TRUE
+ attr = !known_failing
+
+ [build_ext]
+ undef = NO_UNIQUE_RC
+ libraries = z,bz2
+ ## if using system libraries
+ include-dirs = lib:lib/zlib:lib/bzip2
+ # include-dirs = lib
+ ## if using system libraries (broken)
+
+ define = NDEBUG
+ # is not needed for most Linux installs
+ # see the OPT line in /usr/lib/python2.7/config/Makefile which gets
included
+ # in distutils version of CFLAGS
+
+ [easy_install]
+
+ EOF
+
distutils-r1_python_prepare_all
}
+
+python_test() {
+ esetup.py nosetests || die
+}
