commit:     b46449a0730b60d7e4e4bdb30deeaac07a8929f5
Author:     Andrei Zavada <johnhommer <AT> gmail <DOT> com>
AuthorDate: Thu Feb 19 13:18:17 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 13:18:17 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b46449a0

Merge branch 'master' of github.com:gentoo-science/sci

# Conflicts:
#       sci-biology/aghermann/ChangeLog
#       sci-biology/aghermann/aghermann-1.0.3.ebuild


 .travis.yml                                        |  29 ++---
 app-forensics/vine/ChangeLog                       |   5 +-
 app-forensics/vine/metadata.xml                    |   8 +-
 app-forensics/vine/vine-1.0.ebuild                 |   3 +-
 dev-cpp/eigen/ChangeLog                            |   6 +-
 dev-cpp/eigen/Manifest                             |   2 -
 dev-cpp/eigen/eigen-3.2.0-r1.ebuild                | 102 -----------------
 dev-cpp/eigen/eigen-9999.ebuild                    |   4 +-
 dev-cpp/eigen/metadata.xml                         |  18 +--
 dev-java/hdf-java/ChangeLog                        |   6 +-
 dev-java/hdf-java/hdf-java-2.9.ebuild              |   4 +-
 dev-java/hdf-java/metadata.xml                     |  12 +-
 dev-lang/conceptual/ChangeLog                      |   6 +-
 dev-lang/conceptual/conceptual-1.4.ebuild          |   8 +-
 dev-lang/conceptual/metadata.xml                   |  14 +--
 dev-lang/path64/ChangeLog                          |   6 +-
 dev-lang/path64/path64-9999.ebuild                 |   5 +-
 dev-lua/cmsgpack/ChangeLog                         |   5 +-
 dev-lua/cmsgpack/cmsgpack-0.3.0.ebuild             |  49 +--------
 dev-lua/cmsgpack/cmsgpack-9999.ebuild              |  30 ++---
 dev-ml/mlgmpidl/ChangeLog                          |   7 +-
 dev-ml/mlgmpidl/metadata.xml                       |  10 +-
 dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild                |  50 ++++-----
 dev-ml/zarith/ChangeLog                            |   6 +-
 dev-ml/zarith/metadata.xml                         |  10 +-
 dev-ml/zarith/zarith-1.2.1.ebuild                  |  27 +++--
 dev-python/omniorbpy/ChangeLog                     |   6 +-
 dev-python/omniorbpy/omniorbpy-3.4.ebuild          |  12 +-
 dev-python/pythonocc/ChangeLog                     |   6 +-
 dev-python/pythonocc/pythonocc-0.5.ebuild          |   6 +-
 dev-util/amdapp/ChangeLog                          |   4 +
 dev-util/amdapp/Manifest                           |   2 -
 dev-util/amdapp/amdapp-2.8.ebuild                  |  89 ---------------
 dev-util/amdapp/amdapp-2.9.ebuild                  |  12 +-
 dev-util/amdapp/metadata.xml                       |   4 +-
 dev-util/numdiff/ChangeLog                         |   6 +-
 dev-util/numdiff/metadata.xml                      |  12 +-
 dev-util/numdiff/numdiff-5.8.1.ebuild              |  11 +-
 dev-util/nvidia-cuda-toolkit/ChangeLog             |   6 +
 ...ebuild => nvidia-cuda-toolkit-7.0.18-r1.ebuild} |   2 +
 eclass/emboss-r1.eclass                            |   2 +-
 net-ftp/bbftp-client/ChangeLog                     |   6 +-
 net-ftp/bbftp-client/bbftp-client-3.2.1.ebuild     |   6 +-
 net-ftp/bbftp-server/ChangeLog                     |   6 +-
 net-ftp/bbftp-server/bbftp-server-3.2.1.ebuild     |   6 +-
 profiles/categories                                | 121 +--------------------
 sci-astronomy/astrometry/ChangeLog                 |   6 +-
 sci-astronomy/astrometry/astrometry-0.43.ebuild    |  22 ++--
 sci-astronomy/astrometry/metadata.xml              |  10 +-
 sci-astronomy/stiff/ChangeLog                      |   5 +-
 sci-astronomy/stiff/metadata.xml                   |   4 +-
 sci-astronomy/stiff/stiff-9999.ebuild              |   4 +-
 sci-biology/Atlas2/Atlas2-1.4.3.ebuild             |   4 +-
 sci-biology/Atlas2/ChangeLog                       |   6 +-
 sci-biology/Atlas_GapFill/Atlas_GapFill-2.2.ebuild |   9 +-
 sci-biology/Atlas_GapFill/ChangeLog                |   4 +-
 sci-biology/BBmap/BBmap-31.40.ebuild               |   6 +-
 sci-biology/BBmap/ChangeLog                        |   5 +-
 sci-biology/BG7/BG7-9999.ebuild                    |   6 +-
 sci-biology/BG7/ChangeLog                          |   6 +-
 sci-biology/BamView/BamView-1.2.11.ebuild          |   7 +-
 sci-biology/BamView/ChangeLog                      |   6 +-
 sci-biology/BamView/metadata.xml                   |   8 +-
 sci-biology/MagicViewer/ChangeLog                  |   6 +-
 sci-biology/MagicViewer/MagicViewer-1.2.1.ebuild   |  12 +-
 sci-biology/MagicViewer/metadata.xml               |  10 +-
 sci-biology/VarScan/ChangeLog                      |   6 +-
 sci-biology/VarScan/VarScan-2.3.6.ebuild           |   9 +-
 sci-biology/VarScan/metadata.xml                   |   2 +-
 sci-biology/ampliconnoise/ChangeLog                |   4 +-
 .../ampliconnoise/ampliconnoise-1.27.ebuild        |   7 +-
 sci-biology/apollo/ChangeLog                       |   5 +-
 sci-biology/apollo/apollo-9999.ebuild              |  19 ++--
 sci-biology/apollo/metadata.xml                    |  10 +-
 sci-biology/artemis/ChangeLog                      |   5 +-
 sci-biology/artemis/artemis-9999.ebuild            |  12 +-
 sci-biology/biopieces/ChangeLog                    |   5 +-
 sci-biology/biopieces/Manifest                     |   1 -
 sci-biology/biopieces/biopieces-0.51.ebuild        |  64 +----------
 sci-biology/biopieces/biopieces-9999.ebuild        |  49 +++++----
 sci-biology/cgview-bin/ChangeLog                   |   5 +-
 sci-biology/cgview-bin/cgview-bin-20131130.ebuild  |  34 +++---
 sci-biology/discrover/ChangeLog                    |   4 +
 sci-biology/discrover/discrover-1.5.2.ebuild       |  28 +++--
 sci-biology/discrover/discrover-9999.ebuild        |  29 +++--
 sci-biology/discrover/metadata.xml                 |  24 ++--
 sci-biology/igv/ChangeLog                          |   6 +-
 sci-biology/igv/igv-2.0.32.ebuild                  |  35 ------
 sci-biology/igv/igv-2.0.35.ebuild                  |  20 ++--
 sci-biology/igv/metadata.xml                       |  10 +-
 sci-biology/jtreeview/ChangeLog                    |   6 +
 sci-biology/jtreeview/jtreeview-1.1.6.4.ebuild     |   9 +-
 sci-biology/mrbayes/ChangeLog                      |   6 +-
 sci-biology/mrbayes/mrbayes-3.1.2-r1.ebuild        |   4 +-
 sci-biology/ncbi-blast+/ChangeLog                  |   3 +
 sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild  |  16 ++-
 sci-biology/ncbi-tools++/ChangeLog                 |   5 +-
 .../ncbi-tools++/ncbi-tools++-12.0.0.ebuild        |  18 +--
 sci-biology/ngsview/ChangeLog                      |   5 +-
 sci-biology/ngsview/ngsview-0.91.ebuild            |  23 ++--
 sci-biology/psychopy/ChangeLog                     |   7 +-
 sci-biology/psychopy/Manifest                      |   2 -
 sci-biology/psychopy/psychopy-1.75.01.ebuild       |  56 ----------
 sci-biology/psychopy/psychopy-1.77.02.ebuild       |  56 ----------
 sci-biology/psychopy/psychopy-1.78.00.ebuild       |   4 +-
 sci-biology/psychopy/psychopy-9999.ebuild          |   4 +-
 sci-biology/tablet/ChangeLog                       |   4 +
 sci-biology/tablet/tablet-1.13.12.17.ebuild        |  51 ---------
 sci-biology/tablet/tablet-1.14.04.10.ebuild        |  52 +--------
 sci-biology/tablet/tablet-9999.ebuild              |  28 ++---
 sci-biology/trimmomatic/ChangeLog                  |   3 +
 sci-biology/trimmomatic/trimmomatic-0.32.ebuild    |  14 +--
 sci-biology/vague-bin/ChangeLog                    |   3 +
 sci-biology/vague-bin/vague-bin-1.0.5.ebuild       |   9 +-
 sci-libs/clfft/ChangeLog                           |   5 +
 sci-libs/clfft/Manifest                            |   1 +
 .../clfft/{clfft-2.2.ebuild => clfft-2.4.ebuild}   |   0
 sci-libs/libspatialindex/ChangeLog                 |   7 +-
 .../libspatialindex/libspatialindex-1.8.5.ebuild   |  27 ++---
 sci-libs/libspatialindex/metadata.xml              |  10 +-
 sci-visualization/mantid/ChangeLog                 |   7 ++
 sci-visualization/mantid/mantid-3.3.0.ebuild       |  56 ++++++----
 sci-visualization/mantid/metadata.xml              |  28 ++---
 sci-visualization/mayavi/ChangeLog                 |   4 +
 sci-visualization/mayavi/mayavi-4.4.0.ebuild       |   6 +-
 sci-visualization/mayavi/metadata.xml              |   4 +-
 sys-apps/hwloc/ChangeLog                           |  10 ++
 sys-apps/hwloc/hwloc-1.10.1.ebuild                 |   6 +-
 sys-apps/hwloc/metadata.xml                        |  20 ++--
 sys-cluster/htcondor/ChangeLog                     |   4 +
 sys-cluster/htcondor/htcondor-8.0.0.ebuild         |  22 ++--
 sys-cluster/htcondor/htcondor-8.3.2.ebuild         |  19 ++--
 sys-cluster/lustre/ChangeLog                       |   5 +-
 sys-cluster/lustre/lustre-9999.ebuild              |   4 +-
 sys-cluster/mvapich2/ChangeLog                     |   5 +-
 sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild        |   8 +-
 sys-cluster/openmpi/ChangeLog                      |   5 +
 sys-cluster/openmpi/metadata.xml                   |  24 ++--
 sys-cluster/openmpi/openmpi-1.6.5.ebuild           |  10 +-
 sys-cluster/openmpi/openmpi-1.7.3.ebuild           |   8 +-
 sys-cluster/openmpi/openmpi-1.8.1.ebuild           |   8 +-
 sys-cluster/openmpi/openmpi-1.8.3.ebuild           |   8 +-
 sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild        |   6 +-
 143 files changed, 774 insertions(+), 1237 deletions(-)

Reply via email to