commit: f3c3327961a0125ce5cf81995efcf154e6c00a7e
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Oct 12 06:25:50 2016 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Wed Oct 12 06:25:50 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f3c33279
Merge remote-tracking branch 'github/master'
Conflicts:
sci-biology/idba/metadata.xml
Takeover file from origin/master,
was moved/renamed in github/master.
dev-lang/julia/files/63julia-gentoo.el | 2 -
dev-lang/julia/julia-9999.ebuild | 176 ---------------------
dev-lang/julia/metadata.xml | 24 ---
net-misc/cernbox-client/Manifest | 2 +
.../cernbox-client/cernbox-client-2.2.4.ebuild | 118 ++++++++++++++
.../files/shell-integration-nautilus.patch | 25 +++
net-misc/cernbox-client/metadata.xml | 27 ++++
sci-biology/abyss/abyss-1.9.0.ebuild | 1 +
sci-biology/abyss/files/abyss-1.9.0-gcc-6.patch | 34 ++++
sci-biology/biopython/Manifest | 1 -
sci-biology/biopython/biopython-1.67-r1.ebuild | 60 -------
.../biopython/files/biopython-1.67-pull-884.patch | 87 ----------
sci-biology/biopython/metadata.xml | 8 -
sci-biology/hmmer/Manifest | 1 -
.../hmmer/files/hmmer-3.1_beta2-fix_tests.patch | 12 --
.../hmmer/files/hmmer-3.1_beta2-perl-5.16-2.patch | 90 -----------
sci-biology/hmmer/hmmer-3.1_beta2.ebuild | 48 ------
sci-biology/hmmer/metadata.xml | 8 -
sci-biology/nilearn/Manifest | 1 +
sci-biology/nilearn/nilearn-0.1.4.1.ebuild | 11 +-
sci-biology/nilearn/nilearn-0.2.4.ebuild | 7 +-
sci-biology/nilearn/nilearn-0.2.5.ebuild | 7 +-
.../{nilearn-0.2.4.ebuild => nilearn-0.2.6.ebuild} | 7 +-
sci-biology/nilearn/nilearn-9999.ebuild | 11 +-
.../omalloc => sci-biology/nireg}/metadata.xml | 8 +-
sci-biology/nireg/nireg-9999.ebuild | 33 ++++
sci-biology/nistats/nistats-9999.ebuild | 16 +-
sci-biology/nitime/Manifest | 1 +
.../spglib => sci-biology/nitime}/metadata.xml | 9 +-
.../nitime-0.6.ebuild} | 25 +--
.../dipy-9999.ebuild => nitime/nitime-9999.ebuild} | 26 +--
sci-biology/psychopy/Manifest | 1 +
...ychopy-1.84.0.ebuild => psychopy-1.84.1.ebuild} | 2 +-
sci-biology/pybrain/Manifest | 1 +
.../{pybrain-9999.ebuild => pybrain-0.3.3.ebuild} | 21 ++-
sci-biology/pybrain/pybrain-9999.ebuild | 14 +-
sci-biology/vcftools/Manifest | 1 -
sci-biology/vcftools/metadata.xml | 11 --
sci-biology/vcftools/vcftools-0.1.14.ebuild | 55 -------
....ebuild => blas-reference-20131116-r100.ebuild} | 0
....ebuild => blas-reference-20151113-r100.ebuild} | 0
...ebuild => cblas-reference-20110218-r100.ebuild} | 2 +-
...ebuild => cblas-reference-20151113-r100.ebuild} | 2 +-
...0.ebuild => lapack-reference-3.5.0-r100.ebuild} | 0
...1.ebuild => lapack-reference-3.6.0-r100.ebuild} | 0
sci-libs/nibabel/nibabel-1.3.0.ebuild | 11 +-
sci-libs/nibabel/nibabel-2.0.1.ebuild | 9 +-
sci-libs/nibabel/nibabel-2.1.0.ebuild | 9 +-
sci-libs/nibabel/nibabel-9999.ebuild | 9 +-
sci-libs/nipy/nipy-0.4.0.ebuild | 4 +-
sci-libs/nipy/nipy-9999.ebuild | 4 +-
sci-libs/nipype/nipype-0.11.0.ebuild | 4 +-
sci-libs/nipype/nipype-0.12.0.ebuild | 10 +-
sci-libs/nipype/nipype-0.12.1.ebuild | 10 +-
sci-libs/nipype/nipype-9999.ebuild | 10 +-
sci-mathematics/mdp/Manifest | 1 +
.../mdp/{mdp-3.3.ebuild => mdp-3.5.ebuild} | 13 +-
.../{blas-2.1-r5.ebuild => blas-3.6-r100.ebuild} | 2 +-
.../{cblas-2.0-r4.ebuild => cblas-3.6-r100.ebuild} | 2 +-
.../{lapack-3.6.ebuild => lapack-3.6-r100.ebuild} | 2 +-
60 files changed, 388 insertions(+), 708 deletions(-)
