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

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     f196902d41eda6af3d346303a76957bdb4e49cc8
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 03:48:30 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat May 25 03:48:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f196902d

removed old

---
 sci-libs/mkl/metadata.xml          |    4 +-
 sci-libs/mkl/mkl-11.0.0.079.ebuild |  131 ------------------------------------
 sci-libs/mkl/mkl-11.0.2.146.ebuild |  131 ------------------------------------
 3 files changed, 2 insertions(+), 264 deletions(-)

diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index cb75c05..89e096c 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   The Intel(R) Math Kernel Library is a mathematical library mostly
   optimized for Intel processors (also works on AMDs). It contains BLAS
   and LAPACK implementations, Fast Fourier Transforms, a vector math

diff --git a/sci-libs/mkl/mkl-11.0.0.079.ebuild b/sci-libs/mkl/mkl-11.0.0.079.ebuild
deleted file mode 100644
index 4ef1967..0000000
--- a/sci-libs/mkl/mkl-11.0.0.079.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-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=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-12"
-
-CHECKREQS_DISK_BUILD=2300M
-
-INTEL_BIN_RPMS="mkl mkl-devel"
-INTEL_DAT_RPMS="mkl-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-11.0.2.146.ebuild b/sci-libs/mkl/mkl-11.0.2.146.ebuild
deleted file mode 100644
index 2408ad7..0000000
--- a/sci-libs/mkl/mkl-11.0.2.146.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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=2987
-INTEL_DPV=2013_update2
-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=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="mkl mkl-devel"
-INTEL_DAT_RPMS="mkl-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
-}