sci-libs/mkl: Version Bump

Package-Manager: portage-2.2.7

3 files changed, 146 insertions, 0 deletions

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 627b3ef3b..ce281d4d6 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mkl-11.1.0.080 (02 Oct 2013)
+
+  02 Oct 2013; Justin Lecher <jlec@gentoo.org> +mkl-11.1.0.080.ebuild:
+  Version Bump
+
 *mkl-11.0.5.192 (14 Jul 2013)
 
   14 Jul 2013; Justin Lecher <jlec@gentoo.org> +mkl-11.0.5.192.ebuild,
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 2792b6755..9ab270d71 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,3 +1,4 @@
+DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
 DIST parallel_studio_xe_2013_update3.tgz 2173061577 SHA256 98b3bfe9feefa8caaa1bea533362f31bcfe96aa8f9e59fc89f6a453d50df7508 SHA512 c6115f01b045c840b61e3c2a17fd39142c814d4e387fa5bc935c5cc6ca365c3fedddb6d8c045b5c239b948b42c02254d8b73c42cfe16d046dcf14d3a4597bbde WHIRLPOOL e857fbf0fc73406f7d787400f8ed6e45e93825616fe3d2d10dcd26fa03d56cd956a0b598270724be4ab3886d77502e0f456077ed3008cffc6bdb4abe60acedce
 DIST parallel_studio_xe_2013_update3_ia32.tgz 1207596909 SHA256 57017db1b00345d46ef9dff67dd4e5754ed0fe67fae7335489447f948dbfe7a8 SHA512 f3656fcbda74f253c8cc0ca56e16a84d77854ef51ecc7f24db02c820270bef3954d0d97d1be2aa5cf2ea7703a6e442c3be15df28de570aac7062e5c5958581a4 WHIRLPOOL 0407b59697da8a69c8ac512dec4187bf27eeb2e80516cd6a99968ef3b30a31e55eeaa31ec4bcbd34fe23678e68c4f00cc5dfce579edfb0268b789e1e65285945
 DIST parallel_studio_xe_2013_update3_intel64.tgz 1508395753 SHA256 081bc3d617f04243d459d92d05398df1a3634faf3de554346f732ed83ed4ef06 SHA512 344678ba9c6029ab095cc656c2153b20f0f996dab45115296fb624eca3863763e4010b519595892ffeecfc1a0880901ef5ae53924e41e470aec46efd0abcd822 WHIRLPOOL 1295f579ecc50014b285d47ecf6b92d1b9d0c2cbadd1a5972a832178263a9b3d4cf4208153df40e270c259c1307ed21277239e70371b39eaf4e12171c25a3c1f
diff --git a/sci-libs/mkl/mkl-11.1.0.080.ebuild b/sci-libs/mkl/mkl-11.1.0.080.ebuild
new file mode 100644
index 000000000..c67452788
--- /dev/null
+++ b/sci-libs/mkl/mkl-11.1.0.080.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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}
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} ${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
+}