mkl-8.0.1.006: config scripts, license stuff

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@94 32389bae-6d03-0410-99cf-db05cde120eb

7 files changed, 23 insertions, 23 deletions

diff --git a/sci-libs/mkl/files/c-MKL.blas b/sci-libs/mkl/files/c-MKL.blas
index d8f89d0cc..a13c76bf7 100644
--- a/sci-libs/mkl/files/c-MKL.blas
+++ b/sci-libs/mkl/files/c-MKL.blas
@@ -6,10 +6,10 @@ setup() {
 MY_LIBDIR="$(get_libdir)"
 
 einfo "/usr/${MY_LIBDIR}/libcblas.so -> libmkl_blas.so"
-ln -sf blas/mkl/libmkl.so /usr/${MY_LIBDIR}/libcblas.so
+ln -sf blas/mkl/libmkl_blas.so /usr/${MY_LIBDIR}/libcblas.so
 
 einfo "/usr/${MY_LIBDIR}/libcblas.so.0 -> libmkl_blas.so"
-ln -sf blas/mkl/libmkl.so /usr/${MY_LIBDIR}/libcblas.so.0
+ln -sf blas/mkl/libmkl_blas.so /usr/${MY_LIBDIR}/libcblas.so.0
 
 einfo "/usr/${MY_LIBDIR}/libcblas.a -> libmkl_blas.a"
 ln -sf blas/mkl/libmkl_blas.a /usr/${MY_LIBDIR}/libcblas.a
diff --git a/sci-libs/mkl/files/c-MKL.lapack b/sci-libs/mkl/files/c-MKL.lapack
index f58f7a84d..cd1eb65a6 100644
--- a/sci-libs/mkl/files/c-MKL.lapack
+++ b/sci-libs/mkl/files/c-MKL.lapack
@@ -5,11 +5,11 @@ setup() {
 
 MY_LIBDIR="$(get_libdir)"
 
-einfo "/usr/${MY_LIBDIR}/libclapack.so -> libmkl.so"
-ln -sf lapack/mkl/libmkl.so /usr/${MY_LIBDIR}/libclapack.so
+einfo "/usr/${MY_LIBDIR}/libclapack.so -> libmkl_lapack.so"
+ln -sf lapack/mkl/libmkl_lapack.so /usr/${MY_LIBDIR}/libclapack.so
 
-einfo "/usr/${MY_LIBDIR}/libclapack.so.0 -> libmkl.so"
-ln -sf lapack/mkl/libmkl.so /usr/${MY_LIBDIR}/libclapack.so.0
+einfo "/usr/${MY_LIBDIR}/libclapack.so.0 -> libmkl_lapack.so"
+ln -sf lapack/mkl/libmkl_lapack.so /usr/${MY_LIBDIR}/libclapack.so.0
 
 einfo "/usr/${MY_LIBDIR}/libclapack.a -> libmkl_lapack.a"
 ln -sf lapack/mkl/libmkl_lapack.a /usr/${MY_LIBDIR}/libclapack.a
diff --git a/sci-libs/mkl/files/c-threaded-MKL.blas b/sci-libs/mkl/files/c-threaded-MKL.blas
index 4daeb77b6..58132b1d2 100644
--- a/sci-libs/mkl/files/c-threaded-MKL.blas
+++ b/sci-libs/mkl/files/c-threaded-MKL.blas
@@ -1,15 +1,15 @@
 CFLAGS="-I/usr/include/mkl"
-CLIBS="-L/usr/$(get_libdir)/blas/mkl -lmkl_blas -lpthread"
+CLIBS="-L/usr/$(get_libdir)/blas/threaded-mkl -lmkl_blas -lpthread"
 
 setup() {
 
 MY_LIBDIR="$(get_libdir)"
 
-einfo "/usr/${MY_LIBDIR}/libcblas.so -> libmkl.so"
-ln -sf blas/threaded-mkl/libmkl.so /usr/${MY_LIBDIR}/libcblas.so
+einfo "/usr/${MY_LIBDIR}/libcblas.so -> libmkl_blas.so"
+ln -sf blas/threaded-mkl/libmkl_blas.so /usr/${MY_LIBDIR}/libcblas.so
 
-einfo "/usr/${MY_LIBDIR}/libcblas.so.0 -> libmkl.so"
-ln -sf blas/threaded-mkl/libmkl.so /usr/${MY_LIBDIR}/libcblas.so.0
+einfo "/usr/${MY_LIBDIR}/libcblas.so.0 -> libmkl_blas.so"
+ln -sf blas/threaded-mkl/libmkl_blas.so /usr/${MY_LIBDIR}/libcblas.so.0
 
 einfo "/usr/${MY_LIBDIR}/libcblas.a -> libmkl_blas.a"
 ln -sf blas/threaded-mkl/libmkl_blas.a /usr/${MY_LIBDIR}/libcblas.a
diff --git a/sci-libs/mkl/files/c-threaded-MKL.lapack b/sci-libs/mkl/files/c-threaded-MKL.lapack
index 4a997958d..45463e41e 100644
--- a/sci-libs/mkl/files/c-threaded-MKL.lapack
+++ b/sci-libs/mkl/files/c-threaded-MKL.lapack
@@ -1,15 +1,15 @@
 CFLAGS="-I/usr/include/mkl"
-CLIBS="-L/usr/$(get_libdir)/lapack/mkl -lmkl_lapack -lpthread"
+CLIBS="-L/usr/$(get_libdir)/lapack/threaded-mkl -lmkl_lapack -lpthread"
 
 setup() {
 
 MY_LIBDIR="$(get_libdir)"
 
-einfo "/usr/${MY_LIBDIR}/libclapack.so -> libmkl.so"
-ln -sf lapack/threaded-mkl/libmkl.so /usr/${MY_LIBDIR}/libclapack.so
+einfo "/usr/${MY_LIBDIR}/libclapack.so -> libmkl_lapack.so"
+ln -sf lapack/threaded-mkl/libmkl_lapack.so /usr/${MY_LIBDIR}/libclapack.so
 
-einfo "/usr/${MY_LIBDIR}/libclapack.so.0 -> libmkl.so"
-ln -sf lapack/threaded-mkl/libmkl.so /usr/${MY_LIBDIR}/libclapack.so.0
+einfo "/usr/${MY_LIBDIR}/libclapack.so.0 -> libmkl_lapack.so"
+ln -sf lapack/threaded-mkl/libmkl_lapack.so /usr/${MY_LIBDIR}/libclapack.so.0
 
 einfo "/usr/${MY_LIBDIR}/libclapack.a -> libmkl_lapack.a"
 ln -sf lapack/threaded-mkl/libmkl_lapack.a /usr/${MY_LIBDIR}/libclapack.a
diff --git a/sci-libs/mkl/files/f77-MKL.blas b/sci-libs/mkl/files/f77-MKL.blas
index 5159eb5af..e68bcef50 100644
--- a/sci-libs/mkl/files/f77-MKL.blas
+++ b/sci-libs/mkl/files/f77-MKL.blas
@@ -1,16 +1,16 @@
-F77LIBS="-L/usr/$(get_libdir)/blas/mkl -lmkl"
+F77LIBS="-L/usr/$(get_libdir)/blas/mkl -lmkl_blas"
 
 setup() {
 
 MY_LIBDIR="$(get_libdir)"
 
-einfo "/usr/${MY_LIBDIR}/libblas.so -> libmkl.so"
-ln -sf blas/mkl/libmkl.so /usr/${MY_LIBDIR}/libblas.so
+einfo "/usr/${MY_LIBDIR}/libblas.so -> libmkl_blas.so"
+ln -sf blas/mkl/libmkl_blas.so /usr/${MY_LIBDIR}/libblas.so
 
-einfo "/usr/${MY_LIBDIR}/libblas.so.0 -> libmkl.so"
-ln -sf blas/mkl/libmkl.so /usr/${MY_LIBDIR}/libblas.so.0
+einfo "/usr/${MY_LIBDIR}/libblas.so.0 -> libmkl_blas.so"
+ln -sf blas/mkl/libmkl_blas.so /usr/${MY_LIBDIR}/libblas.so.0
 
-einfo "/usr/${MY_LIBDIR}/libblas.a -> libmkl_IKERN.a"
-ln -sf blas/mkl/libmkl_IKERN.a /usr/${MY_LIBDIR}/libblas.a
+einfo "/usr/${MY_LIBDIR}/libblas.a -> libmkl_blas.a"
+ln -sf blas/mkl/libmkl_blas.a /usr/${MY_LIBDIR}/libblas.a
 
 }
diff --git a/sci-libs/mkl/files/f77-threaded.blas b/sci-libs/mkl/files/f77-threaded-MKL.blas
index 265043261..265043261 100644
--- a/sci-libs/mkl/files/f77-threaded.blas
+++ b/sci-libs/mkl/files/f77-threaded-MKL.blas
diff --git a/sci-libs/mkl/files/f77-threaded.lapack b/sci-libs/mkl/files/f77-threaded-MKL.lapack
index c2bd43e2c..c2bd43e2c 100644
--- a/sci-libs/mkl/files/f77-threaded.lapack
+++ b/sci-libs/mkl/files/f77-threaded-MKL.lapack