From 1a7d2ff6d7c7473e44b2d76e954a4b279b083a09 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 27 Dec 2015 17:15:52 +0100
Subject: sci-libs/mkl: Update link flags according to intel's suggestions

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=568826

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 sci-libs/mkl/mkl-11.1.0.080-r1.ebuild | 141 ---------------------------------
 sci-libs/mkl/mkl-11.1.0.080-r2.ebuild | 142 +++++++++++++++++++++++++++++++++
 sci-libs/mkl/mkl-11.1.1.106-r1.ebuild | 142 +++++++++++++++++++++++++++++++++
 sci-libs/mkl/mkl-11.1.1.106.ebuild    | 141 ---------------------------------
 sci-libs/mkl/mkl-11.1.2.144-r1.ebuild | 142 +++++++++++++++++++++++++++++++++
 sci-libs/mkl/mkl-11.1.2.144.ebuild    | 141 ---------------------------------
 sci-libs/mkl/mkl-11.1.3.174-r1.ebuild | 142 +++++++++++++++++++++++++++++++++
 sci-libs/mkl/mkl-11.1.3.174.ebuild    | 141 ---------------------------------
 sci-libs/mkl/mkl-11.2.0.090-r1.ebuild | 142 +++++++++++++++++++++++++++++++++
 sci-libs/mkl/mkl-11.2.0.090.ebuild    | 141 ---------------------------------
 sci-libs/mkl/mkl-11.2.1.133-r1.ebuild | 144 ++++++++++++++++++++++++++++++++++
 sci-libs/mkl/mkl-11.2.1.133.ebuild    | 143 ---------------------------------
 sci-libs/mkl/mkl-11.2.2.164-r1.ebuild | 144 ++++++++++++++++++++++++++++++++++
 sci-libs/mkl/mkl-11.2.2.164.ebuild    | 143 ---------------------------------
 sci-libs/mkl/mkl-11.2.3.187-r1.ebuild | 144 ++++++++++++++++++++++++++++++++++
 sci-libs/mkl/mkl-11.2.3.187.ebuild    | 143 ---------------------------------
 16 files changed, 1142 insertions(+), 1134 deletions(-)
 delete mode 100644 sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
 create mode 100644 sci-libs/mkl/mkl-11.1.0.080-r2.ebuild
 create mode 100644 sci-libs/mkl/mkl-11.1.1.106-r1.ebuild
 delete mode 100644 sci-libs/mkl/mkl-11.1.1.106.ebuild
 create mode 100644 sci-libs/mkl/mkl-11.1.2.144-r1.ebuild
 delete mode 100644 sci-libs/mkl/mkl-11.1.2.144.ebuild
 create mode 100644 sci-libs/mkl/mkl-11.1.3.174-r1.ebuild
 delete mode 100644 sci-libs/mkl/mkl-11.1.3.174.ebuild
 create mode 100644 sci-libs/mkl/mkl-11.2.0.090-r1.ebuild
 delete mode 100644 sci-libs/mkl/mkl-11.2.0.090.ebuild
 create mode 100644 sci-libs/mkl/mkl-11.2.1.133-r1.ebuild
 delete mode 100644 sci-libs/mkl/mkl-11.2.1.133.ebuild
 create mode 100644 sci-libs/mkl/mkl-11.2.2.164-r1.ebuild
 delete mode 100644 sci-libs/mkl/mkl-11.2.2.164.ebuild
 create mode 100644 sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
 delete mode 100644 sci-libs/mkl/mkl-11.2.3.187.ebuild

