sci-libs/mkl: Version Bump

Package-Manager: portage-2.2.12

3 files changed, 147 insertions, 0 deletions

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 839e6eb6f..c3073a98c 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mkl-11.2.0.090 (15 Sep 2014)
+
+  15 Sep 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.2.0.090.ebuild:
+  Version Bump
+
 *mkl-11.1.3.174 (02 Jun 2014)
 
   02 Jun 2014; Justin Lecher <jlec@gentoo.org> +mkl-11.1.3.174.ebuild:
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 5073169e6..c78130b98 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -2,3 +2,4 @@ DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d
 DIST parallel_studio_xe_2013_sp1_update1.tgz 3402142370 SHA256 5d0147c6907ed7950d7f14b615785f5e3c7977c62368f4a8ec7b06be758d614a SHA512 ce3f7a9710b3ec6eba5d4f97c9d7bd4cc633119750962d4de5a89b328a22323f5df68f679289930fa8651ee45fb59f7af63d943f9ef175799ab55dfbcc6d8029 WHIRLPOOL eeeef9e46e73f6eb2a1b5f5b9c8c604ff3c4709a53004d9a1887dbe690e0c597dbc683f4b19a8c544ea706e6cefbeedc5d1e6f12ca103cc6bdc35927250f5626
 DIST parallel_studio_xe_2013_sp1_update2.tgz 3410174020 SHA256 235c0f54832879e27afa2c11d7a4cc72bd5bcc6241963024a28cc9e1c74342f0 SHA512 589dee0cf806ac54be473d0a8a0b9da818898f7b91fec88c07c61f45973b6e40fe4a247bb140110a0be0c1422ddcfc0cd1007f2dc58e5ead0e4c77b25806aa4d WHIRLPOOL efde8852a8a708df4c161666f44404157ce4af776c0f2e2ddfdb039a2ca23af5fa68411e2adeba17f7a97b1a11c7e3e74e6806d0a4dcbe614752715161aa7e24
 DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 SHA256 cd332d1ab5241f7609ca6fefa905b50ec8d706e93870860af1ee9e9e5fd6cc1c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025 WHIRLPOOL 5407f994b0b26323a4e6540e3eafedf05f4dd900af8ebf778911bf156656057ac0bc394f0a3791b8f4e9aedac681827c5432ddd070692e0fbedbd2f152eda04b
+DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
diff --git a/sci-libs/mkl/mkl-11.2.0.090.ebuild b/sci-libs/mkl/mkl-11.2.0.090.ebuild
new file mode 100644
index 000000000..a8298e48b
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.2.0.090.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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
+}