commit: 2ca96f9db90098568873343a1d1a547bac4eab9a Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> AuthorDate: Fri Mar 28 20:13:47 2014 +0000 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> CommitDate: Fri Mar 28 20:13:47 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2ca96f9d
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 Package-Manager: portage-2.2.7 --- sci-biology/khmer/ChangeLog | 4 ++++ sci-biology/khmer/khmer-9999.ebuild | 36 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/sci-biology/khmer/ChangeLog b/sci-biology/khmer/ChangeLog index 04e1cbd..47af4ab 100644 --- a/sci-biology/khmer/ChangeLog +++ b/sci-biology/khmer/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Mar 2014; Martin Mokrejs <mmokr...@fold.natur.cuni.cz> 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 + 24 Mar 2014; Justin Lecher <j...@gentoo.org> khmer-0.8.ebuild, khmer-9999.ebuild: Also drop sphinx as build requirement diff --git a/sci-biology/khmer/khmer-9999.ebuild b/sci-biology/khmer/khmer-9999.ebuild index 0bd7a8d..f6c6594 100644 --- a/sci-biology/khmer/khmer-9999.ebuild +++ b/sci-biology/khmer/khmer-9999.ebuild @@ -21,21 +21,21 @@ IUSE="" DEPEND="" RDEPEND="sci-biology/screed" -python_prepare_all(){ - rm -rf lib/{bzip2,zlib} || die - - sed \ - -e 's:zlib/zlib.h:zlib.h:g' \ - -e 's:bzip2/bzlib.h:bzlib.h:g' \ - -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" \ - -i setup.py || die - - distutils-r1_python_prepare_all -} +#python_prepare_all(){ +# rm -rf lib/{bzip2,zlib} || die +# +# sed \ +# -e 's:zlib/zlib.h:zlib.h:g' \ +# -e 's:bzip2/bzlib.h:bzlib.h:g' \ +# -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" \ +# -i setup.py || die +# +# distutils-r1_python_prepare_all +#}
