[gentoo-commits] proj/sci:master commit in: sci-libs/mkl/

[Sebastien Fabbro]

commit:     66c3fb0e158b26528698505e080e9b0bb11e6924
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 29 23:21:34 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Sep 29 23:21:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=66c3fb0e

sci-libs/mkl: Version bump

(Portage version: 2.2.0_alpha133/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/mkl/ChangeLog                             |    7 +-
 sci-libs/mkl/mkl-10.3.7.256.ebuild                 |  136 --------------------
 ...mkl-10.3.4.191.ebuild => mkl-11.0.0.079.ebuild} |    9 +-
 3 files changed, 11 insertions(+), 141 deletions(-)

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 487c897..f298a3f 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mkl-11.0.0.079 (29 Sep 2012)
+
+  29 Sep 2012; Sébastien Fabbro <bicatali@g.o> +mkl-11.0.0.079.ebuild,
+  -mkl-10.3.4.191.ebuild, -mkl-10.3.7.256.ebuild:
+  sci-libs/mkl: Version bump
+
 *mkl-10.3.7.256 (16 Feb 2012)
 
   16 Feb 2012; Sébastien Fabbro <bicatali@g.o> +mkl-10.3.7.256.ebuild:
@@ -24,4 +30,3 @@
 
   03 Dec 2010; Sébastien Fabbro <bicatali@g.o> mkl-10.3.0.084.ebuild:
   Version bump. refactored ebuilds
-

diff --git a/sci-libs/mkl/mkl-10.3.7.256.ebuild b/sci-libs/mkl/mkl-10.3.7.256.ebuild
deleted file mode 100644
index 2e5cb62..0000000
--- a/sci-libs/mkl/mkl-10.3.7.256.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2405
-INTEL_DPV=2011_sp1_update1
-INTEL_SUBDIR=composerxe
-
-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=""
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-12"
-
-QA_PREBUILT="
-	${INTEL_SDP_DIR}/mkl/lib/*/*
-	${INTEL_SDP_DIR}/mkl/examples/lapack/lib/*
-	${INTEL_SDP_DIR}/mkl/tests/cblas/source/*
-	${INTEL_SDP_DIR}/mkl/benchmarks/linpack/*
-	${INTEL_SDP_DIR}/mkl/benchmarks/mp_linpack/*/*/*"
-
-CHECKREQS_DISK_BUILD=1536M
-
-INTEL_BIN_RPMS="mkl-sp1 mkl-sp1-devel"
-INTEL_DAT_RPMS="mkl-sp1-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
-}

diff --git a/sci-libs/mkl/mkl-10.3.4.191.ebuild b/sci-libs/mkl/mkl-11.0.0.079.ebuild
similarity index 97%
rename from sci-libs/mkl/mkl-10.3.4.191.ebuild
rename to sci-libs/mkl/mkl-11.0.0.079.ebuild
index a2634cf..54aa193 100644
--- a/sci-libs/mkl/mkl-10.3.4.191.ebuild
+++ b/sci-libs/mkl/mkl-11.0.0.079.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
+
 INTEL_DPN=parallel_studio_xe
-INTEL_DID=2158
-INTEL_DPV=2011_update2
+INTEL_DID=2749
+INTEL_DPV=2013
 INTEL_SUBDIR=composerxe
 
 inherit intel-sdp multilib alternatives-2
@@ -25,7 +26,7 @@ QA_PREBUILT="
 	${INTEL_SDP_DIR}/mkl/benchmarks/linpack/*
 	${INTEL_SDP_DIR}/mkl/benchmarks/mp_linpack/*/*/*"
 
-CHECKREQS_DISK_BUILD=1536
+CHECKREQS_DISK_BUILD=1536M
 
 INTEL_BIN_RPMS="mkl mkl-devel"
 INTEL_DAT_RPMS="mkl-common"