commit: b87aad117fc9f057a9f5e2278a8a9893005ef1ba
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 17:47:58 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 17:47:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b87aad11
Merge branch 'master' of ssh://github.com/gentoo-science/sci
sci-libs/nipype/Manifest | 1 +
sci-libs/nipype/nipype-0.11.0.ebuild | 4 +-
.../{nipype-0.11.0.ebuild => nipype-0.12.0.ebuild} | 4 +-
sci-misc/kaldi/Manifest | 2 +-
sci-misc/kaldi/files/Makefile.patch | 4 +-
sci-misc/kaldi/files/configure.patch | 93 ----------------------
.../kaldi/files/default_rules.mk.a7d9824.patch | 4 +-
sci-misc/kaldi/files/default_rules.mk.patch | 47 -----------
sci-misc/kaldi/kaldi-0_p20150709.ebuild | 58 --------------
...0_p20151106.ebuild => kaldi-0_p20160628.ebuild} | 41 ++++++----
10 files changed, 36 insertions(+), 222 deletions(-)
