19 files changed, 360 insertions, 2091 deletions

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 518c6ef66392..b3ef0bac0b5d 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sci-libs/mkl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.15 2007/07/02 15:26:36 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.16 2007/10/10 12:41:47 bicatali Exp $
+
+*mkl-9.1.023 (10 Oct 2007)
+
+  10 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> -files/blas.list,
+  +files/blas.pc.in, -files/cblas.list, +files/cblas.pc.in,
+  -files/eselect.blas, -files/eselect.cblas, -files/eselect.lapack,
+  -files/lapack.list, +files/lapack.pc.in, metadata.xml, -mkl-5.2.ebuild,
+  -mkl-8.1.014.ebuild, -mkl-9.0.018.ebuild, +mkl-9.1.023.ebuild:
+  Version bump. Compatible with new style virtuals, pkg-config. Major ebuild
+  redesign again, as for all mkl major version. Remove all old versions, not
+  compatible with new style virtual. The stable mkl-5.2 was buggy, and no
+  one around to maintain it.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> mkl-5.2.ebuild,
   mkl-8.1.014.ebuild, mkl-9.0.018.ebuild:
diff --git a/sci-libs/mkl/files/blas.list b/sci-libs/mkl/files/blas.list
deleted file mode 100644
index f628dfda1d17..000000000000
--- a/sci-libs/mkl/files/blas.list
+++ /dev/null
@@ -1,149 +0,0 @@
-caxpy_
-ccopy_
-cdotc_
-cdotu_
-cgbmv_
-cgemm_
-cgemv_
-cgerc_
-cgeru_
-chbmv_
-chemm_
-chemv_
-cher_
-cher2_
-cher2k_
-cherk_
-chpmv_
-chpr_
-chpr2_
-crotg_
-cscal_
-csrot_
-csscal_
-cswap_
-csymm_
-csyr2k_
-csyrk_
-ctbmv_
-ctbsv_
-ctpmv_
-ctpsv_
-ctrmm_
-ctrmv_
-ctrsm_
-ctrsv_
-dasum_
-daxpy_
-dcabs1_
-dcopy_
-ddot_
-dgbmv_
-dgemm_
-dgemv_
-dger_
-dnrm2_
-drot_
-drotg_
-drotm_
-drotmg_
-dsbmv_
-dscal_
-dsdot_
-dspmv_
-dspr_
-dspr2_
-dswap_
-dsymm_
-dsymv_
-dsyr_
-dsyr2_
-dsyr2k_
-dsyrk_
-dtbmv_
-dtbsv_
-dtpmv_
-dtpsv_
-dtrmm_
-dtrmv_
-dtrsm_
-dtrsv_
-dzasum_
-dznrm2_
-icamax_
-idamax_
-isamax_
-izamax_
-lsame_
-sasum_
-saxpy_
-scasum_
-scnrm2_
-scopy_
-sdot_
-sdsdot_
-sgbmv_
-sgemm_
-sgemv_
-sger_
-snrm2_
-srot_
-srotg_
-srotm_
-srotmg_
-ssbmv_
-sscal_
-sspmv_
-sspr_
-sspr2_
-sswap_
-ssymm_
-ssymv_
-ssyr_
-ssyr2_
-ssyr2k_
-ssyrk_
-stbmv_
-stbsv_
-stpmv_
-stpsv_
-strmm_
-strmv_
-strsm_
-strsv_
-xerbla_
-zaxpy_
-zcopy_
-zdotc_
-zdotu_
-zdrot_
-zdscal_
-zgbmv_
-zgemm_
-zgemv_
-zgerc_
-zgeru_
-zhbmv_
-zhemm_
-zhemv_
-zher_
-zher2_
-zher2k_
-zherk_
-zhpmv_
-zhpr_
-zhpr2_
-zrotg_
-zscal_
-zswap_
-zsymm_
-zsyr2k_
-zsyrk_
-ztbmv_
-ztbsv_
-ztpmv_
-ztpsv_
-ztrmm_
-ztrmv_
-ztrsm_
-ztrsv_
diff --git a/sci-libs/mkl/files/blas.pc.in b/sci-libs/mkl/files/blas.pc.in
new file mode 100644
index 000000000000..b9bd2e3b3c1c
--- /dev/null
+++ b/sci-libs/mkl/files/blas.pc.in
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/@LIBDIR@
+includedir=/usr/include
+
+Name: blas
+Description: MKL implementations of the F77 Basic Linear Algebra Subroutines
+Version: @PV@
+URL: http://developer.intel.com/software/products/mkl/
+Libs: -L${libdir} -lblas @EXTLIBS@
diff --git a/sci-libs/mkl/files/cblas.list b/sci-libs/mkl/files/cblas.list
deleted file mode 100644
index 96e72bd0431a..000000000000
--- a/sci-libs/mkl/files/cblas.list
+++ /dev/null
@@ -1,148 +0,0 @@
-cblas_caxpy
-cblas_ccopy
-cblas_cdotc
-cblas_cdotu
-cblas_cgbmv
-cblas_cgemm
-cblas_cgemv
-cblas_cgerc
-cblas_cgeru
-cblas_chbmv
-cblas_chemm
-cblas_chemv
-cblas_cher
-cblas_cher2
-cblas_cher2k
-cblas_cherk
-cblas_chpmv
-cblas_chpr
-cblas_chpr2
-cblas_crotg
-cblas_cscal
-cblas_csrot
-cblas_csscal
-cblas_cswap
-cblas_csymm
-cblas_csyr2k
-cblas_csyrk
-cblas_ctbmv
-cblas_ctbsv
-cblas_ctpmv
-cblas_ctpsv
-cblas_ctrmm
-cblas_ctrmv
-cblas_ctrsm
-cblas_ctrsv
-cblas_dasum
-cblas_daxpy
-cblas_dcopy
-cblas_ddot
-cblas_dgbmv
-cblas_dgemm
-cblas_dgemv
-cblas_dger
-cblas_dnrm2
-cblas_drot
-cblas_drotg
-cblas_drotm
-cblas_drotmg
-cblas_dsbmv
-cblas_dscal
-cblas_dsdot
-cblas_dspmv
-cblas_dspr
-cblas_dspr2
-cblas_dswap
-cblas_dsymm
-cblas_dsymv
-cblas_dsyr
-cblas_dsyr2
-cblas_dsyr2k
-cblas_dsyrk
-cblas_dtbmv
-cblas_dtbsv
-cblas_dtpmv
-cblas_dtpsv
-cblas_dtrmm
-cblas_dtrmv
-cblas_dtrsm
-cblas_dtrsv
-cblas_dzasum
-cblas_dznrm2
-cblas_errprn
-cblas_icamax
-cblas_idamax
-cblas_isamax
-cblas_izamax
-cblas_sasum
-cblas_saxpy
-cblas_scasum
-cblas_scnrm2
-cblas_scopy
-cblas_sdot
-cblas_sdsdot
-cblas_sgbmv
-cblas_sgemm
-cblas_sgemv
-cblas_sger
-cblas_snrm2
-cblas_srot
-cblas_srotg
-cblas_srotm
-cblas_srotmg
-cblas_ssbmv
-cblas_sscal
-cblas_sspmv
-cblas_sspr
-cblas_sspr2
-cblas_sswap
-cblas_ssymm
-cblas_ssymv
-cblas_ssyr
-cblas_ssyr2
-cblas_ssyr2k
-cblas_ssyrk
-cblas_stbmv
-cblas_stbsv
-cblas_stpmv
-cblas_stpsv
-cblas_strmm
-cblas_strmv
-cblas_strsm
-cblas_strsv
-cblas_xerbla
-cblas_zaxpy
-cblas_zcopy
-cblas_zdotc
-cblas_zdotu
-cblas_zdrot
-cblas_zdscal
-cblas_zgbmv
-cblas_zgemm
-cblas_zgemv
-cblas_zgerc
-cblas_zgeru
-cblas_zhbmv
-cblas_zhemm
-cblas_zhemv
-cblas_zher
-cblas_zher2
-cblas_zher2k
-cblas_zherk
-cblas_zhpmv
-cblas_zhpr
-cblas_zhpr2
-cblas_zrotg
-cblas_zscal
-cblas_zswap
-cblas_zsymm
-cblas_zsyr2k
-cblas_zsyrk
-cblas_ztbmv
-cblas_ztbsv
-cblas_ztpmv
-cblas_ztpsv
-cblas_ztrmm
-cblas_ztrmv
-cblas_ztrsm
-cblas_ztrsv
diff --git a/sci-libs/mkl/files/cblas.pc.in b/sci-libs/mkl/files/cblas.pc.in
new file mode 100644
index 000000000000..eea3d786f9d9
--- /dev/null
+++ b/sci-libs/mkl/files/cblas.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/@LIBDIR@
+includedir=/usr/include
+
+Name: cblas
+Description: MKL implementations of the C Basic Linear Algebra Subroutines
+Version: @PV@
+URL: http://developer.intel.com/software/products/mkl/
+Libs: -L${libdir} -lcblas @EXTLIBS@
+Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/digest-mkl-5.2 b/sci-libs/mkl/files/digest-mkl-5.2
deleted file mode 100644
index 4ca3dee80f82..000000000000
--- a/sci-libs/mkl/files/digest-mkl-5.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 28ebe97bba4458fff7025c53969e3c0c mkl52lin_e.tar 32296960
-RMD160 9897261583e7c1a6c1cc43e15e994a53ac84b43e mkl52lin_e.tar 32296960
-SHA256 92099f4f3673e66df20dda7a38bbd09bf850dbbe0a0ec0e1b9c28ee544b08640 mkl52lin_e.tar 32296960
diff --git a/sci-libs/mkl/files/digest-mkl-8.1.014 b/sci-libs/mkl/files/digest-mkl-8.1.014
deleted file mode 100644
index 61b5b357182a..000000000000
--- a/sci-libs/mkl/files/digest-mkl-8.1.014
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c5af2e5a5cacf7f07cf0ad3c06e36497 l_mkl_p_8.1.014.tgz 114683047
-RMD160 e1dfcb3222c493955ec0a0f05368fd26af2767f9 l_mkl_p_8.1.014.tgz 114683047
-SHA256 77abc3622aaae5154a9636093259ee82f8b57d1b9d438ab10596eefbc4b2dc6c l_mkl_p_8.1.014.tgz 114683047
diff --git a/sci-libs/mkl/files/digest-mkl-9.0.018 b/sci-libs/mkl/files/digest-mkl-9.0.018
deleted file mode 100644
index 775ce9b5061b..000000000000
--- a/sci-libs/mkl/files/digest-mkl-9.0.018
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4780d30b60e8410427fb3736a929f8bd l_mkl_p_9.0.018.tgz 142125233
-RMD160 301566c09298ede7336224d2d33f07103cac1ffe l_mkl_p_9.0.018.tgz 142125233
-SHA256 28f46ec621e54dac7ee9d4ddea448b80f8c8dfb7ed047d1f7166142f16755384 l_mkl_p_9.0.018.tgz 142125233
diff --git a/sci-libs/mkl/files/digest-mkl-9.1.023 b/sci-libs/mkl/files/digest-mkl-9.1.023
new file mode 100644
index 000000000000..d17705aaa545
--- /dev/null
+++ b/sci-libs/mkl/files/digest-mkl-9.1.023
@@ -0,0 +1,6 @@
+MD5 c302a2b4700666d3272b428f7b7b5a9d l_mkl_enh_p_9.1.023.tgz 316915220
+RMD160 afdcb8ef28053e9ee5b1a3f8b9e6126c58b94f4b l_mkl_enh_p_9.1.023.tgz 316915220
+SHA256 609ba57261b4959dfc8e6e56959f93ff7dba7b568ca5c80e09f4013df0207106 l_mkl_enh_p_9.1.023.tgz 316915220
+MD5 5d484063a5d416cdb0c1c08b79deeb4f l_mkl_p_9.1.023.tgz 155907883
+RMD160 f5d34a170c77fe9929daf6a83bade6d845ada2ad l_mkl_p_9.1.023.tgz 155907883
+SHA256 7315e35a48b8cbe5af4cdcd24b2ccbd3971048b40e965ccaf9b4d655d98bdecd l_mkl_p_9.1.023.tgz 155907883
diff --git a/sci-libs/mkl/files/eselect.blas b/sci-libs/mkl/files/eselect.blas
deleted file mode 100644
index 7a63e53f6349..000000000000
--- a/sci-libs/mkl/files/eselect.blas
+++ /dev/null
@@ -1,3 +0,0 @@
-blas/mkl/libblas.so /usr/@LIBDIR@/libblas.so
-blas/mkl/libblas.so.0 /usr/@LIBDIR@/libblas.so.0
-blas/mkl/libblas.a /usr/@LIBDIR@/libblas.a
diff --git a/sci-libs/mkl/files/eselect.cblas b/sci-libs/mkl/files/eselect.cblas
deleted file mode 100644
index 27127cceefcf..000000000000
--- a/sci-libs/mkl/files/eselect.cblas
+++ /dev/null
@@ -1,3 +0,0 @@
-mkl/mkl_cblas.h /usr/include/cblas.h
-blas/mkl/libcblas.so.0 /usr/@LIBDIR@/libcblas.so
-blas/mkl/libcblas.so /usr/@LIBDIR@/libcblas.so.0
diff --git a/sci-libs/mkl/files/eselect.lapack b/sci-libs/mkl/files/eselect.lapack
deleted file mode 100644
index 7385a69defbe..000000000000
--- a/sci-libs/mkl/files/eselect.lapack
+++ /dev/null
@@ -1,3 +0,0 @@
-lapack/mkl/liblapack.so /usr/@LIBDIR@/liblapack.so
-lapack/mkl/liblapack.so.0 /usr/@LIBDIR@/liblapack.so.0
-lapack/mkl/liblapack.a /usr/@LIBDIR@/liblapack.a
diff --git a/sci-libs/mkl/files/lapack.list b/sci-libs/mkl/files/lapack.list
deleted file mode 100644
index 982c95e68c92..000000000000
--- a/sci-libs/mkl/files/lapack.list
+++ /dev/null
@@ -1,1291 +0,0 @@
-cbdsqr_
-cgbbrd_
-cgbcon_
-cgbequ_
-cgbrfs_
-cgbsv_
-cgbsvx_
-cgbtf2_
-cgbtrf_
-cgbtrs_
-cgebak_
-cgebal_
-cgebd2_
-cgebrd_
-cgecon_
-cgeequ_
-cgees_
-cgeesx_
-cgeev_
-cgeevx_
-cgegs_
-cgegv_
-cgehd2_
-cgehrd_
-cgelq2_
-cgelqf_
-cgels_
-cgelsd_
-cgelss_
-cgelsx_
-cgelsy_
-cgeql2_
-cgeqlf_
-cgeqp3_
-cgeqpf_
-cgeqr2_
-cgeqrf_
-cgerfs_
-cgerq2_
-cgerqf_
-cgesc2_
-cgesdd_
-cgesv_
-cgesvd_
-cgesvx_
-cgetc2_
-cgetf2_
-cgetrf_
-cgetri_
-cgetrs_
-cggbak_
-cggbal_
-cgges_
-cggesx_
-cggev_
-cggevx_
-cggglm_
-cgghrd_
-cgglse_
-cggqrf_
-cggrqf_
-cggsvd_
-cggsvp_
-cgtcon_
-cgtrfs_
-cgtsv_
-cgtsvx_
-cgttrf_
-cgttrs_
-cgtts2_
-chbev_
-chbevd_
-chbevx_
-chbgst_
-chbgv_
-chbgvd_
-chbgvx_
-chbtrd_
-checon_
-cheev_
-cheevd_
-cheevr_
-cheevx_
-chegs2_
-chegst_
-chegv_
-chegvd_
-chegvx_
-cherfs_
-chesv_
-chesvx_
-chetd2_
-chetf2_
-chetrd_
-chetrf_
-chetri_
-chetrs_
-chgeqz_
-chpcon_
-chpev_
-chpevd_
-chpevx_
-chpgst_
-chpgv_
-chpgvd_
-chpgvx_
-chprfs_
-chpsv_
-chpsvx_
-chptrd_
-chptrf_
-chptri_
-chptrs_
-chsein_
-chseqr_
-clabrd_
-clacgv_
-clacon_
-clacp2_
-clacpy_
-clacrm_
-clacrt_
-cladiv_
-claed0_
-claed7_
-claed8_
-claein_
-claesy_
-claev2_
-clags2_
-clagtm_
-clahef_
-clahqr_
-clahrd_
-claic1_
-clals0_
-clalsa_
-clalsd_
-clangb_
-clange_
-clangt_
-clanhb_
-clanhe_
-clanhp_
-clanhs_
-clanht_
-clansb_
-clansp_
-clansy_
-clantb_
-clantp_
-clantr_
-clapll_
-clapmt_
-claqgb_
-claqge_
-claqhb_
-claqhe_
-claqhp_
-claqp2_
-claqps_
-claqsb_
-claqsp_
-claqsy_
-clar1v_
-clar2v_
-clarcm_
-clarf_
-clarfb_
-clarfg_
-clarft_
-clarfx_
-clargv_
-clarnv_
-clarrv_
-clartg_
-clartv_
-clarz_
-clarzb_
-clarzt_
-clascl_
-claset_
-clasr_
-classq_
-claswp_
-clasyf_
-clatbs_
-clatdf_
-clatps_
-clatrd_
-clatrs_
-clatrz_
-clatzm_
-clauu2_
-clauum_
-cpbcon_
-cpbequ_
-cpbrfs_
-cpbstf_
-cpbsv_
-cpbsvx_
-cpbtf2_
-cpbtrf_
-cpbtrs_
-cpocon_
-cpoequ_
-cporfs_
-cposv_
-cposvx_
-cpotf2_
-cpotrf_
-cpotri_
-cpotrs_
-cppcon_
-cppequ_
-cpprfs_
-cppsv_
-cppsvx_
-cpptrf_
-cpptri_
-cpptrs_
-cptcon_
-cpteqr_
-cptrfs_
-cptsv_
-cptsvx_
-cpttrf_
-cpttrs_
-cptts2_
-crot_
-cspcon_
-cspmv_
-cspr_
-csprfs_
-cspsv_
-cspsvx_
-csptrf_
-csptri_
-csptrs_
-csrot_
-csrscl_
-cstedc_
-cstegr_
-cstein_
-csteqr_
-csycon_
-csymv_
-csyr_
-csyrfs_
-csysv_
-csysvx_
-csytf2_
-csytrf_
-csytri_
-csytrs_
-ctbcon_
-ctbrfs_
-ctbtrs_
-ctgevc_
-ctgex2_
-ctgexc_
-ctgsen_
-ctgsja_
-ctgsna_
-ctgsy2_
-ctgsyl_
-ctpcon_
-ctprfs_
-ctptri_
-ctptrs_
-ctrcon_
-ctrevc_
-ctrexc_
-ctrrfs_
-ctrsen_
-ctrsna_
-ctrsyl_
-ctrti2_
-ctrtri_
-ctrtrs_
-ctzrqf_
-ctzrzf_
-cung2l_
-cung2r_
-cungbr_
-cunghr_
-cungl2_
-cunglq_
-cungql_
-cungqr_
-cungr2_
-cungrq_
-cungtr_
-cunm2l_
-cunm2r_
-cunmbr_
-cunmhr_
-cunml2_
-cunmlq_
-cunmql_
-cunmqr_
-cunmr2_
-cunmr3_
-cunmrq_
-cunmrz_
-cunmtr_
-cupgtr_
-cupmtr_
-dbdsdc_
-dbdsqr_
-ddisna_
-dgbbrd_
-dgbcon_
-dgbequ_
-dgbrfs_
-dgbsv_
-dgbsvx_
-dgbtf2_
-dgbtrf_
-dgbtrs_
-dgebak_
-dgebal_
-dgebd2_
-dgebrd_
-dgecon_
-dgeequ_
-dgees_
-dgeesx_
-dgeev_
-dgeevx_
-dgegs_
-dgegv_
-dgehd2_
-dgehrd_
-dgelq2_
-dgelqf_
-dgels_
-dgelsd_
-dgelss_
-dgelsx_
-dgelsy_
-dgeql2_
-dgeqlf_
-dgeqp3_
-dgeqpf_
-dgeqr2_
-dgeqrf_
-dgerfs_
-dgerq2_
-dgerqf_
-dgesc2_
-dgesdd_
-dgesv_
-dgesvd_
-dgesvx_
-dgetc2_
-dgetf2_
-dgetrf_
-dgetri_
-dgetrs_
-dggbak_
-dggbal_
-dgges_
-dggesx_
-dggev_
-dggevx_
-dggglm_
-dgghrd_
-dgglse_
-dggqrf_
-dggrqf_
-dggsvd_
-dggsvp_
-dgtcon_
-dgtrfs_
-dgtsv_
-dgtsvx_
-dgttrf_
-dgttrs_
-dgtts2_
-dhgeqz_
-dhsein_
-dhseqr_
-dlabad_
-dlabrd_
-dlacon_
-dlacpy_
-dladiv_
-dlae2_
-dlaebz_
-dlaed0_
-dlaed1_
-dlaed2_
-dlaed3_
-dlaed4_
-dlaed5_
-dlaed6_
-dlaed7_
-dlaed8_
-dlaed9_
-dlaeda_
-dlaein_
-dlaev2_
-dlaexc_
-dlag2_
-dlags2_
-dlagtf_
-dlagtm_
-dlagts_
-dlagv2_
-dlahqr_
-dlahrd_
-dlaic1_
-dlaln2_
-dlals0_
-dlalsa_
-dlalsd_
-dlamch_
-dlamrg_
-dlangb_
-dlange_
-dlangt_
-dlanhs_
-dlansb_
-dlansp_
-dlanst_
-dlansy_
-dlantb_
-dlantp_
-dlantr_
-dlanv2_
-dlapll_
-dlapmt_
-dlapy2_
-dlapy3_
-dlaqgb_
-dlaqge_
-dlaqp2_
-dlaqps_
-dlaqsb_
-dlaqsp_
-dlaqsy_
-dlaqtr_
-dlar1v_
-dlar2v_
-dlarf_
-dlarfb_
-dlarfg_
-dlarft_
-dlarfx_
-dlargv_
-dlarnv_
-dlarrb_
-dlarre_
-dlarrf_
-dlarrv_
-dlartg_
-dlartv_
-dlaruv_
-dlarz_
-dlarzb_
-dlarzt_
-dlas2_
-dlascl_
-dlasd0_
-dlasd1_
-dlasd2_
-dlasd3_
-dlasd4_
-dlasd5_
-dlasd6_
-dlasd7_
-dlasd8_
-dlasd9_
-dlasda_
-dlasdq_
-dlasdt_
-dlaset_
-dlasq1_
-dlasq2_
-dlasq3_
-dlasq4_
-dlasq5_
-dlasq6_
-dlasr_
-dlasrt_
-dlassq_
-dlasv2_
-dlaswp_
-dlasy2_
-dlasyf_
-dlatbs_
-dlatdf_
-dlatps_
-dlatrd_
-dlatrs_
-dlatrz_
-dlatzm_
-dlauu2_
-dlauum_
-dopgtr_
-dopmtr_
-dorg2l_
-dorg2r_
-dorgbr_
-dorghr_
-dorgl2_
-dorglq_
-dorgql_
-dorgqr_
-dorgr2_
-dorgrq_
-dorgtr_
-dorm2l_
-dorm2r_
-dormbr_
-dormhr_
-dorml2_
-dormlq_
-dormql_
-dormqr_
-dormr2_
-dormr3_
-dormrq_
-dormrz_
-dormtr_
-dpbcon_
-dpbequ_
-dpbrfs_
-dpbstf_
-dpbsv_
-dpbsvx_
-dpbtf2_
-dpbtrf_
-dpbtrs_
-dpocon_
-dpoequ_
-dporfs_
-dposv_
-dposvx_
-dpotf2_
-dpotrf_
-dpotri_
-dpotrs_
-dppcon_
-dppequ_
-dpprfs_
-dppsv_
-dppsvx_
-dpptrf_
-dpptri_
-dpptrs_
-dptcon_
-dpteqr_
-dptrfs_
-dptsv_
-dptsvx_
-dpttrf_
-dpttrs_
-dptts2_
-drscl_
-dsbev_
-dsbevd_
-dsbevx_
-dsbgst_
-dsbgv_
-dsbgvd_
-dsbgvx_
-dsbtrd_
-dsecnd_
-dspcon_
-dspev_
-dspevd_
-dspevx_
-dspgst_
-dspgv_
-dspgvd_
-dspgvx_
-dsprfs_
-dspsv_
-dspsvx_
-dsptrd_
-dsptrf_
-dsptri_
-dsptrs_
-dstebz_
-dstedc_
-dstegr_
-dstein_
-dsteqr_
-dsterf_
-dstev_
-dstevd_
-dstevr_
-dstevx_
-dsycon_
-dsyev_
-dsyevd_
-dsyevr_
-dsyevx_
-dsygs2_
-dsygst_
-dsygv_
-dsygvd_
-dsygvx_
-dsyrfs_
-dsysv_
-dsysvx_
-dsytd2_
-dsytf2_
-dsytrd_
-dsytrf_
-dsytri_
-dsytrs_
-dtbcon_
-dtbrfs_
-dtbtrs_
-dtgevc_
-dtgex2_
-dtgexc_
-dtgsen_
-dtgsja_
-dtgsna_
-dtgsy2_
-dtgsyl_
-dtpcon_
-dtprfs_
-dtptri_
-dtptrs_
-dtrcon_
-dtrevc_
-dtrexc_
-dtrrfs_
-dtrsen_
-dtrsna_
-dtrsyl_
-dtrti2_
-dtrtri_
-dtrtrs_
-dtzrqf_
-dtzrzf_
-dzsum1_
-icmax1_
-ieeeck_
-ilaenv_
-izmax1_
-lsame_
-lsamen_
-sbdsdc_
-sbdsqr_
-scsum1_
-sdisna_
-second_
-sgbbrd_
-sgbcon_
-sgbequ_
-sgbrfs_
-sgbsv_
-sgbsvx_
-sgbtf2_
-sgbtrf_
-sgbtrs_
-sgebak_
-sgebal_
-sgebd2_
-sgebrd_
-sgecon_
-sgeequ_
-sgees_
-sgeesx_
-sgeev_
-sgeevx_
-sgegs_
-sgegv_
-sgehd2_
-sgehrd_
-sgelq2_
-sgelqf_
-sgels_
-sgelsd_
-sgelss_
-sgelsx_
-sgelsy_
-sgeql2_
-sgeqlf_
-sgeqp3_
-sgeqpf_
-sgeqr2_
-sgeqrf_
-sgerfs_
-sgerq2_
-sgerqf_
-sgesc2_
-sgesdd_
-sgesv_
-sgesvd_
-sgesvx_
-sgetc2_
-sgetf2_
-sgetrf_
-sgetri_
-sgetrs_
-sggbak_
-sggbal_
-sgges_
-sggesx_
-sggev_
-sggevx_
-sggglm_
-sgghrd_
-sgglse_
-sggqrf_
-sggrqf_
-sggsvd_
-sggsvp_
-sgtcon_
-sgtrfs_
-sgtsv_
-sgtsvx_
-sgttrf_
-sgttrs_
-sgtts2_
-shgeqz_
-shsein_
-shseqr_
-slabad_
-slabrd_
-slacon_
-slacpy_
-sladiv_
-slae2_
-slaebz_
-slaed0_
-slaed1_
-slaed2_
-slaed3_
-slaed4_
-slaed5_
-slaed6_
-slaed7_
-slaed8_
-slaed9_
-slaeda_
-slaein_
-slaev2_
-slaexc_
-slag2_
-slags2_
-slagtf_
-slagtm_
-slagts_
-slagv2_
-slahqr_
-slahrd_
-slaic1_
-slaln2_
-slals0_
-slalsa_
-slalsd_
-slamch_
-slamrg_
-slangb_
-slange_
-slangt_
-slanhs_
-slansb_
-slansp_
-slanst_
-slansy_
-slantb_
-slantp_
-slantr_
-slanv2_
-slapll_
-slapmt_
-slapy2_
-slapy3_
-slaqgb_
-slaqge_
-slaqp2_
-slaqps_
-slaqsb_
-slaqsp_
-slaqsy_
-slaqtr_
-slar1v_
-slar2v_
-slarf_
-slarfb_
-slarfg_
-slarft_
-slarfx_
-slargv_
-slarnv_
-slarrb_
-slarre_
-slarrf_
-slarrv_
-slartg_
-slartv_
-slaruv_
-slarz_
-slarzb_
-slarzt_
-slas2_
-slascl_
-slasd0_
-slasd1_
-slasd2_
-slasd3_
-slasd4_
-slasd5_
-slasd6_
-slasd7_
-slasd8_
-slasd9_
-slasda_
-slasdq_
-slasdt_
-slaset_
-slasq1_
-slasq2_
-slasq3_
-slasq4_
-slasq5_
-slasq6_
-slasr_
-slasrt_
-slassq_
-slasv2_
-slaswp_
-slasy2_
-slasyf_
-slatbs_
-slatdf_
-slatps_
-slatrd_
-slatrs_
-slatrz_
-slatzm_
-slauu2_
-slauum_
-sopgtr_
-sopmtr_
-sorg2l_
-sorg2r_
-sorgbr_
-sorghr_
-sorgl2_
-sorglq_
-sorgql_
-sorgqr_
-sorgr2_
-sorgrq_
-sorgtr_
-sorm2l_
-sorm2r_
-sormbr_
-sormhr_
-sorml2_
-sormlq_
-sormql_
-sormqr_
-sormr2_
-sormr3_
-sormrq_
-sormrz_
-sormtr_
-spbcon_
-spbequ_
-spbrfs_
-spbstf_
-spbsv_
-spbsvx_
-spbtf2_
-spbtrf_
-spbtrs_
-spocon_
-spoequ_
-sporfs_
-sposv_
-sposvx_
-spotf2_
-spotrf_
-spotri_
-spotrs_
-sppcon_
-sppequ_
-spprfs_
-sppsv_
-sppsvx_
-spptrf_
-spptri_
-spptrs_
-sptcon_
-spteqr_
-sptrfs_
-sptsv_
-sptsvx_
-spttrf_
-spttrs_
-sptts2_
-srscl_
-ssbev_
-ssbevd_
-ssbevx_
-ssbgst_
-ssbgv_
-ssbgvd_
-ssbgvx_
-ssbtrd_
-sspcon_
-sspev_
-sspevd_
-sspevx_
-sspgst_
-sspgv_
-sspgvd_
-sspgvx_
-ssprfs_
-sspsv_
-sspsvx_
-ssptrd_
-ssptrf_
-ssptri_
-ssptrs_
-sstebz_
-sstedc_
-sstegr_
-sstein_
-ssteqr_
-ssterf_
-sstev_
-sstevd_
-sstevr_
-sstevx_
-ssycon_
-ssyev_
-ssyevd_
-ssyevr_
-ssyevx_
-ssygs2_
-ssygst_
-ssygv_
-ssygvd_
-ssygvx_
-ssyrfs_
-ssysv_
-ssysvx_
-ssytd2_
-ssytf2_
-ssytrd_
-ssytrf_
-ssytri_
-ssytrs_
-stbcon_
-stbrfs_
-stbtrs_
-stgevc_
-stgex2_
-stgexc_
-stgsen_
-stgsja_
-stgsna_
-stgsy2_
-stgsyl_
-stpcon_
-stprfs_
-stptri_
-stptrs_
-strcon_
-strevc_
-strexc_
-strrfs_
-strsen_
-strsna_
-strsyl_
-strti2_
-strtri_
-strtrs_
-stzrqf_
-stzrzf_
-xerbla_
-zbdsqr_
-zdrot_
-zdrscl_
-zgbbrd_
-zgbcon_
-zgbequ_
-zgbrfs_
-zgbsv_
-zgbsvx_
-zgbtf2_
-zgbtrf_
-zgbtrs_
-zgebak_
-zgebal_
-zgebd2_
-zgebrd_
-zgecon_
-zgeequ_
-zgees_
-zgeesx_
-zgeev_
-zgeevx_
-zgegs_
-zgegv_
-zgehd2_
-zgehrd_
-zgelq2_
-zgelqf_
-zgels_
-zgelsd_
-zgelss_
-zgelsx_
-zgelsy_
-zgeql2_
-zgeqlf_
-zgeqp3_
-zgeqpf_
-zgeqr2_
-zgeqrf_
-zgerfs_
-zgerq2_
-zgerqf_
-zgesc2_
-zgesdd_
-zgesv_
-zgesvd_
-zgesvx_
-zgetc2_
-zgetf2_
-zgetrf_
-zgetri_
-zgetrs_
-zggbak_
-zggbal_
-zgges_
-zggesx_
-zggev_
-zggevx_
-zggglm_
-zgghrd_
-zgglse_
-zggqrf_
-zggrqf_
-zggsvd_
-zggsvp_
-zgtcon_
-zgtrfs_
-zgtsv_
-zgtsvx_
-zgttrf_
-zgttrs_
-zgtts2_
-zhbev_
-zhbevd_
-zhbevx_
-zhbgst_
-zhbgv_
-zhbgvd_
-zhbgvx_
-zhbtrd_
-zhecon_
-zheev_
-zheevd_
-zheevr_
-zheevx_
-zhegs2_
-zhegst_
-zhegv_
-zhegvd_
-zhegvx_
-zherfs_
-zhesv_
-zhesvx_
-zhetd2_
-zhetf2_
-zhetrd_
-zhetrf_
-zhetri_
-zhetrs_
-zhgeqz_
-zhpcon_
-zhpev_
-zhpevd_
-zhpevx_
-zhpgst_
-zhpgv_
-zhpgvd_
-zhpgvx_
-zhprfs_
-zhpsv_
-zhpsvx_
-zhptrd_
-zhptrf_
-zhptri_
-zhptrs_
-zhsein_
-zhseqr_
-zlabrd_
-zlacgv_
-zlacon_
-zlacp2_
-zlacpy_
-zlacrm_
-zlacrt_
-zladiv_
-zlaed0_
-zlaed7_
-zlaed8_
-zlaein_
-zlaesy_
-zlaev2_
-zlags2_
-zlagtm_
-zlahef_
-zlahqr_
-zlahrd_
-zlaic1_
-zlals0_
-zlalsa_
-zlalsd_
-zlangb_
-zlange_
-zlangt_
-zlanhb_
-zlanhe_
-zlanhp_
-zlanhs_
-zlanht_
-zlansb_
-zlansp_
-zlansy_
-zlantb_
-zlantp_
-zlantr_
-zlapll_
-zlapmt_
-zlaqgb_
-zlaqge_
-zlaqhb_
-zlaqhe_
-zlaqhp_
-zlaqp2_
-zlaqps_
-zlaqsb_
-zlaqsp_
-zlaqsy_
-zlar1v_
-zlar2v_
-zlarcm_
-zlarf_
-zlarfb_
-zlarfg_
-zlarft_
-zlarfx_
-zlargv_
-zlarnv_
-zlarrv_
-zlartg_
-zlartv_
-zlarz_
-zlarzb_
-zlarzt_
-zlascl_
-zlaset_
-zlasr_
-zlassq_
-zlaswp_
-zlasyf_
-zlatbs_
-zlatdf_
-zlatps_
-zlatrd_
-zlatrs_
-zlatrz_
-zlatzm_
-zlauu2_
-zlauum_
-zpbcon_
-zpbequ_
-zpbrfs_
-zpbstf_
-zpbsv_
-zpbsvx_
-zpbtf2_
-zpbtrf_
-zpbtrs_
-zpocon_
-zpoequ_
-zporfs_
-zposv_
-zposvx_
-zpotf2_
-zpotrf_
-zpotri_
-zpotrs_
-zppcon_
-zppequ_
-zpprfs_
-zppsv_
-zppsvx_
-zpptrf_
-zpptri_
-zpptrs_
-zptcon_
-zpteqr_
-zptrfs_
-zptsv_
-zptsvx_
-zpttrf_
-zpttrs_
-zptts2_
-zrot_
-zspcon_
-zspmv_
-zspr_
-zsprfs_
-zspsv_
-zspsvx_
-zsptrf_
-zsptri_
-zsptrs_
-zstedc_
-zstegr_
-zstein_
-zsteqr_
-zsycon_
-zsymv_
-zsyr_
-zsyrfs_
-zsysv_
-zsysvx_
-zsytf2_
-zsytrf_
-zsytri_
-zsytrs_
-ztbcon_
-ztbrfs_
-ztbtrs_
-ztgevc_
-ztgex2_
-ztgexc_
-ztgsen_
-ztgsja_
-ztgsna_
-ztgsy2_
-ztgsyl_
-ztpcon_
-ztprfs_
-ztptri_
-ztptrs_
-ztrcon_
-ztrevc_
-ztrexc_
-ztrrfs_
-ztrsen_
-ztrsna_
-ztrsyl_
-ztrti2_
-ztrtri_
-ztrtrs_
-ztzrqf_
-ztzrzf_
-zung2l_
-zung2r_
-zungbr_
-zunghr_
-zungl2_
-zunglq_
-zungql_
-zungqr_
-zungr2_
-zungrq_
-zungtr_
-zunm2l_
-zunm2r_
-zunmbr_
-zunmhr_
-zunml2_
-zunmlq_
-zunmql_
-zunmqr_
-zunmr2_
-zunmr3_
-zunmrq_
-zunmrz_
-zunmtr_
-zupgtr_
-zupmtr_
diff --git a/sci-libs/mkl/files/lapack.pc.in b/sci-libs/mkl/files/lapack.pc.in
new file mode 100644
index 000000000000..6c1e31640a76
--- /dev/null
+++ b/sci-libs/mkl/files/lapack.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/@LIBDIR@
+includedir=/usr/include
+
+Name: lapack
+Description: MKL implementations of the F77 Linear Algebra PACKage
+Version: @PV@
+URL: http://developer.intel.com/software/products/mkl/
+Requires: blas
+Libs: -L${libdir} -llapack @EXTLIBS@
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 755ec66a5135..f94c62b64fa7 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -3,10 +3,11 @@
 <pkgmetadata>
 <herd>sci</herd>
 <longdescription lang="en">
