| 1 |
commit: c499fcaaf0f8d7c2eb25f3530cfa258bd066bc75 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 24 07:54:31 2012 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 24 07:54:31 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c499fcaa |
| 7 |
|
| 8 |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci |
| 9 |
|
| 10 |
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci: |
| 11 |
making cblas-reference OS X aware |
| 12 |
sci-libs/gsl: Fixed gsl-config/pkg-config issues |
| 13 |
sci-libs/atlas: Version bump |
| 14 |
app-doc/scalapack-docs: Bumping to match scalapack-2 which include blacs quick reference sheets |
| 15 |
sci-libs/mpiblacs: Removed old, blocking scalapack > 2 |
| 16 |
sci-libs/scalapack: Version bump. CMake based building, BLACS is now included with ScaLAPACK |
| 17 |
|
| 18 |
Conflicts: |
| 19 |
sci-libs/gsl/ChangeLog |
| 20 |
sci-libs/gsl/gsl-1.15-r2.ebuild |
| 21 |
|
| 22 |
|
| 23 |
app-doc/scalapack-docs/ChangeLog | 8 +- |
| 24 |
app-doc/scalapack-docs/Manifest | 2 +- |
| 25 |
...k-docs-1.8.ebuild => scalapack-docs-2.0.ebuild} | 14 +- |
| 26 |
sci-libs/atlas/ChangeLog | 6 + |
| 27 |
sci-libs/atlas/Manifest | 2 +- |
| 28 |
.../{atlas-3.9.67.ebuild => atlas-3.9.68.ebuild} | 0 |
| 29 |
sci-libs/cblas-reference/ChangeLog | 4 + |
| 30 |
.../cblas-reference-20110218.ebuild | 36 +++-- |
| 31 |
sci-libs/gsl/ChangeLog | 6 +- |
| 32 |
sci-libs/gsl/files/gsl-1.15-cblas.patch | 88 +++++++++-- |
| 33 |
sci-libs/gsl/files/gsl-1.15-pkgconfig.patch | 16 -- |
| 34 |
sci-libs/gsl/gsl-1.15-r2.ebuild | 5 +- |
| 35 |
sci-libs/mpiblacs/ChangeLog | 6 +- |
| 36 |
sci-libs/mpiblacs/mpiblacs-1.1-r1.ebuild | 5 +- |
| 37 |
sci-libs/mpiblacs/mpiblacs-1.1.ebuild | 111 ------------- |
| 38 |
sci-libs/scalapack/ChangeLog | 8 +- |
| 39 |
sci-libs/scalapack/Manifest | 1 + |
| 40 |
.../scalapack/files/scalapack-2.0.1-link.patch | 18 ++ |
| 41 |
.../files/scalapack-2.0.1-multipledefs.patch | 163 ++++++++++++++++++++ |
| 42 |
sci-libs/scalapack/scalapack-2.0.1.ebuild | 72 +++++++++ |
| 43 |
20 files changed, 400 insertions(+), 171 deletions(-) |
| 44 |
|
| 45 |
diff --cc sci-libs/gsl/ChangeLog |
| 46 |
index b8c6407,0f7636d..327c24a |
| 47 |
--- a/sci-libs/gsl/ChangeLog |
| 48 |
+++ b/sci-libs/gsl/ChangeLog |
| 49 |
@@@ -1,10 -1,11 +1,14 @@@ |
| 50 |
# ChangeLog for sci-libs/gsl |
| 51 |
--# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 52 |
++# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $ |
| 54 |
|
| 55 |
+ 23 Feb 2012; Sébastien Fabbro <bicatali@g.o> gsl-1.15-r2.ebuild, |
| 56 |
+ files/gsl-1.15-cblas.patch, -files/gsl-1.15-pkgconfig.patch: |
| 57 |
+ Fixed gsl-config/pkg-config issues |
| 58 |
+ |
| 59 |
+ 23 Feb 2012; Justin Lecher <jlec@g.o> gsl-1.15-r2.ebuild: |
| 60 |
+ Correct usage of autotools-eclass, prevents double call of elibtoolize |
| 61 |
+ |
| 62 |
*gsl-1.15-r2 (11 Oct 2011) |
| 63 |
|
| 64 |
11 Oct 2011; Justin Lecher <jlec@g.o> -gsl-1.15-r1.ebuild, |
Archives