diff --git a/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild b/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
deleted file mode 100644
index 8b879a7a6..000000000
--- a/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
-	mkl mkl-devel
-	mkl-cluster mkl-cluster-devel
-	mkl-f95-devel
-	mkl-gnu mkl-gnu-devel
-	mkl-pgi mkl-pgi-devel"
-# single arch packages
-#	mkl-mic mkl-mic-devel
-#	mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
-	chmod u+w -R opt
-}
-
-mkl_add_prof() {
-	local pcname=${1} libs cflags x
-	shift
-	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
-	cat <<-EOF > ${pcname}.pc
-		prefix=${INTEL_SDP_EDIR}/mkl
-		libdir=\${prefix}/lib/${IARCH}
-		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
-		includedir=\${prefix}/include
-		Name: ${pcname}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
-		Cflags: -I\${includedir} ${cflags}
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${pcname}.pc
-	for x in $*; do
-		alternatives_for ${x} ${pcname/-${x}} 0 \
-			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
-	done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
-	local bits=""
-	if [[ ${IARCH} == intel64 ]]; then
-		bits=_lp64
-		[[ ${1} == int64 ]] && bits=_ilp64
-	fi
-	local gf="-Wl,--start-group -lmkl_gf${bits}"
-	local intel="-Wl,--start-group -lmkl_intel${bits}"
-	local core="-lmkl_core -Wl,--end-group"
-	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
-	[[ ${1} == int64 ]] && prof=${prof}-int64
-	local libs
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran blas lapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp blas lapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
-	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
-	libs="-lmkl_rt -lpthread" \
-		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
-	libs="-lmkl_rt -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
-	# blacs and scalapack
-	local scal="-lmkl_scalapack${bits:-_core}"
-	local blacs="-lmkl_blacs_intelmpi${bits}"
-	core="-lmkl_core ${blacs} -Wl,--end-group"
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-blacs blacs
-	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-scalapack scalapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-blacs blacs
-	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-scalapack scalapack
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
-	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
-	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
-	intel-sdp_src_install
-	echo -n > 35mkl "LDPATH="
-	for IARCH in ${INTEL_ARCH}; do
-		mkl_prof
-		sed -i -e '/mkl/s/$/:/' 35mkl
-		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
-		[[ ${IARCH} == intel64 ]] && mkl_prof int64
-	done
-	echo >> 35mkl
-	doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild b/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild
new file mode 100644
index 000000000..a3aa36a08
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3447
+INTEL_DPV=2013_sp1
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+	mkl mkl-devel
+	mkl-cluster mkl-cluster-devel
+	mkl-f95-devel
+	mkl-gnu mkl-gnu-devel
+	mkl-pgi mkl-pgi-devel"
+# single arch packages
+#	mkl-mic mkl-mic-devel
+#	mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+	chmod u+w -R opt
+}
+
+mkl_add_prof() {
+	local pcname=${1} libs cflags x
+	shift
+	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+	cat <<-EOF > ${pcname}.pc
+		prefix=${INTEL_SDP_EDIR}/mkl
+		libdir=\${prefix}/lib/${IARCH}
+		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
+		Cflags: -I\${includedir} ${cflags}
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${pcname}.pc
+	for x in $*; do
+		alternatives_for ${x} ${pcname/-${x}} 0 \
+			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
+	done
+}
+
+# mkl_prof [_ilp64 or _lp64]
+# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
+mkl_prof() {
+	local bits=""
+	if [[ ${IARCH} == intel64 ]]; then
+		bits=_lp64
+		[[ ${1} == int64 ]] && bits=_ilp64
+	fi
+	local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+	local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
+	local intel="-Wl,--start-group -lmkl_intel${bits}"
+	local core="-lmkl_core -Wl,--end-group"
+	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+	[[ ${1} == int64 ]] && prof=${prof}-int64
+	local libs
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran blas lapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp blas lapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+	libs="-lmkl_rt -lpthread" \
+		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+	libs="-lmkl_rt -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+	# blacs and scalapack
+	local scal="-lmkl_scalapack${bits:-_core}"
+	local blacs="-lmkl_blacs_intelmpi${bits}"
+	core="-lmkl_core ${blacs} -Wl,--end-group"
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-blacs blacs
+	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-scalapack scalapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-blacs blacs
+	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-scalapack scalapack
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+	libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-blacs blacs
+	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+	intel-sdp_src_install
+	echo -n > 35mkl "LDPATH="
+	for IARCH in ${INTEL_ARCH}; do
+		mkl_prof
+		sed -i -e '/mkl/s/$/:/' 35mkl
+		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+		[[ ${IARCH} == intel64 ]] && mkl_prof int64
+	done
+	echo >> 35mkl
+	doenvd 35mkl
+}
diff --git a/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild b/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild
new file mode 100644
index 000000000..305bd0446
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3644
+INTEL_DPV=2013_sp1_update1
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+	mkl mkl-devel
+	mkl-cluster mkl-cluster-devel
+	mkl-f95-devel
+	mkl-gnu mkl-gnu-devel
+	mkl-pgi mkl-pgi-devel"
+# single arch packages
+#	mkl-mic mkl-mic-devel
+#	mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+	chmod u+w -R opt
+}
+
+mkl_add_prof() {
+	local pcname=${1} libs cflags x
+	shift
+	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+	cat <<-EOF > ${pcname}.pc
+		prefix=${INTEL_SDP_EDIR}/mkl
+		libdir=\${prefix}/lib/${IARCH}
+		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
+		Cflags: -I\${includedir} ${cflags}
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${pcname}.pc
+	for x in $*; do
+		alternatives_for ${x} ${pcname/-${x}} 0 \
+			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
+	done
+}
+
+# mkl_prof [_ilp64 or _lp64]
+# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
+mkl_prof() {
+	local bits=""
+	if [[ ${IARCH} == intel64 ]]; then
+		bits=_lp64
+		[[ ${1} == int64 ]] && bits=_ilp64
+	fi
+	local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+	local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
+	local intel="-Wl,--start-group -lmkl_intel${bits}"
+	local core="-lmkl_core -Wl,--end-group"
+	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+	[[ ${1} == int64 ]] && prof=${prof}-int64
+	local libs
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran blas lapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp blas lapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+	libs="-lmkl_rt -lpthread" \
+		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+	libs="-lmkl_rt -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+	# blacs and scalapack
+	local scal="-lmkl_scalapack${bits:-_core}"
+	local blacs="-lmkl_blacs_intelmpi${bits}"
+	core="-lmkl_core ${blacs} -Wl,--end-group"
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-blacs blacs
+	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-scalapack scalapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-blacs blacs
+	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-scalapack scalapack
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+	libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-blacs blacs
+	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+	intel-sdp_src_install
+	echo -n > 35mkl "LDPATH="
+	for IARCH in ${INTEL_ARCH}; do
+		mkl_prof
+		sed -i -e '/mkl/s/$/:/' 35mkl
+		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+		[[ ${IARCH} == intel64 ]] && mkl_prof int64
+	done
+	echo >> 35mkl
+	doenvd 35mkl
+}
diff --git a/sci-libs/mkl/mkl-11.1.1.106.ebuild b/sci-libs/mkl/mkl-11.1.1.106.ebuild
deleted file mode 100644
index 4597661b2..000000000
--- a/sci-libs/mkl/mkl-11.1.1.106.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
-	mkl mkl-devel
-	mkl-cluster mkl-cluster-devel
-	mkl-f95-devel
-	mkl-gnu mkl-gnu-devel
-	mkl-pgi mkl-pgi-devel"
-# single arch packages
-#	mkl-mic mkl-mic-devel
-#	mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
-	chmod u+w -R opt
-}
-
-mkl_add_prof() {
-	local pcname=${1} libs cflags x
-	shift
-	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
-	cat <<-EOF > ${pcname}.pc
-		prefix=${INTEL_SDP_EDIR}/mkl
-		libdir=\${prefix}/lib/${IARCH}
-		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
-		includedir=\${prefix}/include
-		Name: ${pcname}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
-		Cflags: -I\${includedir} ${cflags}
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${pcname}.pc
-	for x in $*; do
-		alternatives_for ${x} ${pcname/-${x}} 0 \
-			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
-	done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
-	local bits=""
-	if [[ ${IARCH} == intel64 ]]; then
-		bits=_lp64
-		[[ ${1} == int64 ]] && bits=_ilp64
-	fi
-	local gf="-Wl,--start-group -lmkl_gf${bits}"
-	local intel="-Wl,--start-group -lmkl_intel${bits}"
-	local core="-lmkl_core -Wl,--end-group"
-	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
-	[[ ${1} == int64 ]] && prof=${prof}-int64
-	local libs
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran blas lapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp blas lapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
-	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
-	libs="-lmkl_rt -lpthread" \
-		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
-	libs="-lmkl_rt -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
-	# blacs and scalapack
-	local scal="-lmkl_scalapack${bits:-_core}"
-	local blacs="-lmkl_blacs_intelmpi${bits}"
-	core="-lmkl_core ${blacs} -Wl,--end-group"
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-blacs blacs
-	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-scalapack scalapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-blacs blacs
-	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-scalapack scalapack
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
-	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
-	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
-	intel-sdp_src_install
-	echo -n > 35mkl "LDPATH="
-	for IARCH in ${INTEL_ARCH}; do
-		mkl_prof
-		sed -i -e '/mkl/s/$/:/' 35mkl
-		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
-		[[ ${IARCH} == intel64 ]] && mkl_prof int64
-	done
-	echo >> 35mkl
-	doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild b/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild
new file mode 100644
index 000000000..a02e270c5
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3949
+INTEL_DPV=2013_sp1_update2
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+	mkl mkl-devel
+	mkl-cluster mkl-cluster-devel
+	mkl-f95-devel
+	mkl-gnu mkl-gnu-devel
+	mkl-pgi mkl-pgi-devel"
+# single arch packages
+#	mkl-mic mkl-mic-devel
+#	mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+	chmod u+w -R opt
+}
+
+mkl_add_prof() {
+	local pcname=${1} libs cflags x
+	shift
+	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+	cat <<-EOF > ${pcname}.pc
+		prefix=${INTEL_SDP_EDIR}/mkl
+		libdir=\${prefix}/lib/${IARCH}
+		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
+		Cflags: -I\${includedir} ${cflags}
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${pcname}.pc
+	for x in $*; do
+		alternatives_for ${x} ${pcname/-${x}} 0 \
+			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
+	done
+}
+
+# mkl_prof [_ilp64 or _lp64]
+# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
+mkl_prof() {
+	local bits=""
+	if [[ ${IARCH} == intel64 ]]; then
+		bits=_lp64
+		[[ ${1} == int64 ]] && bits=_ilp64
+	fi
+	local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+	local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
+	local intel="-Wl,--start-group -lmkl_intel${bits}"
+	local core="-lmkl_core -Wl,--end-group"
+	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+	[[ ${1} == int64 ]] && prof=${prof}-int64
+	local libs
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran blas lapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp blas lapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+	libs="-lmkl_rt -lpthread" \
+		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+	libs="-lmkl_rt -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+	# blacs and scalapack
+	local scal="-lmkl_scalapack${bits:-_core}"
+	local blacs="-lmkl_blacs_intelmpi${bits}"
+	core="-lmkl_core ${blacs} -Wl,--end-group"
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-blacs blacs
+	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-scalapack scalapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-blacs blacs
+	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-scalapack scalapack
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+	libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-blacs blacs
+	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+	intel-sdp_src_install
+	echo -n > 35mkl "LDPATH="
+	for IARCH in ${INTEL_ARCH}; do
+		mkl_prof
+		sed -i -e '/mkl/s/$/:/' 35mkl
+		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+		[[ ${IARCH} == intel64 ]] && mkl_prof int64
+	done
+	echo >> 35mkl
+	doenvd 35mkl
+}
diff --git a/sci-libs/mkl/mkl-11.1.2.144.ebuild b/sci-libs/mkl/mkl-11.1.2.144.ebuild
deleted file mode 100644
index dfc939712..000000000
--- a/sci-libs/mkl/mkl-11.1.2.144.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
-	mkl mkl-devel
-	mkl-cluster mkl-cluster-devel
-	mkl-f95-devel
-	mkl-gnu mkl-gnu-devel
-	mkl-pgi mkl-pgi-devel"
-# single arch packages
-#	mkl-mic mkl-mic-devel
-#	mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
-	chmod u+w -R opt
-}
-
-mkl_add_prof() {
-	local pcname=${1} libs cflags x
-	shift
-	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
-	cat <<-EOF > ${pcname}.pc
-		prefix=${INTEL_SDP_EDIR}/mkl
-		libdir=\${prefix}/lib/${IARCH}
-		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
-		includedir=\${prefix}/include
-		Name: ${pcname}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
-		Cflags: -I\${includedir} ${cflags}
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${pcname}.pc
-	for x in $*; do
-		alternatives_for ${x} ${pcname/-${x}} 0 \
-			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
-	done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
-	local bits=""
-	if [[ ${IARCH} == intel64 ]]; then
-		bits=_lp64
-		[[ ${1} == int64 ]] && bits=_ilp64
-	fi
-	local gf="-Wl,--start-group -lmkl_gf${bits}"
-	local intel="-Wl,--start-group -lmkl_intel${bits}"
-	local core="-lmkl_core -Wl,--end-group"
-	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
-	[[ ${1} == int64 ]] && prof=${prof}-int64
-	local libs
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran blas lapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp blas lapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
-	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
-	libs="-lmkl_rt -lpthread" \
-		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
-	libs="-lmkl_rt -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
-	# blacs and scalapack
-	local scal="-lmkl_scalapack${bits:-_core}"
-	local blacs="-lmkl_blacs_intelmpi${bits}"
-	core="-lmkl_core ${blacs} -Wl,--end-group"
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-blacs blacs
-	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-scalapack scalapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-blacs blacs
-	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-scalapack scalapack
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
-	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
-	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
-	intel-sdp_src_install
-	echo -n > 35mkl "LDPATH="
-	for IARCH in ${INTEL_ARCH}; do
-		mkl_prof
-		sed -i -e '/mkl/s/$/:/' 35mkl
-		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
-		[[ ${IARCH} == intel64 ]] && mkl_prof int64
-	done
-	echo >> 35mkl
-	doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild
new file mode 100644
index 000000000..8bb1117a0
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=4220
+INTEL_DPV=2013_sp1_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+	mkl mkl-devel
+	mkl-cluster mkl-cluster-devel
+	mkl-f95-devel
+	mkl-gnu mkl-gnu-devel
+	mkl-pgi mkl-pgi-devel"
+# single arch packages
+#	mkl-mic mkl-mic-devel
+#	mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+	chmod u+w -R opt
+}
+
+mkl_add_prof() {
+	local pcname=${1} libs cflags x
+	shift
+	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+	cat <<-EOF > ${pcname}.pc
+		prefix=${INTEL_SDP_EDIR}/mkl
+		libdir=\${prefix}/lib/${IARCH}
+		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
+		Cflags: -I\${includedir} ${cflags}
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${pcname}.pc
+	for x in $*; do
+		alternatives_for ${x} ${pcname/-${x}} 0 \
+			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
+	done
+}
+
+# mkl_prof [_ilp64 or _lp64]
+# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
+mkl_prof() {
+	local bits=""
+	if [[ ${IARCH} == intel64 ]]; then
+		bits=_lp64
+		[[ ${1} == int64 ]] && bits=_ilp64
+	fi
+	local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+	local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
+	local intel="-Wl,--start-group -lmkl_intel${bits}"
+	local core="-lmkl_core -Wl,--end-group"
+	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+	[[ ${1} == int64 ]] && prof=${prof}-int64
+	local libs
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran blas lapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp blas lapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+	libs="-lmkl_rt -lpthread" \
+		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+	libs="-lmkl_rt -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+	# blacs and scalapack
+	local scal="-lmkl_scalapack${bits:-_core}"
+	local blacs="-lmkl_blacs_intelmpi${bits}"
+	core="-lmkl_core ${blacs} -Wl,--end-group"
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-blacs blacs
+	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-scalapack scalapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-blacs blacs
+	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-scalapack scalapack
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+	libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-blacs blacs
+	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+	intel-sdp_src_install
+	echo -n > 35mkl "LDPATH="
+	for IARCH in ${INTEL_ARCH}; do
+		mkl_prof
+		sed -i -e '/mkl/s/$/:/' 35mkl
+		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+		[[ ${IARCH} == intel64 ]] && mkl_prof int64
+	done
+	echo >> 35mkl
+	doenvd 35mkl
+}
diff --git a/sci-libs/mkl/mkl-11.1.3.174.ebuild b/sci-libs/mkl/mkl-11.1.3.174.ebuild
deleted file mode 100644
index 48b7d8d7c..000000000
--- a/sci-libs/mkl/mkl-11.1.3.174.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4220
-INTEL_DPV=2013_sp1_update3
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
-	mkl mkl-devel
-	mkl-cluster mkl-cluster-devel
-	mkl-f95-devel
-	mkl-gnu mkl-gnu-devel
-	mkl-pgi mkl-pgi-devel"
-# single arch packages
-#	mkl-mic mkl-mic-devel
-#	mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
-	chmod u+w -R opt
-}
-
-mkl_add_prof() {
-	local pcname=${1} libs cflags x
-	shift
-	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
-	cat <<-EOF > ${pcname}.pc
-		prefix=${INTEL_SDP_EDIR}/mkl
-		libdir=\${prefix}/lib/${IARCH}
-		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
-		includedir=\${prefix}/include
-		Name: ${pcname}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
-		Cflags: -I\${includedir} ${cflags}
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${pcname}.pc
-	for x in $*; do
-		alternatives_for ${x} ${pcname/-${x}} 0 \
-			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
-	done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
-	local bits=""
-	if [[ ${IARCH} == intel64 ]]; then
-		bits=_lp64
-		[[ ${1} == int64 ]] && bits=_ilp64
-	fi
-	local gf="-Wl,--start-group -lmkl_gf${bits}"
-	local intel="-Wl,--start-group -lmkl_intel${bits}"
-	local core="-lmkl_core -Wl,--end-group"
-	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
-	[[ ${1} == int64 ]] && prof=${prof}-int64
-	local libs
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran blas lapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp blas lapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
-	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
-	libs="-lmkl_rt -lpthread" \
-		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
-	libs="-lmkl_rt -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
-	# blacs and scalapack
-	local scal="-lmkl_scalapack${bits:-_core}"
-	local blacs="-lmkl_blacs_intelmpi${bits}"
-	core="-lmkl_core ${blacs} -Wl,--end-group"
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-blacs blacs
-	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-scalapack scalapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-blacs blacs
-	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-scalapack scalapack
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
-	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
-	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
-	intel-sdp_src_install
-	echo -n > 35mkl "LDPATH="
-	for IARCH in ${INTEL_ARCH}; do
-		mkl_prof
-		sed -i -e '/mkl/s/$/:/' 35mkl
-		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
-		[[ ${IARCH} == intel64 ]] && mkl_prof int64
-	done
-	echo >> 35mkl
-	doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild b/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild
new file mode 100644
index 000000000..6143bdb9f
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=4584
+INTEL_DPV=2015
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS="
+	mkl mkl-devel
+	mkl-cluster mkl-cluster-devel
+	mkl-f95-devel
+	mkl-gnu mkl-gnu-devel
+	mkl-pgi mkl-pgi-devel"
+# single arch packages
+#	mkl-mic mkl-mic-devel
+#	mkl-sp2dp mkl-sp2dp-devel
+INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
+
+src_prepare() {
+	chmod u+w -R opt
+}
+
+mkl_add_prof() {
+	local pcname=${1} libs cflags x
+	shift
+	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+	cat <<-EOF > ${pcname}.pc
+		prefix=${INTEL_SDP_EDIR}/mkl
+		libdir=\${prefix}/lib/${IARCH}
+		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
+		Cflags: -I\${includedir} ${cflags}
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${pcname}.pc
+	for x in $*; do
+		alternatives_for ${x} ${pcname/-${x}} 0 \
+			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
+	done
+}
+
+# mkl_prof [_ilp64 or _lp64]
+# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
+mkl_prof() {
+	local bits=""
+	if [[ ${IARCH} == intel64 ]]; then
+		bits=_lp64
+		[[ ${1} == int64 ]] && bits=_ilp64
+	fi
+	local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+	local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
+	local intel="-Wl,--start-group -lmkl_intel${bits}"
+	local core="-lmkl_core -Wl,--end-group"
+	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+	[[ ${1} == int64 ]] && prof=${prof}-int64
+	local libs
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran blas lapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp blas lapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+	libs="-lmkl_rt -lpthread" \
+		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+	libs="-lmkl_rt -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+	# blacs and scalapack
+	local scal="-lmkl_scalapack${bits:-_core}"
+	local blacs="-lmkl_blacs_intelmpi${bits}"
+	core="-lmkl_core ${blacs} -Wl,--end-group"
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-blacs blacs
+	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-scalapack scalapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-blacs blacs
+	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-scalapack scalapack
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+	libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-blacs blacs
+	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+	intel-sdp_src_install
+	echo -n > 35mkl "LDPATH="
+	for IARCH in ${INTEL_ARCH}; do
+		mkl_prof
+		sed -i -e '/mkl/s/$/:/' 35mkl
+		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+		[[ ${IARCH} == intel64 ]] && mkl_prof int64
+	done
+	echo >> 35mkl
+	doenvd 35mkl
+}
diff --git a/sci-libs/mkl/mkl-11.2.0.090.ebuild b/sci-libs/mkl/mkl-11.2.0.090.ebuild
deleted file mode 100644
index 2197e248b..000000000
--- a/sci-libs/mkl/mkl-11.2.0.090.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4584
-INTEL_DPV=2015
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="
-	mkl mkl-devel
-	mkl-cluster mkl-cluster-devel
-	mkl-f95-devel
-	mkl-gnu mkl-gnu-devel
-	mkl-pgi mkl-pgi-devel"
-# single arch packages
-#	mkl-mic mkl-mic-devel
-#	mkl-sp2dp mkl-sp2dp-devel
-INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-common"
-
-src_prepare() {
-	chmod u+w -R opt
-}
-
-mkl_add_prof() {
-	local pcname=${1} libs cflags x
-	shift
-	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
-	cat <<-EOF > ${pcname}.pc
-		prefix=${INTEL_SDP_EDIR}/mkl
-		libdir=\${prefix}/lib/${IARCH}
-		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
-		includedir=\${prefix}/include
-		Name: ${pcname}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
-		Cflags: -I\${includedir} ${cflags}
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${pcname}.pc
-	for x in $*; do
-		alternatives_for ${x} ${pcname/-${x}} 0 \
-			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
-	done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
-	local bits=""
-	if [[ ${IARCH} == intel64 ]]; then
-		bits=_lp64
-		[[ ${1} == int64 ]] && bits=_ilp64
-	fi
-	local gf="-Wl,--start-group -lmkl_gf${bits}"
-	local intel="-Wl,--start-group -lmkl_intel${bits}"
-	local core="-lmkl_core -Wl,--end-group"
-	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
-	[[ ${1} == int64 ]] && prof=${prof}-int64
-	local libs
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran blas lapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp blas lapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
-	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
-	libs="-lmkl_rt -lpthread" \
-		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
-	libs="-lmkl_rt -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
-	# blacs and scalapack
-	local scal="-lmkl_scalapack${bits:-_core}"
-	local blacs="-lmkl_blacs_intelmpi${bits}"
-	core="-lmkl_core ${blacs} -Wl,--end-group"
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-blacs blacs
-	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-scalapack scalapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-blacs blacs
-	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-scalapack scalapack
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
-	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
-	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
-	intel-sdp_src_install
-	echo -n > 35mkl "LDPATH="
-	for IARCH in ${INTEL_ARCH}; do
-		mkl_prof
-		sed -i -e '/mkl/s/$/:/' 35mkl
-		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
-		[[ ${IARCH} == intel64 ]] && mkl_prof int64
-	done
-	echo >> 35mkl
-	doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild b/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild
new file mode 100644
index 000000000..6b1187abe
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=4992
+INTEL_DPV=2015_update1
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-13"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS=(
+	mkl mkl-devel
+	mkl-cluster mkl-cluster-devel
+	mkl-f95-devel
+	mkl-gnu mkl-gnu-devel
+	mkl-pgi mkl-pgi-devel
+	)
+INTEL_AMD64_RPMS=(
+	mkl-mic mkl-mic-devel
+	mkl-sp2dp mkl-sp2dp-devel
+	)
+INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
+
+src_prepare() {
+	chmod u+w -R opt
+}
+
+mkl_add_prof() {
+	local pcname=${1} libs cflags x
+	shift
+	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+	cat <<-EOF > ${pcname}.pc
+		prefix=${INTEL_SDP_EDIR}/mkl
+		libdir=\${prefix}/lib/${IARCH}
+		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
+		Cflags: -I\${includedir} ${cflags}
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${pcname}.pc
+	for x in $*; do
+		alternatives_for ${x} ${pcname/-${x}} 0 \
+			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
+	done
+}
+
+# mkl_prof [_ilp64 or _lp64]
+# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
+mkl_prof() {
+	local bits=""
+	if [[ ${IARCH} == intel64 ]]; then
+		bits=_lp64
+		[[ ${1} == int64 ]] && bits=_ilp64
+	fi
+	local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+	local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
+	local intel="-Wl,--start-group -lmkl_intel${bits}"
+	local core="-lmkl_core -Wl,--end-group"
+	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+	[[ ${1} == int64 ]] && prof=${prof}-int64
+	local libs
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran blas lapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp blas lapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+	libs="-lmkl_rt -lpthread" \
+		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+	libs="-lmkl_rt -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+	# blacs and scalapack
+	local scal="-lmkl_scalapack${bits:-_core}"
+	local blacs="-lmkl_blacs_intelmpi${bits}"
+	core="-lmkl_core ${blacs} -Wl,--end-group"
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-blacs blacs
+	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-scalapack scalapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-blacs blacs
+	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-scalapack scalapack
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+	libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-blacs blacs
+	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+	intel-sdp_src_install
+	echo -n > 35mkl "LDPATH="
+	for IARCH in ${INTEL_ARCH}; do
+		mkl_prof
+		sed -i -e '/mkl/s/$/:/' 35mkl
+		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+		[[ ${IARCH} == intel64 ]] && mkl_prof int64
+	done
+	echo >> 35mkl
+	doenvd 35mkl
+}
diff --git a/sci-libs/mkl/mkl-11.2.1.133.ebuild b/sci-libs/mkl/mkl-11.2.1.133.ebuild
deleted file mode 100644
index 8899ce5a2..000000000
--- a/sci-libs/mkl/mkl-11.2.1.133.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4992
-INTEL_DPV=2015_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS=(
-	mkl mkl-devel
-	mkl-cluster mkl-cluster-devel
-	mkl-f95-devel
-	mkl-gnu mkl-gnu-devel
-	mkl-pgi mkl-pgi-devel
-	)
-INTEL_AMD64_RPMS=(
-	mkl-mic mkl-mic-devel
-	mkl-sp2dp mkl-sp2dp-devel
-	)
-INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
-
-src_prepare() {
-	chmod u+w -R opt
-}
-
-mkl_add_prof() {
-	local pcname=${1} libs cflags x
-	shift
-	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
-	cat <<-EOF > ${pcname}.pc
-		prefix=${INTEL_SDP_EDIR}/mkl
-		libdir=\${prefix}/lib/${IARCH}
-		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
-		includedir=\${prefix}/include
-		Name: ${pcname}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
-		Cflags: -I\${includedir} ${cflags}
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${pcname}.pc
-	for x in $*; do
-		alternatives_for ${x} ${pcname/-${x}} 0 \
-			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
-	done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
-	local bits=""
-	if [[ ${IARCH} == intel64 ]]; then
-		bits=_lp64
-		[[ ${1} == int64 ]] && bits=_ilp64
-	fi
-	local gf="-Wl,--start-group -lmkl_gf${bits}"
-	local intel="-Wl,--start-group -lmkl_intel${bits}"
-	local core="-lmkl_core -Wl,--end-group"
-	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
-	[[ ${1} == int64 ]] && prof=${prof}-int64
-	local libs
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran blas lapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp blas lapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
-	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
-	libs="-lmkl_rt -lpthread" \
-		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
-	libs="-lmkl_rt -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
-	# blacs and scalapack
-	local scal="-lmkl_scalapack${bits:-_core}"
-	local blacs="-lmkl_blacs_intelmpi${bits}"
-	core="-lmkl_core ${blacs} -Wl,--end-group"
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-blacs blacs
-	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-scalapack scalapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-blacs blacs
-	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-scalapack scalapack
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
-	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
-	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
-	intel-sdp_src_install
-	echo -n > 35mkl "LDPATH="
-	for IARCH in ${INTEL_ARCH}; do
-		mkl_prof
-		sed -i -e '/mkl/s/$/:/' 35mkl
-		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
-		[[ ${IARCH} == intel64 ]] && mkl_prof int64
-	done
-	echo >> 35mkl
-	doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild b/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild
new file mode 100644
index 000000000..c8281f3e9
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=5207
+INTEL_DPV=2015_update2
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-15"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS=(
+	mkl mkl-devel
+	mkl-cluster mkl-cluster-devel
+	mkl-f95-devel
+	mkl-gnu mkl-gnu-devel
+	mkl-pgi mkl-pgi-devel
+	)
+INTEL_AMD64_RPMS=(
+	mkl-mic mkl-mic-devel
+	mkl-sp2dp mkl-sp2dp-devel
+	)
+INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
+
+src_prepare() {
+	chmod u+w -R opt
+}
+
+mkl_add_prof() {
+	local pcname=${1} libs cflags x
+	shift
+	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+	cat <<-EOF > ${pcname}.pc
+		prefix=${INTEL_SDP_EDIR}/mkl
+		libdir=\${prefix}/lib/${IARCH}
+		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
+		Cflags: -I\${includedir} ${cflags}
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${pcname}.pc
+	for x in $*; do
+		alternatives_for ${x} ${pcname/-${x}} 0 \
+			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
+	done
+}
+
+# mkl_prof [_ilp64 or _lp64]
+# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
+mkl_prof() {
+	local bits=""
+	if [[ ${IARCH} == intel64 ]]; then
+		bits=_lp64
+		[[ ${1} == int64 ]] && bits=_ilp64
+	fi
+	local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+	local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
+	local intel="-Wl,--start-group -lmkl_intel${bits}"
+	local core="-lmkl_core -Wl,--end-group"
+	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+	[[ ${1} == int64 ]] && prof=${prof}-int64
+	local libs
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran blas lapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp blas lapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+	libs="-lmkl_rt -lpthread" \
+		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+	libs="-lmkl_rt -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+	# blacs and scalapack
+	local scal="-lmkl_scalapack${bits:-_core}"
+	local blacs="-lmkl_blacs_intelmpi${bits}"
+	core="-lmkl_core ${blacs} -Wl,--end-group"
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-blacs blacs
+	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-scalapack scalapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-blacs blacs
+	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-scalapack scalapack
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+	libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-blacs blacs
+	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+	intel-sdp_src_install
+	echo -n > 35mkl "LDPATH="
+	for IARCH in ${INTEL_ARCH}; do
+		mkl_prof
+		sed -i -e '/mkl/s/$/:/' 35mkl
+		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+		[[ ${IARCH} == intel64 ]] && mkl_prof int64
+	done
+	echo >> 35mkl
+	doenvd 35mkl
+}
diff --git a/sci-libs/mkl/mkl-11.2.2.164.ebuild b/sci-libs/mkl/mkl-11.2.2.164.ebuild
deleted file mode 100644
index 8ead60b89..000000000
--- a/sci-libs/mkl/mkl-11.2.2.164.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=5207
-INTEL_DPV=2015_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-15"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS=(
-	mkl mkl-devel
-	mkl-cluster mkl-cluster-devel
-	mkl-f95-devel
-	mkl-gnu mkl-gnu-devel
-	mkl-pgi mkl-pgi-devel
-	)
-INTEL_AMD64_RPMS=(
-	mkl-mic mkl-mic-devel
-	mkl-sp2dp mkl-sp2dp-devel
-	)
-INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
-
-src_prepare() {
-	chmod u+w -R opt
-}
-
-mkl_add_prof() {
-	local pcname=${1} libs cflags x
-	shift
-	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
-	cat <<-EOF > ${pcname}.pc
-		prefix=${INTEL_SDP_EDIR}/mkl
-		libdir=\${prefix}/lib/${IARCH}
-		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
-		includedir=\${prefix}/include
-		Name: ${pcname}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
-		Cflags: -I\${includedir} ${cflags}
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${pcname}.pc
-	for x in $*; do
-		alternatives_for ${x} ${pcname/-${x}} 0 \
-			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
-	done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
-	local bits=""
-	if [[ ${IARCH} == intel64 ]]; then
-		bits=_lp64
-		[[ ${1} == int64 ]] && bits=_ilp64
-	fi
-	local gf="-Wl,--start-group -lmkl_gf${bits}"
-	local intel="-Wl,--start-group -lmkl_intel${bits}"
-	local core="-lmkl_core -Wl,--end-group"
-	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
-	[[ ${1} == int64 ]] && prof=${prof}-int64
-	local libs
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran blas lapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp blas lapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
-	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
-	libs="-lmkl_rt -lpthread" \
-		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
-	libs="-lmkl_rt -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
-	# blacs and scalapack
-	local scal="-lmkl_scalapack${bits:-_core}"
-	local blacs="-lmkl_blacs_intelmpi${bits}"
-	core="-lmkl_core ${blacs} -Wl,--end-group"
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-blacs blacs
-	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-scalapack scalapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-blacs blacs
-	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-scalapack scalapack
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
-	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
-	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
-	intel-sdp_src_install
-	echo -n > 35mkl "LDPATH="
-	for IARCH in ${INTEL_ARCH}; do
-		mkl_prof
-		sed -i -e '/mkl/s/$/:/' 35mkl
-		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
-		[[ ${IARCH} == intel64 ]] && mkl_prof int64
-	done
-	echo >> 35mkl
-	doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
new file mode 100644
index 000000000..77a85b52f
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=7538
+INTEL_DPV=2015_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp multilib alternatives-2
+
+DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND=">=dev-libs/intel-common-15"
+
+CHECKREQS_DISK_BUILD=2500M
+
+INTEL_BIN_RPMS=(
+	mkl mkl-devel
+	mkl-cluster mkl-cluster-devel
+	mkl-f95-devel
+	mkl-gnu mkl-gnu-devel
+	mkl-pgi mkl-pgi-devel
+	)
+INTEL_AMD64_RPMS=(
+	mkl-mic mkl-mic-devel
+	mkl-sp2dp mkl-sp2dp-devel
+	)
+INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
+
+src_prepare() {
+	chmod u+w -R opt
+}
+
+mkl_add_prof() {
+	local pcname=${1} libs cflags x
+	shift
+	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
+	cat <<-EOF > ${pcname}.pc
+		prefix=${INTEL_SDP_EDIR}/mkl
+		libdir=\${prefix}/lib/${IARCH}
+		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
+		Cflags: -I\${includedir} ${cflags}
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${pcname}.pc
+	for x in $*; do
+		alternatives_for ${x} ${pcname/-${x}} 0 \
+			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
+	done
+}
+
+# mkl_prof [_ilp64 or _lp64]
+# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
+mkl_prof() {
+	local bits=""
+	if [[ ${IARCH} == intel64 ]]; then
+		bits=_lp64
+		[[ ${1} == int64 ]] && bits=_ilp64
+	fi
+	local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}"
+	local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}"
+	local intel="-Wl,--start-group -lmkl_intel${bits}"
+	local core="-lmkl_core -Wl,--end-group"
+	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
+	[[ ${1} == int64 ]] && prof=${prof}-int64
+	local libs
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran blas lapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp blas lapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
+	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
+	libs="-lmkl_rt -lpthread" \
+		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
+	libs="-lmkl_rt -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
+
+	# blacs and scalapack
+	local scal="-lmkl_scalapack${bits:-_core}"
+	local blacs="-lmkl_blacs_intelmpi${bits}"
+	core="-lmkl_core ${blacs} -Wl,--end-group"
+
+	libs="${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-blacs blacs
+	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-gfortran-scalapack scalapack
+	libs="${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-blacs blacs
+	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
+		mkl_add_prof ${prof}-intel-scalapack scalapack
+	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
+	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
+	libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
+	libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
+		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
+	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-blacs blacs
+	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
+		mkl_add_prof ${prof}-dynamic-scalapack scalapack
+	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
+	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
+		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
+}
+
+src_install() {
+	intel-sdp_src_install
+	echo -n > 35mkl "LDPATH="
+	for IARCH in ${INTEL_ARCH}; do
+		mkl_prof
+		sed -i -e '/mkl/s/$/:/' 35mkl
+		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
+		[[ ${IARCH} == intel64 ]] && mkl_prof int64
+	done
+	echo >> 35mkl
+	doenvd 35mkl
+}
diff --git a/sci-libs/mkl/mkl-11.2.3.187.ebuild b/sci-libs/mkl/mkl-11.2.3.187.ebuild
deleted file mode 100644
index 66b8ce689..000000000
--- a/sci-libs/mkl/mkl-11.2.3.187.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=7538
-INTEL_DPV=2015_update3
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-15"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS=(
-	mkl mkl-devel
-	mkl-cluster mkl-cluster-devel
-	mkl-f95-devel
-	mkl-gnu mkl-gnu-devel
-	mkl-pgi mkl-pgi-devel
-	)
-INTEL_AMD64_RPMS=(
-	mkl-mic mkl-mic-devel
-	mkl-sp2dp mkl-sp2dp-devel
-	)
-INTEL_DAT_RPMS=(mkl-common mkl-cluster-common mkl-f95-common)
-
-src_prepare() {
-	chmod u+w -R opt
-}
-
-mkl_add_prof() {
-	local pcname=${1} libs cflags x
-	shift
-	[[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
-	cat <<-EOF > ${pcname}.pc
-		prefix=${INTEL_SDP_EDIR}/mkl
-		libdir=\${prefix}/lib/${IARCH}
-		libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
-		includedir=\${prefix}/include
-		Name: ${pcname}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -L\${libdir_comp} ${libs}
-		Cflags: -I\${includedir} ${cflags}
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${pcname}.pc
-	for x in $*; do
-		alternatives_for ${x} ${pcname/-${x}} 0 \
-			/usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
-	done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
-	local bits=""
-	if [[ ${IARCH} == intel64 ]]; then
-		bits=_lp64
-		[[ ${1} == int64 ]] && bits=_ilp64
-	fi
-	local gf="-Wl,--start-group -lmkl_gf${bits}"
-	local intel="-Wl,--start-group -lmkl_intel${bits}"
-	local core="-lmkl_core -Wl,--end-group"
-	local prof=mkl${IARCH:((${#IARCH} - 2)):2}
-	[[ ${1} == int64 ]] && prof=${prof}-int64
-	local libs
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran blas lapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel blas lapack cblas lapacke
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp blas lapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp cblas lapacke
-	libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
-	libs="-lmkl_rt -lpthread" \
-		mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
-	libs="-lmkl_rt -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
-	# blacs and scalapack
-	local scal="-lmkl_scalapack${bits:-_core}"
-	local blacs="-lmkl_blacs_intelmpi${bits}"
-	core="-lmkl_core ${blacs} -Wl,--end-group"
-
-	libs="${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-blacs blacs
-	libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-gfortran-scalapack scalapack
-	libs="${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-blacs blacs
-	libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
-		mkl_add_prof ${prof}-intel-scalapack scalapack
-	libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
-	libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
-	libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
-		mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
-	libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-blacs blacs
-	libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -lpthread" \
-		mkl_add_prof ${prof}-dynamic-scalapack scalapack
-	libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
-	libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
-		mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
-	intel-sdp_src_install
-	echo -n > 35mkl "LDPATH="
-	for IARCH in ${INTEL_ARCH}; do
-		mkl_prof
-		sed -i -e '/mkl/s/$/:/' 35mkl
-		echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
-		[[ ${IARCH} == intel64 ]] && mkl_prof int64
-	done
-	echo >> 35mkl
-	doenvd 35mkl
-}
-- 
cgit v1.2.3-65-gdbad