[gentoo-commits] proj/sci:ccp4 commit in: /

["Justin Lecher" <jlec@gentoo.org>]

commit:     0944dd9ae2211da33b30cfb52496b342575640ed
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 07:07:55 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 07:07:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0944dd9a

Merge branch 'master' into ccp4

* master: (34 commits)
  Package dropped Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
  sci-astronomy/galfit-bin: Fix license
  sci-astronomy/eazy: Fix license
  sci-astronomy/bpz: Bump to EAPI=5 and python-single-r1; restrict license
  dev-tcltk/img_rotate: Bump to EAPI=5 and fix license
  dev-python/inference: Bump to EAPI=5 and distutils-r1.eclass; make license more restrictive as we cannot check it right now
  sci-libs/blastdb: Add missing build dep; fix license
  x11-libs/xview-bin: Drop all keywords
  sci-biology/pybrain: Bump to EAPI=5 and distutils-r1.eclass
  sys-cluster/lustre: Move virtual/linux-sources to build deps
  sci-mathematics/cadabra: Drop old, move doxygen to build deps
  sci-libs/ipopt: Fix local USE description
  sci-libs/ipopt: Version bump
  fixed as-needed
  sci-chemistry/hydronmr: Drop empty last line
  sci-biology/ncbi-tools++: Drop empty line
  sci-chemistry/ball: Bump EAPI and python eclass
  sci-libs/trilinos: Drop old, fix handling of qt support
  Merge live ebuilds on top drop unversioned "mask for testing" drop obsolete Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
  sci-libs/coinhsl: Initial import
  ...

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

Conflicts:
	sci-chemistry/sfcheck/metadata.xml


 dev-python/inference/ChangeLog                     |   7 +-
 dev-python/inference/inference-0.4.ebuild          |  31 +--
 dev-python/inference/metadata.xml                  |   4 +-
 dev-tcltk/img_rotate/ChangeLog                     |   6 +-
 dev-tcltk/img_rotate/Manifest                      |   2 +-
 dev-tcltk/img_rotate/img_rotate-1.1.ebuild         |  14 +-
 dev-tcltk/img_rotate/metadata.xml                  |   8 +-
 licenses/HSL                                       | 222 +++++++++++++++++++++
 profiles/package.mask                              | 113 +++--------
 sci-astronomy/bpz/ChangeLog                        |   5 +-
 sci-astronomy/bpz/bpz-1.99.3.ebuild                |  57 +++---
 sci-astronomy/bpz/metadata.xml                     |   4 +-
 sci-astronomy/eazy/ChangeLog                       |   5 +-
 sci-astronomy/eazy/eazy-1.00.ebuild                |  16 +-
 sci-astronomy/eazy/metadata.xml                    |   4 +-
 sci-astronomy/galfit-bin/ChangeLog                 |   3 +
 sci-astronomy/galfit-bin/galfit-bin-3.0.4.ebuild   |   6 +-
 sci-biology/ncbi-tools++/ChangeLog                 |   6 +
 .../ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild      |   3 +-
 sci-biology/pybrain/ChangeLog                      |   6 +-
 sci-biology/pybrain/metadata.xml                   |   2 +-
 sci-biology/pybrain/pybrain-9999.ebuild            |  25 ++-
 sci-chemistry/ball/ChangeLog                       |   3 +
 sci-chemistry/ball/ball-9999.ebuild                |  11 +-
 sci-chemistry/ball/metadata.xml                    |   2 +-
 sci-chemistry/hydronmr/ChangeLog                   |   3 +
 sci-chemistry/hydronmr/hydronmr-7c.ebuild          |   1 -
 sci-libs/blastdb/ChangeLog                         |   8 +
 sci-libs/blastdb/blastdb-9999.ebuild               |   8 +-
 sci-libs/blastdb/metadata.xml                      |  31 +--
 sci-libs/coinhsl/ChangeLog                         |  12 ++
 sci-libs/coinhsl/Manifest                          |   1 +
 sci-libs/coinhsl/coinhsl-2012.12.21.ebuild         |  36 ++++
 sci-libs/coinhsl/metadata.xml                      |  12 ++
 sci-libs/ipopt/ChangeLog                           |   9 +
 sci-libs/ipopt/Manifest                            |   2 +-
 .../{ipopt-3.10.3.ebuild => ipopt-3.11.0.ebuild}   |  19 +-
 sci-libs/ipopt/metadata.xml                        |  11 +-
 sci-libs/trilinos/ChangeLog                        |   4 +
 sci-libs/trilinos/Manifest                         |   1 -
 sci-libs/trilinos/trilinos-10.10.1.ebuild          | 124 ------------
 sci-libs/trilinos/trilinos-11.0.3.ebuild           |  12 +-
 sci-mathematics/algae/files/unbundle.patch         |  41 ----
 sci-mathematics/cadabra/ChangeLog                  |   5 +
 sci-mathematics/cadabra/Manifest                   |   3 -
 sci-mathematics/cadabra/cadabra-1.25.ebuild        |  89 ---------
 sci-mathematics/cadabra/cadabra-1.28.ebuild        |  87 --------
 sci-mathematics/cadabra/cadabra-1.29.ebuild        |  87 --------
 sci-mathematics/cadabra/cadabra-1.31.ebuild        |  14 +-
 sci-mathematics/cadabra/metadata.xml               |   4 +-
 sys-cluster/lustre/ChangeLog                       |   4 +
 sys-cluster/lustre/lustre-9999.ebuild              |   6 +-
 sys-cluster/lustre/metadata.xml                    |  20 +-
 x11-libs/xview-bin/ChangeLog                       |   3 +
 x11-libs/xview-bin/xview-bin-3.2_p1428.ebuild      |   2 +-
 55 files changed, 540 insertions(+), 684 deletions(-)