-The Intel Math Kernel Library is a mathematical library mostly
+The Intel(R) Math Kernel Library is a mathematical library mostly
 optimized for Intel processors (also works on AMDs). It contains BLAS
 and LAPACK implementations, Fast Fourier Transforms, a vector math
 library, and random number generators. It also has multiprocessor
-capacities.
+capacities. The package is installed as binary and has a restrictive
+license. Please see license terms and home page for proper use.
 </longdescription>
 </pkgmetadata>
diff --git a/sci-libs/mkl/mkl-5.2.ebuild b/sci-libs/mkl/mkl-5.2.ebuild
deleted file mode 100644
index f625f0e8c567..000000000000
--- a/sci-libs/mkl/mkl-5.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-5.2.ebuild,v 1.3 2007/07/02 15:26:36 peper Exp $
-
-S=${WORKDIR}
-DESCRIPTION="Intel(R) Math Kernel Library"
-HOMEPAGE="http://developer.intel.com/software/products/mkl/"
-SRC_URI="http://developer.intel.com/software/products/mkl/downloads/mkl52lin_e.tar"
-
-IUSE=""
-
-# No need to, there aren't any executables and it takes a long time.
-RESTRICT="strip"
-
-SLOT="0"
-LICENSE="imkl-5.1"
-KEYWORDS="x86 -sparc"
-
-DEPEND="app-arch/cpio
-	app-arch/rpm"
-
-RDEPEND=">=sys-kernel/linux-headers-2.4
-	>=sys-libs/glibc-2.2.2"
-
-src_compile() {
-	mkdir opt
-
-	for x in intel-*.i386.rpm
-	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
-	done
-}
-
-src_install () {
-	cp -pPR opt ${D}
-	cd ${D}/opt/intel/mkl/
-	dodoc license.txt
-	dohtml -r mklnotes.htm mkllic.htm doc/*
-	rm -rf license.txt *.htm uninstall doc/
-
-	# Mkl enviroment
-	dodir /etc/env.d
-	echo "LDPATH=/opt/intel/mkl/lib/32/" > ${D}/etc/env.d/35mkl
-	echo "MKL_ROOT=/opt/intel/mkl"      >> ${D}/etc/env.d/35mkl
-}
diff --git a/sci-libs/mkl/mkl-8.1.014.ebuild b/sci-libs/mkl/mkl-8.1.014.ebuild
deleted file mode 100644
index 4054ab685bea..000000000000
--- a/sci-libs/mkl/mkl-8.1.014.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-8.1.014.ebuild,v 1.4 2007/07/13 06:57:51 mr_bones_ Exp $
-
-inherit fortran rpm flag-o-matic
-
-MYPV=${PV%.*}
-DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, random number generators."
-HOMEPAGE="http://developer.intel.com/software/products/mkl/"
-SRC_URI="l_${PN}_p_${PV}.tgz"
-RESTRICT="strip fetch"
-
-#fortran95 implements a fortran 95 blas/lapack interface
-IUSE="fortran95 examples"
-SLOT="0"
-LICENSE="mkl-8.0.1"
-KEYWORDS="~x86 ~amd64 ~ia64"
-RDEPEND="virtual/libc
-	app-admin/eselect-blas
-	app-admin/eselect-cblas
-	app-admin/eselect-lapack"
-DEPEND="${RDEPEND}"
-PROVIDE="virtual/blas
-	virtual/lapack"
-
-S="${WORKDIR}/l_${PN}_p_${PV}"
-INSTDIR=opt/intel/${PN}/${MYPV}
-
-pkg_setup() {
-
-	if use fortran95; then
-		FORTRAN="ifc gfortran"
-		fortran_pkg_setup
-	fi
-
-	if  [ -z "${INTEL_LICENSE}" -a  -z \
-		$(find /opt/intel/licenses -name *mkl*.lic) ]; then
-		eerror "Did not find any valid mkl license."
-		eerror "Please locate your license file and run:"
-		eerror "\t INTEL_LICENSE=/my/license/files emerge ${PN}"
-		eerror "or place your license in /opt/intel/licenses and run emerge ${PN}"
-		elog
-		elog "http://www.intel.com/cd/software/products/asmo-na/eng/perflib/mkl/219859.htm"
-		elog "From the above url you can get a free, non-commercial"
-		elog "license to use the Intel Math Kernel Libary emailed to you."
-		elog "You cannot use mkl without this license file."
-		elog "Read the website for more information on this license."
-		elog
-	fi
-}
-
-# the whole shmol is to extract rpm files non-interactively
-# from the big mkl installation
-# hopefully recyclable for ipp
-src_unpack() {
-
-	ewarn
-	ewarn "Intel ${PN} requires 200Mb of disk space"
-	ewarn "Make sure you have enough space on /var and also in /opt/intel"
-	ewarn
-
-	unpack ${A}
-
-	# fake rpm commands to trick the big install script
-	mkdir -p bin
-	echo "exit 1" > bin/rpm2cpio
-	echo "exit 1" > bin/rpm
-	chmod +x bin/*
-	PATH=".:${PATH}:$PWD/bin"
-
-	cd ${S}/install
-	# answer file to make the big install script non-interactive
-	echo $"
-[${PN}_install]
-EULA_ACCEPT_REJECT=accept
-FLEXLM_LICENSE_LOCATION=${INTEL_LICENSE}
-TEMP_DIR=${WORKDIR}/rpm
-INSTALL_DESTINATION=${S}
-RPM_INSTALLATION=
-" > answers.txt
-
-	einfo "Building rpm file..."
-	./install \
-		--noroot \
-		--nonrpm \
-		--installpath ${S} \
-		--silent answers.txt &> /dev/null
-
-	[ -z $(find ${WORKDIR} -name "*.rpm") ] \
-		&&	die "error while extracting the rpm"
-
-	rm -rf ${WORKDIR}/bin ${S}/*
-
-	cd ${S}
-	for x in $(ls ../rpm/*.rpm); do
-		einfo "Extracting $(basename ${x})..."
-		rpm_unpack ${x} || die "rpm_unpack failed"
-	done
-
-	# clean up
-	rm -rf ${WORKDIR}/rpm
-	rm -rf ${S}/${INSTDIR}/tools/environment
-}
-
-src_compile() {
-
-	case ${ARCH} in
-		amd64)
-			IARCH="em64t"
-			IKERN="em64t"
-			;;
-		ia64)
-			IARCH="64"
-			IKERN="ipf"
-			;;
-		x86)
-			IARCH="32"
-			IKERN="ia32"
-			;;
-	esac
-	ILIBDIR=${INSTDIR}/lib/${IARCH}
-	einfo "IARCH=$IARCH IKERN=$IKERN"
-
-	cd ${S}/${INSTDIR}/tools/builder
-	for x in blas cblas lapack; do
-		make ${IKERN} export=${FILESDIR}/${x}.list name=lib${x} \
-			|| die "make ${IKERN} failed"
-	done
-
-	if use fortran95; then
-		local fc=${FORTRANC}
-		if [ "${FORTRANC}" = "ifc" ]; then
-			fc=ifort
-		fi
-		for x in blas lapack; do
-			cd ${S}/${INSTDIR}/interfaces/${x}95
-			make lib \
-				PLAT=lnx${IARCH/em64t/32e} \
-				FC=${fc} \
-				INSTALL_DIR=${S}/${ILIBDIR} || die "make lib failed"
-		done
-	fi
-}
-
-src_test() {
-	local fc="gnu"
-	[ "${FORTRANC}" = "ifc" ] && fc="ifort"
-
-	cd ${S}/${INSTDIR}/tests
-	for testdir in *; do
-		einfo "Testing $testdir"
-		cd ${testdir}
-		emake so$IARCH F=${fc} || die "make $testdir failed"
-	done
-}
-
-src_install () {
-	cd ${S}
-
-	# install license
-	if  [ -n "${INTEL_LICENSE}" -a -f "${INTEL_LICENSE}" ]; then
-		insinto /opt/intel/licenses
-		doins ${INTEL_LICENSE}
-	fi
-
-	# install documentation and include files
-	insinto /${INSTDIR}
-	doins -r ${INSTDIR}/{doc,include}
-	dodir /usr/include
-	dosym /${INSTDIR}/include /usr/include/${PN}
-	use examples && doins -r ${INSTDIR}/examples
-
-	# install static libraries
-	insinto /${ILIBDIR}
-	doins ${ILIBDIR}/*.a
-	dodir /usr/$(get_libdir)/{blas,lapack}/mkl
-	dosym /${ILIBDIR}/libmkl_${IKERN}.a \
-		/usr/$(get_libdir)/blas/mkl/libblas.a
-	dosym /${ILIBDIR}/libmkl_lapack.a \
-		/usr/$(get_libdir)/lapack/mkl/liblapack.a
-
-	# install shared libraries
-	insopts -m0755
-	doins ${ILIBDIR}/*.so
-	insinto /usr/$(get_libdir)/blas/mkl
-	newins ${INSTDIR}/tools/builder/libblas.so libblas.so.0
-	newins ${INSTDIR}/tools/builder/libcblas.so libcblas.so.0
-	insinto /usr/$(get_libdir)/lapack/mkl
-	newins ${INSTDIR}/tools/builder/liblapack.so liblapack.so.0
-	dosym libblas.so.0  /usr/$(get_libdir)/blas/mkl/libblas.so
-	dosym libcblas.so.0 /usr/$(get_libdir)/blas/mkl/libcblas.so
-	dosym liblapack.so.0 /usr/$(get_libdir)/lapack/mkl/liblapack.so
-
-	# install tools
-	insopts -m0644
-	insinto /${INSTDIR}
-	rm -f ${INSTDIR}/tools/builder/*.so
-	doins -r ${INSTDIR}/tools
-
-	# install eselect files
-	eselect blas add $(get_libdir) ${FILESDIR}/eselect.blas mkl
-	eselect cblas add $(get_libdir) ${FILESDIR}/eselect.cblas mkl
-	eselect lapack add $(get_libdir) ${FILESDIR}/eselect.lapack mkl
-
-	# install environment var
-	echo "LD_LIBRARY_PATH=/${ILIBDIR}" > 35mkl
-	doenvd 35mkl
-}
-
-pkg_postinst() {
-	if [[ -z "$(eselect blas show)" ]]; then
-		eselect blas set mkl
-	fi
-	if [[ -z "$(eselect cblas show)" ]]; then
-		eselect cblas set mkl
-	fi
-	if [[ -z "$(eselect lapack show)" ]]; then
-		eselect lapack set mkl
-	fi
-
-	elog "To use MKL's BLAS features, you have to issue (as root):"
-	elog "\n\teselect blas set mkl"
-	elog "To use MKL's CBLAS features, you have to issue (as root):"
-	elog "\n\teselect cblas set mkl"
-	elog "To use MKL's LAPACK features, you have to issue (as root):"
-	elog "\n\teselect lapack set mkl"
-}
diff --git a/sci-libs/mkl/mkl-9.0.018.ebuild b/sci-libs/mkl/mkl-9.0.018.ebuild
deleted file mode 100644
index 0d9095b6e15f..000000000000
--- a/sci-libs/mkl/mkl-9.0.018.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.0.018.ebuild,v 1.4 2007/07/02 15:26:36 peper Exp $
-
-inherit toolchain-funcs fortran
-
-DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, random number generators."
-HOMEPAGE="http://developer.intel.com/software/products/mkl/"
-SRC_URI="l_${PN}_p_${PV}.tgz"
-RESTRICT="strip fetch"
-
-IUSE="fortran95 fftw examples"
-SLOT="0"
-LICENSE="mkl-9.0"
-KEYWORDS="~x86 ~amd64 ~ia64"
-RDEPEND="app-admin/eselect-blas
-	app-admin/eselect-cblas
-	app-admin/eselect-lapack"
-DEPEND="${RDEPEND}"
-
-PROVIDE="virtual/blas
-	virtual/lapack"
-
-pkg_nofetch() {
-	einfo "Please download the intel mkl from:"
-	einfo "http://www.intel.com/software/products/mkl/downloads/lin_mkl.htm"
-	einfo "and place it in ${DISTDIR}"
-	einfo "Also you need to register in ${HOMEPAGE}"
-	einfo "and keep the license Intel sent you"
-}
-
-pkg_setup() {
-
-	if  [[ -z "${INTEL_LICENSE}" ]] &&
-		[[ -z "$(find /opt/intel/licenses -name *MKL*.lic)" ]]; then
-		eerror "Did not find any valid mkl license."
-		eerror "Please locate your license file and run:"
-		eerror "\t INTEL_LICENSE=/my/license/dir emerge ${PN}"
-		eerror "or place your license in /opt/intel/licenses"
-		eerror "Hint: the license file is in the email Intel sent you"
-		die
-	fi
-
-	# setting up compilers
-	INTEL_CC=gnu
-	[[ "$(tc-getCC)" ==  "icc" ]] && INTEL_CC=icc
-	# gfortran still not compiling tests nor fortran95 interface
-	FORTRAN="ifc g77"
-	use fortran95 && FORTRAN="ifc"
-	fortran_pkg_setup
-
-	# setting up architecture name
-	case ${ARCH} in
-		x86) INTEL_ARCH="32" INTEL_KERN=ia32 ;;
-		amd64) INTEL_ARCH="em64t" INTEL_KERN=em64t ;;
-		ia64) INTEL_ARCH="64" INTEL_KERN=ipf ;;
-	esac
-}
-
-src_unpack() {
-
-	ewarn
-	ewarn "Intel ${PN} requires 400Mb of disk space"
-	ewarn "Make sure you have them on ${PORTAGE_TMPDIR} and in /opt/intel"
-	ewarn
-	unpack ${A}
-
-	cd l_${PN}_p_${PV}/install
-
-	# make an answer file to install non-interactivaly
-	# (devs: to produce such a file, first do it interactively
-	# tar xvf l_*; cd l_*/install; ./install --duplicate answers.txt)
-	echo $"
-[MKL]
-EULA_ACCEPT_REJECT=ACCEPT
-FLEXLM_LICENSE_LOCATION=${INTEL_LICENSE}
-INSTALLMODE=NONRPM
-INSTALL_DESTINATION=${S}
-" > answers.txt
-
-	einfo "Extracting ..."
-	# the binary blob extractor forces installation in /opt/intel
-	addwrite /opt/intel
-	./install \
-		--silent answers.txt \
-		--log log.txt &> /dev/null
-
-	[[ -z $(find "${WORKDIR}" -name libmkl.so) ]] \
-		&& 	die "extracting failed"
-
-	cd "${WORKDIR}" && rm -rf l_*
-}
-
-src_compile() {
-
-	cd "${S}"/tools/builder
-	for x in blas cblas lapack; do
-		emake \
-			export="${FILESDIR}"/${x}.list \
-			name=lib${x} \
-			${INTEL_KERN} || die "emake ${x} failed"
-	done
-
-	if use fortran95; then
-		for x in blas95 lapack95; do
-			cd "${S}"/interfaces/${x}
-			emake -j1 \
-				PLAT=lnx${INTEL_ARCH/em64t/32e} \
-				FC=${FORTRANC} \
-				INSTALL_DIR=../../lib/${INTEL_ARCH} \
-				lib || die "emake ${x} failed"
-		done
-	fi
-
-	if use fftw; then
-		for x in "${S}"/interfaces/fft*; do
-			cd "${x}"
-			emake \
-				F=${INTEL_CC} \
-				lib${INTEL_ARCH} || die "emake ${x} failed"
-		done
-	fi
-}
-
-src_test() {
-	# only testing with g77/gcc for now
-	cd "${S}"/tests
-	for testdir in * ; do
-		einfo "Testing ${testdir}"
-		cd ${testdir}
-		emake \
-			F=gnu \
-			lib${INTEL_ARCH} || die "emake ${testdir} failed"
-	done
-}
-
-src_install() {
-
-	# install license in case of the extracting did not
-	if  [ -n "${INTEL_LICENSE}" -a -f "${INTEL_LICENSE}" ]; then
-		insinto /opt/intel/licenses
-		doins "${INTEL_LICENSE}"
-	fi
-
-	local install_dir=/opt/intel/${PN}/${PV:0:3}
-	dodir ${install_dir}
-	cp -pPR include lib man doc "${D}"${install_dir}
-
-	dodir /usr/$(get_libdir)/{blas,lapack}/mkl
-	dosym ${install_dir}/lib/${INTEL_ARCH}/libmkl_${INTEL_KERN}.a \
-		/usr/$(get_libdir)/blas/mkl/libblas.a
-	dosym ${install_dir}/lib/${INTEL_ARCH}/libmkl_${INTEL_KERN}.a \
-		/usr/$(get_libdir)/blas/mkl/libcblas.a
-	dosym /${install_dir}/lib/${INTEL_ARCH}/libmkl_lapack.a \
-		/usr/$(get_libdir)/lapack/mkl/liblapack.a
-
-	insopts -m0755
-	insinto /usr/$(get_libdir)/blas/mkl
-	newins tools/builder/libblas.so libblas.so.0
-	newins tools/builder/libcblas.so libcblas.so.0
-	insinto /usr/$(get_libdir)/lapack/mkl
-	newins tools/builder/liblapack.so liblapack.so.0
-
-	dosym libblas.so.0  /usr/$(get_libdir)/blas/mkl/libblas.so
-	dosym libcblas.so.0 /usr/$(get_libdir)/blas/mkl/libcblas.so
-	dosym liblapack.so.0 /usr/$(get_libdir)/lapack/mkl/liblapack.so
-
-	dodir /usr/include
-	dosym ${install_dir}/include /usr/include/${PN}
-
-	rm -f tools/builder/*.so
-	for d in plugins builder support; do
-		insinto ${install_dir}/tools
-		doins -r tools/${d}
-	done
-
-	if use examples; then
-		insinto ${install_dir}
-		doins -r examples
-	fi
-
-	eselect blas add $(get_libdir) ${FILESDIR}/eselect.blas mkl
-	eselect cblas add $(get_libdir) ${FILESDIR}/eselect.cblas mkl
-	eselect lapack add $(get_libdir) ${FILESDIR}/eselect.lapack mkl
-
-	echo "INCLUDE=${install_dir}/include"  > 35mkl
-	echo "MANPATH=${install_dir}/man"  >> 35mkl
-	echo "LDPATH=${install_dir}/lib/${INTEL_ARCH}" >> 35mkl
-	doenvd 35mkl
-}
-
-pkg_postinst() {
-	if [[ -z "$(eselect blas show)" ]]; then
-		eselect blas set mkl
-	fi
-	if [[ -z "$(eselect cblas show)" ]]; then
-		eselect cblas set mkl
-	fi
-	if [[ -z "$(eselect lapack show)" ]]; then
-		eselect lapack set mkl
-	fi
-
-	elog "To use MKL's BLAS features, you have to issue (as root):"
-	elog "\n\teselect blas set mkl"
-	elog "To use MKL's CBLAS features, you have to issue (as root):"
-	elog "\n\teselect cblas set mkl"
-	elog "To use MKL's LAPACK features, you have to issue (as root):"
-	elog "\n\teselect lapack set mkl"
-}
diff --git a/sci-libs/mkl/mkl-9.1.023.ebuild b/sci-libs/mkl/mkl-9.1.023.ebuild
new file mode 100644
index 000000000000..d87fe92aa038
--- /dev/null
+++ b/sci-libs/mkl/mkl-9.1.023.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.1 2007/10/10 12:41:47 bicatali Exp $
+
+inherit eutils versionator toolchain-funcs fortran
+
+PID=779
+PB=${PN}
+DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, random number generators."
+HOMEPAGE="http://developer.intel.com/software/products/mkl/"
+
+KEYWORDS="~x86 ~amd64 ~ia64"
+SRC_URI="!int64? ( !serial? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/l_${PN}_p_${PV}.tgz ) )
+	int64?  ( http://registrationcenter-download.intel.com/irc_nas/${PID}/l_${PN}_enh_p_${PV}.tgz )
+	serial? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/l_${PN}_enh_p_${PV}.tgz )"
+
+MAJOR=$(get_major_version ${PV})
+MINOR=$(get_version_component_range 2 ${PV})
+
+#slotting not yet supported
+#SLOT="${MAJOR}.${MINOR}"
+SLOT="0"
+LICENSE="Intel-SDP"
+
+IUSE="serial int64 fortran95 fftw doc examples"
+RESTRICT="strip mirror"
+
+DEPEND="app-admin/eselect-blas
+	app-admin/eselect-cblas
+	app-admin/eselect-lapack"
+
+RDEPEND="${DEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/blas-docs app-doc/lapack-docs )"
+
+MKL_DIR=/opt/intel/${PN}/${MAJOR}.${MINOR}
+
+pkg_setup() {
+	# setting up license
+	[[ -z ${MKL_LICENSE} && -d /opt/intel/licenses ]] && \
+		MKL_LICENSE=$(find /opt/intel/licenses -name *MKL*.lic)
+
+	if  [[ -z ${MKL_LICENSE} ]]; then
+		eerror "Did not find any valid mkl license."
+		eerror "Please locate your license file and run:"
+		eerror "\t MKL_LICENSE=/my/license/dir emerge ${PN}"
+		eerror "or place your license in /opt/intel/licenses"
+		eerror "Hint: the license file is in the email Intel sent you"
+		die "setup mkl license failed"
+	fi
+
+	# setting up compilers
+	MKL_CC=gnu
+	[[ $(tc-getCC) == icc ]] && MKL_CC=icc
+	FORTRAN="gfortran ifc g77"
+	use fortran95 && FORTRAN="gfortran ifc"
+	use int64 && FORTRAN="gfortran ifc"
+	fortran_pkg_setup
+}
+
+src_unpack() {
+
+	ewarn
+	local dp=950
+	! use serial && ! use int64 && dp=400
+	ewarn "Intel ${PN} requires ${dp}Mb of disk space"
+	ewarn "Make sure you have enough in ${PORTAGE_TMPDIR}, /tmp and in /opt"
+	ewarn
+	unpack ${A}
+
+	cd l_${PN}_*_${PV}/install
+
+	# need to make a file to install non-interactively.
+	# to produce such a file, first do it interactively
+	# tar xf l_*; ./install.sh --duplicate mkl.ini;
+	# the file will be instman/mkl.ini
+
+	# binary blob extractor installs rpm leftovers in /opt/intel
+	addwrite /opt/intel
+	cp ${MKL_LICENSE} "${WORKDIR}"/
+	MKL_LIC="$(basename ${MKL_LICENSE})"
+	cat > mkl.ini << EOF
+[MKL]
+EULA_ACCEPT_REJECT=ACCEPT
+FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
+INSTALLMODE=NONRPM
+INSTALL_DESTINATION=${S}
+EOF
+	einfo "Extracting ..."
+	./install \
+		--silent ${PWD}/mkl.ini \
+		--log log.txt &> /dev/null
+
+	if [[ -z $(find "${S}" -name libmkl.so) ]]; then
+		eerror "could not find extracted files"
+		eerror "see ${PWD}/log.txt to see why"
+		die "extracting failed"
+	fi
+
+	# remove unused stuff and set up intel names
+	rm -rf "${WORKDIR}"/l_*
+	case ${ARCH} in
+		x86) MKL_ARCH=32
+			MKL_KERN=ia32
+			rm -rf "${S}"/lib*/*64*
+			;;
+		amd64) MKL_ARCH=em64t
+			MKL_KERN=em64t
+			rm -rf "${S}"/lib*/32 "${S}"/lib*/64
+			;;
+		ia64) MKL_ARCH=64
+			MKL_KERN=ipf
+			rm -rf "${S}"/lib*/32 "${S}"/lib*/em64t
+			;;
+	esac
+
+	cd "${S}"
+
+	# default profile regular is threaded
+	MKL_PROF="regular"
+	if use serial; then
+		MKL_PROF="${MKL_PROF} serial"
+	else
+		[[ -d lib_serial ]] && rm -rf lib_serial
+	fi
+	if use int64; then
+		MKL_PROF="${MKL_PROF} ilp64"
+	else
+		[[ -d lib_ilp64 ]] && rm -rf lib_ilp64
+	fi
+
+	# fix a bad makefile in the test
+	if [[ ${FORTRANC} == gfortran ]] || [[ ${FORTRANC} == if* ]]; then
+		sed -i \
+			-e "s/g77/${FORTRANC}/" \
+			-e 's/-DGNU_USE//' \
+			tests/fftf/makefile || die "sed fftf test failed"
+	fi
+	# fix bad permissions on tools
+	find tools -type f -perm /a+w ! -perm /a+x -exec chmod 644 '{}' \; \
+		|| die "permissions fix failed"
+}
+
+src_compile() {
+
+	if use fortran95; then
+		for p in ${MKL_PROF}; do
+			einfo "Compiling fortan95 static lib wrappers for ${p}"
+			for x in blas95 lapack95; do
+				cd "${S}"/interfaces/${x}
+				emake \
+					FC=${FORTRANC} \
+					MKL_SUBVERS=${p} \
+					lib${MKL_ARCH} \
+					|| die "emake $(basename ${x}) failed"
+			done
+		done
+	fi
+
+	if use fftw; then
+		for p in ${MKL_PROF}; do
+			einfo "Compiling fftw static lib wrappers for ${p}"
+			for x in "${S}"/interfaces/fft*; do
+				cd "${x}"
+				emake \
+					F=${MKL_CC} \
+					MKL_SUBVERS=${p} \
+					lib${MKL_ARCH} \
+					|| die "emake $(basename ${x}) failed"
+			done
+		done
+	fi
+}
+
+src_test() {
+	local usegnu
+	[[ ${FORTRANC} = g* ]] && usegnu=gnu
+	# restrict tests for blas and lapack for now.
+	# testing fftw requires checking many C and fortran compilers
+	for t in blas lapack; do
+		cd "${S}"/tests/${t}
+		for p in ${MKL_PROF}; do
+			einfo "Testing ${t} for ${p}"
+			emake -j1 \
+				F=${usegnu} \
+				FC=${FORTRANC} \
+				MKL_SUBVERS=${p} \
+				lib${MKL_ARCH} \
+				|| die "emake ${t} failed"
+		done
+	done
+}
+
+# usage: mkl_install_lib <serial|regular|ilp64>
+mkl_install_lib() {
+
+	local proflib=lib_${1}
+	local prof=${PN}-${1}
+	[[ "${1}" == "regular" ]] && proflib=lib && prof=${PN}-threads
+	local libdir="${MKL_DIR}/${proflib}/${MKL_ARCH}"
+	local extlibs="-L${libdir} -lguide -lpthread"
+	[[ "${1}" == "serial" ]] && extlibs=""
+
+	[[ "${FORTRANC}" == "gfortran" ]] && \
+		extlibs="${extlibs} -L${libdir} -lmkl_gfortran"
+
+	cp -pPR "${S}"/${proflib} "${D}"${MKL_DIR}
+
+	for x in blas cblas; do
+		cat  > eselect.${x}.${prof} << EOF
+${libdir}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/lib${x}.a
+${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so
+${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so.0
+${libdir}/${x}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc
+EOF
+
+		[[ ${x} == cblas ]] && \
+			echo "${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h" >> eselect.${x}.${prof}
+		eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
+		sed -e "s:@LIBDIR@:$(get_libdir):" \
+			-e "s:@PV@:${PV}:" \
+			-e "s:@EXTLIBS@:${extlibs}:g" \
+			"${FILESDIR}"/${x}.pc.in > ${x}.pc || die "sed ${x}.pc failed"
+		insinto ${libdir}
+		doins ${x}.pc
+	done
+
+	cat > eselect.lapack.${prof} << EOF
+${libdir}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
+${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
+${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
+${libdir}/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
+EOF
+	sed -e "s:@LIBDIR@:$(get_libdir):" \
+		-e "s:@PV@:${PV}:" \
+		-e "s:@EXTLIBS@:${extlibs}:g" \
+		"${FILESDIR}"/lapack.pc.in > lapack.pc || die "sed lapack.pc failed"
+	insinto ${libdir}
+	doins lapack.pc
+
+	eselect lapack add $(get_libdir) eselect.lapack.${prof} ${prof}
+	echo "LDPATH=${libdir}"
+}
+
+src_install() {
+
+	# install license
+	if  [[ ! -f /opt/intel/licenses/${MKL_LIC} ]]; then
+		insinto /opt/intel/licenses
+		doins "${WORKDIR}"/${MKL_LIC} || die "install license failed"
+	fi
+
+	dodir ${MKL_DIR}
+	# keep intel dir in /opt as default install
+	einfo "Installing headers, man pages and tools"
+	# use cp, too slow with doins
+	cp -pPR include man tools "${D}"${MKL_DIR} || die "install include|man|tools failed"
+
+	if use examples; then
+		einfo "Installing examples"
+		cp -pPR examples "${D}"${MKL_DIR} || die "install examples failed"
+	fi
+
+	insinto ${MKL_DIR}/doc
+	doins doc/*.txt || die "basic doc install failed"
+	if use doc; then
+		einfo "Installing documentation"
+		cp -pPR doc/*.pdf doc/*.htm "${D}"${MKL_DIR}/doc || die "doc failed"
+	fi
+
+	# take care of lib and eselect files
+	local env_file=35mkl
+	for p in ${MKL_PROF}; do
+		einfo "Installing profile: ${p}"
+		mkl_install_lib ${p} > ${env_file}
+	done
+
+	echo "MANPATH=${MKL_DIR}/man"  >> ${env_file}
+	echo "INCLUDE=${MKL_DIR}/include" >> ${env_file}
+	doenvd ${env_file} || die "doenvd failed"
+}
+
+pkg_postinst() {
+	# set default profile according to upstream
+	local ext=threads
+	if use int64; then
+		ext=int64
+	elif use serial; then
+		ext=serial
+	fi
+	ESELECT_PROF="${PN}-${FORTRANC}-${ext}"
+	for p in blas cblas lapack; do
+		local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+		if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+			# work around eselect bug #189942
+			local configfile="${ROOT}"/etc/env.d/${p}/lib/config
+			[[ -e ${configfile} ]] && rm -f ${configfile}
+			eselect ${p} set ${ESELECT_PROF}
+			elog "${p} has been eselected to ${ESELECT_PROF}"
+		else
+			elog "Current eselected ${p} is ${current_lib}"
+			elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+			elog "\t eselect ${p} set ${ESELECT_PROF}"
+		fi
+	done
+}