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

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

commit:     2e5282927d502d2b1d688c6b0c86fb569d60b970
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 08:38:20 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 08:38:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2e528292

Merge branch 'master' into ccp4

* master:
  sync with gx86
  Added die to test.
  added cuda toolkit 5.5
  Added src_test().
  The "-DALLOCA_H" compiler flag appears to be unnecessary...
  More cleanup. Beautify!
  Added examples use flag.
  Version bump to sys-cluster/charm-6.5.0.
  sci-chemistry/freeon improved, the ebuild of the latest snapshot added. sci-chemistry/nwchem bumped to 6.3, building docs allowed.

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

Conflicts:
	dev-util/nvidia-cuda-toolkit/ChangeLog
	dev-util/nvidia-cuda-toolkit/metadata.xml
	dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
	sys-cluster/charm/ChangeLog
	sys-cluster/charm/charm-6.5.0.ebuild


 dev-lang/ispc/ChangeLog              |  3 +++
 dev-lang/ispc/ispc-9999.ebuild       | 13 ++++---------
 sys-cluster/charm/ChangeLog          |  3 +++
 sys-cluster/charm/charm-6.5.0.ebuild |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)