commit: c0cba0d05a0cee47cdfb67e6e1f0a002e7101381
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 19 21:51:19 2014 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Aug 19 21:51:19 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c0cba0d0
Merge branch 'master' of ssh://github.com/gentoo-science/sci
Conflicts:
sci-physics/espresso/ChangeLog
sci-physics/espresso/espresso-9999.ebuild
dev-java/jeuclid-core/ChangeLog | 10 +-
.../files/jeuclid-core-cast-issue.patch | 18 +++
...e-3.1.9.ebuild => jeuclid-core-3.1.9-r1.ebuild} | 19 +--
dev-python/astropy-helpers/ChangeLog | 10 ++
dev-python/astropy-helpers/Manifest | 1 +
.../astropy-helpers/astropy-helpers-0.4.1.ebuild | 28 ++++
.../astropy-helpers/astropy-helpers-9999.ebuild | 28 ++++
.../astropy-helpers}/metadata.xml | 5 +-
dev-python/astropy/ChangeLog | 7 +-
dev-python/astropy/astropy-9999.ebuild | 50 +++++--
dev-python/ccdproc/ChangeLog | 10 ++
dev-python/ccdproc/Manifest | 1 +
dev-python/ccdproc/ccdproc-0.2.ebuild | 59 ++++++++
dev-python/ccdproc/ccdproc-9999.ebuild | 59 ++++++++
dev-python/ccdproc/metadata.xml | 10 ++
dev-python/gammapy/ChangeLog | 9 ++
dev-python/gammapy/gammapy-9999.ebuild | 75 +++++++++++
dev-python/gammapy/metadata.xml | 10 ++
dev-python/imageutils/ChangeLog | 9 ++
dev-python/imageutils/imageutils-9999.ebuild | 58 ++++++++
dev-python/imageutils/metadata.xml | 10 ++
dev-python/photutils/ChangeLog | 9 ++
dev-python/photutils/metadata.xml | 10 ++
dev-python/photutils/photutils-9999.ebuild | 61 +++++++++
dev-python/specutils/ChangeLog | 9 ++
dev-python/specutils/metadata.xml | 10 ++
dev-python/specutils/specutils-9999.ebuild | 59 ++++++++
sci-chemistry/curvefit/ChangeLog | 5 +-
sci-chemistry/curvefit/curvefit-1.40.ebuild | 2 +-
sci-chemistry/mddnmr/ChangeLog | 10 +-
sci-chemistry/mddnmr/Manifest | 3 +-
sci-chemistry/mddnmr/mddnmr-2.1.ebuild | 59 --------
.../{mddnmr-2.2.ebuild => mddnmr-2.4-r1.ebuild} | 6 +-
sci-chemistry/mddnmr/metadata.xml | 2 +-
sci-chemistry/module2/ChangeLog | 10 ++
sci-chemistry/module2/Manifest | 1 +
sci-chemistry/{concoord => module2}/metadata.xml | 0
sci-chemistry/module2/module2-0_pre20140717.ebuild | 51 +++++++
sci-chemistry/nwchem/ChangeLog | 12 +-
sci-chemistry/nwchem/Manifest | 1 -
sci-chemistry/nwchem/metadata.xml | 3 +
sci-chemistry/nwchem/nwchem-6.3-r1.ebuild | 150 ---------------------
...wchem-6.3-r2.ebuild => nwchem-6.3_p2-r1.ebuild} | 62 ++++++++-
sci-chemistry/pales-bin/ChangeLog | 13 ++
sci-chemistry/pales-bin/Manifest | 1 +
sci-chemistry/{concoord => pales-bin}/metadata.xml | 0
.../pales-bin/pales-bin-0_pre140717.ebuild | 26 ++++
sci-chemistry/redcat/ChangeLog | 14 ++
sci-chemistry/redcat/Manifest | 1 +
sci-chemistry/redcat/files/CMakeLists.txt | 13 ++
sci-chemistry/{concoord => redcat}/metadata.xml | 0
sci-chemistry/redcat/redcat-3.ebuild | 62 +++++++++
sci-libs/libsc/ChangeLog | 6 +
sci-libs/libsc/Manifest | 1 +
sci-libs/libsc/libsc-0.7.3.ebuild | 8 +-
.../libsc/{libsc-0.7.3.ebuild => libsc-1.0.ebuild} | 14 +-
sci-libs/libsc/metadata.xml | 23 ++--
sci-libs/p4est/ChangeLog | 6 +
sci-libs/p4est/Manifest | 2 +
sci-libs/p4est/metadata.xml | 29 ++--
.../p4est/{p4est-0.3.5.ebuild => p4est-1.0.ebuild} | 33 +++--
sci-mathematics/giac/ChangeLog | 3 +
sci-mathematics/giac/Manifest | 3 -
sci-mathematics/giac/giac-1.1.0.ebuild | 20 ++-
sci-mathematics/petsc/Manifest | 1 +
...rpath.patch => petsc-3.5.1-disable-rpath.patch} | 0
sci-mathematics/petsc/metadata.xml | 4 +-
.../{petsc-3.4.2.ebuild => petsc-3.5.1.ebuild} | 28 ++--
sci-physics/espresso/ChangeLog | 5 +-
sci-physics/espresso/espresso-9999.ebuild | 40 ++++--
sci-physics/espresso/metadata.xml | 1 +
sci-physics/geant-vmc/ChangeLog | 5 +
sci-physics/geant-vmc/geant-vmc-9999.ebuild | 19 +--
73 files changed, 1041 insertions(+), 361 deletions(-)
