1 |
commit: 3c1a5d058c642c67a27f8d98968bcd6d7166f8ca |
2 |
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Jun 16 03:16:30 2011 +0000 |
4 |
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Jun 16 03:16:30 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3c1a5d05 |
7 |
|
8 |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci into guillaume |
9 |
|
10 |
Conflicts: |
11 |
sci-mathematics/scilab/Manifest |
12 |
|
13 |
|
14 |
eclass/fortran-2.eclass | 172 ++++++++++++++++++++ |
15 |
media-gfx/librecad/Manifest | 1 - |
16 |
sci-chemistry/coot/ChangeLog | 4 + |
17 |
sci-chemistry/coot/Manifest | 11 +- |
18 |
sci-chemistry/coot/coot-9999.ebuild | 1 - |
19 |
sci-chemistry/coot/files/9999-align.patch | 29 ---- |
20 |
sci-chemistry/pymol/ChangeLog | 8 + |
21 |
sci-chemistry/pymol/Manifest | 13 +- |
22 |
sci-chemistry/pymol/files/9999-web.patch | 19 +++ |
23 |
sci-chemistry/pymol/metadata.xml | 7 +- |
24 |
sci-chemistry/pymol/pymol-9999.ebuild | 7 +- |
25 |
sci-visualization/paraview/ChangeLog | 6 + |
26 |
sci-visualization/paraview/Manifest | 16 +-- |
27 |
sci-visualization/paraview/metadata.xml | 2 + |
28 |
...araview-3.8.1.ebuild => paraview-3.10.1.ebuild} | 51 ++++--- |
29 |
sys-cluster/mpich2/ChangeLog | 6 + |
30 |
sys-cluster/mpich2/Manifest | 11 +- |
31 |
.../mpich2/files/fix-pkg-config-files.patch | 123 ++++++++++++++ |
32 |
...ch2-1.4_rc2.ebuild => mpich2-1.4_rc2-r1.ebuild} | 6 +- |
33 |
19 files changed, 406 insertions(+), 87 deletions(-) |