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

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

commit:     4a0cd7b7880db8bceb9a2c757d2dbce678822e6a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 10:16:53 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 10:16:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4a0cd7b7

Merge branch 'master' into ccp4

* master:
  added ~amd64-linux + clean up
  update minimal versions of some dependencies for scilab
  replacing patch with epatch
  using versioned patch for sys-cluster/modules, too
  now using versioned patches
  Fixed SRC_URI.
  implemented clean fix for changed errorline API in TCL
  relaced custom CURL with stock version
  minor fixes to comply with Gentoo coding style
  initial commit
  sync with gx86
  sci-chemistry/coot: Update pc patches
  sci-chemistry/coot: Fix PYTHON() -> ${EPYTHON} for new eclasses
  added fix for recent glibc with PGI
  added PGI ebuild
  added updated Manifest
  fixed compilation of modules with recent tcl

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

Conflicts:
	sci-chemistry/coot/ChangeLog
	sci-chemistry/coot/coot-9999.ebuild


 dev-java/jcip-annotations/ChangeLog                |    3 +
 .../jcip-annotations-1.0-r1.ebuild                 |    2 +-
 dev-lang/pgi/Manifest                              |    1 +
 dev-lang/pgi/files/pgi-13.5-glibc.patch            |   31 +
 dev-lang/pgi/files/pgi-13.5-terminal.patch         |   39 +
 {dev-util/amdapp => dev-lang/pgi}/metadata.xml     |    7 +-
 dev-lang/pgi/pgi-13.5.ebuild                       |  115 +++
 licenses/PGI                                       |  262 +++++
 sci-chemistry/coot/ChangeLog                       |    5 +
 sci-chemistry/coot/Manifest                        |    2 +-
 sci-chemistry/coot/coot-9999.ebuild                |   20 +-
 sci-chemistry/coot/files/9999-clipper-config.patch |   17 -
 sci-chemistry/coot/files/9999-goocanvas.patch      |   25 -
 sci-chemistry/coot/files/9999-mmdb-config.patch    |   18 -
 sci-chemistry/coot/files/9999-pc.patch             | 1040 ++++++++++++++++++++
 sci-chemistry/coot/files/9999-ssm.patch            |   56 --
 sci-chemistry/gromacs/ChangeLog                    |    3 +
 sci-chemistry/gromacs/gromacs-4.6.9999.ebuild      |    7 +-
 sci-chemistry/mdsctk/ChangeLog                     |   13 +
 sci-chemistry/mdsctk/Manifest                      |    1 +
 sci-chemistry/mdsctk/mdsctk-1.0.0.ebuild           |   51 +
 .../mdsctk}/metadata.xml                           |    3 +
 sci-mathematics/scilab/scilab-5.4.1.ebuild         |    6 +-
 sys-cluster/modules/Manifest                       |    2 +-
 .../modules/files/modules-3.2.9c-errorline.patch   |   15 +
 sys-cluster/modules/modules-3.2.9c-r1.ebuild       |    6 +-
 26 files changed, 1609 insertions(+), 141 deletions(-)