| 1 |
commit: f3c3327961a0125ce5cf81995efcf154e6c00a7e |
| 2 |
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 3 |
AuthorDate: Wed Oct 12 06:25:50 2016 +0000 |
| 4 |
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 5 |
CommitDate: Wed Oct 12 06:25:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f3c33279 |
| 7 |
|
| 8 |
Merge remote-tracking branch 'github/master' |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
sci-biology/idba/metadata.xml |
| 12 |
|
| 13 |
Takeover file from origin/master, |
| 14 |
was moved/renamed in github/master. |
| 15 |
|
| 16 |
dev-lang/julia/files/63julia-gentoo.el | 2 - |
| 17 |
dev-lang/julia/julia-9999.ebuild | 176 --------------------- |
| 18 |
dev-lang/julia/metadata.xml | 24 --- |
| 19 |
net-misc/cernbox-client/Manifest | 2 + |
| 20 |
.../cernbox-client/cernbox-client-2.2.4.ebuild | 118 ++++++++++++++ |
| 21 |
.../files/shell-integration-nautilus.patch | 25 +++ |
| 22 |
net-misc/cernbox-client/metadata.xml | 27 ++++ |
| 23 |
sci-biology/abyss/abyss-1.9.0.ebuild | 1 + |
| 24 |
sci-biology/abyss/files/abyss-1.9.0-gcc-6.patch | 34 ++++ |
| 25 |
sci-biology/biopython/Manifest | 1 - |
| 26 |
sci-biology/biopython/biopython-1.67-r1.ebuild | 60 ------- |
| 27 |
.../biopython/files/biopython-1.67-pull-884.patch | 87 ---------- |
| 28 |
sci-biology/biopython/metadata.xml | 8 - |
| 29 |
sci-biology/hmmer/Manifest | 1 - |
| 30 |
.../hmmer/files/hmmer-3.1_beta2-fix_tests.patch | 12 -- |
| 31 |
.../hmmer/files/hmmer-3.1_beta2-perl-5.16-2.patch | 90 ----------- |
| 32 |
sci-biology/hmmer/hmmer-3.1_beta2.ebuild | 48 ------ |
| 33 |
sci-biology/hmmer/metadata.xml | 8 - |
| 34 |
sci-biology/nilearn/Manifest | 1 + |
| 35 |
sci-biology/nilearn/nilearn-0.1.4.1.ebuild | 11 +- |
| 36 |
sci-biology/nilearn/nilearn-0.2.4.ebuild | 7 +- |
| 37 |
sci-biology/nilearn/nilearn-0.2.5.ebuild | 7 +- |
| 38 |
.../{nilearn-0.2.4.ebuild => nilearn-0.2.6.ebuild} | 7 +- |
| 39 |
sci-biology/nilearn/nilearn-9999.ebuild | 11 +- |
| 40 |
.../omalloc => sci-biology/nireg}/metadata.xml | 8 +- |
| 41 |
sci-biology/nireg/nireg-9999.ebuild | 33 ++++ |
| 42 |
sci-biology/nistats/nistats-9999.ebuild | 16 +- |
| 43 |
sci-biology/nitime/Manifest | 1 + |
| 44 |
.../spglib => sci-biology/nitime}/metadata.xml | 9 +- |
| 45 |
.../nitime-0.6.ebuild} | 25 +-- |
| 46 |
.../dipy-9999.ebuild => nitime/nitime-9999.ebuild} | 26 +-- |
| 47 |
sci-biology/psychopy/Manifest | 1 + |
| 48 |
...ychopy-1.84.0.ebuild => psychopy-1.84.1.ebuild} | 2 +- |
| 49 |
sci-biology/pybrain/Manifest | 1 + |
| 50 |
.../{pybrain-9999.ebuild => pybrain-0.3.3.ebuild} | 21 ++- |
| 51 |
sci-biology/pybrain/pybrain-9999.ebuild | 14 +- |
| 52 |
sci-biology/vcftools/Manifest | 1 - |
| 53 |
sci-biology/vcftools/metadata.xml | 11 -- |
| 54 |
sci-biology/vcftools/vcftools-0.1.14.ebuild | 55 ------- |
| 55 |
....ebuild => blas-reference-20131116-r100.ebuild} | 0 |
| 56 |
....ebuild => blas-reference-20151113-r100.ebuild} | 0 |
| 57 |
...ebuild => cblas-reference-20110218-r100.ebuild} | 2 +- |
| 58 |
...ebuild => cblas-reference-20151113-r100.ebuild} | 2 +- |
| 59 |
...0.ebuild => lapack-reference-3.5.0-r100.ebuild} | 0 |
| 60 |
...1.ebuild => lapack-reference-3.6.0-r100.ebuild} | 0 |
| 61 |
sci-libs/nibabel/nibabel-1.3.0.ebuild | 11 +- |
| 62 |
sci-libs/nibabel/nibabel-2.0.1.ebuild | 9 +- |
| 63 |
sci-libs/nibabel/nibabel-2.1.0.ebuild | 9 +- |
| 64 |
sci-libs/nibabel/nibabel-9999.ebuild | 9 +- |
| 65 |
sci-libs/nipy/nipy-0.4.0.ebuild | 4 +- |
| 66 |
sci-libs/nipy/nipy-9999.ebuild | 4 +- |
| 67 |
sci-libs/nipype/nipype-0.11.0.ebuild | 4 +- |
| 68 |
sci-libs/nipype/nipype-0.12.0.ebuild | 10 +- |
| 69 |
sci-libs/nipype/nipype-0.12.1.ebuild | 10 +- |
| 70 |
sci-libs/nipype/nipype-9999.ebuild | 10 +- |
| 71 |
sci-mathematics/mdp/Manifest | 1 + |
| 72 |
.../mdp/{mdp-3.3.ebuild => mdp-3.5.ebuild} | 13 +- |
| 73 |
.../{blas-2.1-r5.ebuild => blas-3.6-r100.ebuild} | 2 +- |
| 74 |
.../{cblas-2.0-r4.ebuild => cblas-3.6-r100.ebuild} | 2 +- |
| 75 |
.../{lapack-3.6.ebuild => lapack-3.6-r100.ebuild} | 2 +- |
| 76 |
60 files changed, 388 insertions(+), 708 deletions(-) |
Archives