Bump. Fix a version-specific line.

Package-Manager: portage-2.1.1_rc1-r1

4 files changed, 247 insertions, 5 deletions

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 557b3b2d6d83..34a3708c4076 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/mkl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.7 2006/08/25 05:26:48 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.8 2006/08/30 06:37:30 dberkholz Exp $
+
+*mkl-8.1.014 (30 Aug 2006)
+
+  30 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; +mkl-8.1.014.ebuild:
+  Bump. Fix a version-specific line.
 
   25 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; +files/eselect.blas,
   +files/eselect.cblas, +files/eselect.lapack:
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 0e90e7967ee5..8524f500527e 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -11,6 +11,7 @@ MD5 ca1041dd861801b27255f1b395b02d3c files/eselect.lapack 165
 RMD160 3f092a71ecce27d775d2b287e4905dd697846944 files/eselect.lapack 165
 SHA256 f63fe4be093f1d44d4ffd449c9fc360ae69239d5443e72cb7d3ea09bcdae0d8c files/eselect.lapack 165
 DIST l_mkl_p_8.0.2.004.tgz 94983122 RMD160 a11834af3cc18eddd425a1c06e3c2b31a1d69cc5 SHA1 e828070bc3b3552fa54a861fdbd066066d479f2d SHA256 f74948cee237cf2f3f7c8d726327ab5caa1cd43e2c87600cd7a3411c057f0f7b
+DIST l_mkl_p_8.1.014.tgz 114683047 RMD160 e1dfcb3222c493955ec0a0f05368fd26af2767f9 SHA1 b9ef6367e864d835e77e762141b616eaa915d208 SHA256 77abc3622aaae5154a9636093259ee82f8b57d1b9d438ab10596eefbc4b2dc6c
 DIST mkl52lin_e.tar 32296960
 EBUILD mkl-5.2.ebuild 1151 RMD160 1bf7946aea4427ae4a94a44b364fdbca98a4f15f SHA1 cf0c695e4666a21a5374e60d09e11c2228390fac SHA256 a6fe150320b21999f336a1696f9819c4cdbf14868c65dff2f3079b2f8c2c8e38
 MD5 b5326ad7b00da4c13a0e4fb83b1e4988 mkl-5.2.ebuild 1151
@@ -20,10 +21,14 @@ EBUILD mkl-8.0.2.004.ebuild 5595 RMD160 cc63c71701499397c4d2ba9d4bafc1b948e2d930
 MD5 c2bbcd80933f7f42989e2ad0df611434 mkl-8.0.2.004.ebuild 5595
 RMD160 cc63c71701499397c4d2ba9d4bafc1b948e2d930 mkl-8.0.2.004.ebuild 5595
 SHA256 afb52d9eb90d5d592f1febbe0d0a612e5cfd6ae14350031dd5653d92c8c88cdb mkl-8.0.2.004.ebuild 5595
-MISC ChangeLog 2176 RMD160 31c78ef704a8b5baba7eb7106fb0f61206296d15 SHA1 e278a7f008ae873c071c32a89ca837a1925df500 SHA256 ffbcf3287c0c95e664964342aee6dd9b8401856070bdadd396c56b06e336cb97
-MD5 07225dd19e2cb548b1b15fa21056e103 ChangeLog 2176
-RMD160 31c78ef704a8b5baba7eb7106fb0f61206296d15 ChangeLog 2176
-SHA256 ffbcf3287c0c95e664964342aee6dd9b8401856070bdadd396c56b06e336cb97 ChangeLog 2176
+EBUILD mkl-8.1.014.ebuild 5590 RMD160 ff373d7660fa544fc79a91a10988d7dc26102ede SHA1 1e0d89a596b063dbdd522d04d20da49ee9c6b812 SHA256 8d7279c408abfaf8bd58c5c4c1a7325028b211bd314b4a1a57a5aa49ba75b952
+MD5 90fc4d9868f4994a6066be66534bd6cf mkl-8.1.014.ebuild 5590
+RMD160 ff373d7660fa544fc79a91a10988d7dc26102ede mkl-8.1.014.ebuild 5590
+SHA256 8d7279c408abfaf8bd58c5c4c1a7325028b211bd314b4a1a57a5aa49ba75b952 mkl-8.1.014.ebuild 5590
+MISC ChangeLog 2318 RMD160 aaee8cd01669a0f621b4504e5cfdd2a751a1f316 SHA1 afe92a7de6e7c5a916a57c299740b8526e2e6948 SHA256 a01d4842b450597bb195a0a1af129634c312c875c0ba9b983ad2d30e159a0147
+MD5 a0e87b4ef44709872c9cd3bda77ccc4e ChangeLog 2318
+RMD160 aaee8cd01669a0f621b4504e5cfdd2a751a1f316 ChangeLog 2318
+SHA256 a01d4842b450597bb195a0a1af129634c312c875c0ba9b983ad2d30e159a0147 ChangeLog 2318
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -34,3 +39,6 @@ SHA256 f4a7c4886cafae318c9a07dc342e09020d3665a01fe093a83a6b6013bb7d4e5f files/di
 MD5 52df3f37e16620d114f640decb55ae0e files/digest-mkl-8.0.2.004 250
 RMD160 0a348d74316dc417674bf87a936d72d8df926d92 files/digest-mkl-8.0.2.004 250
 SHA256 3856b75115545182790d0e8ac8ba707b2d3df2d4aeee89a446d1ede3f8010ad7 files/digest-mkl-8.0.2.004 250
+MD5 30dea7a46ab6823a2b8208cc9e921407 files/digest-mkl-8.1.014 247
+RMD160 bdc8b9e4fcfce1c2fce6ba698cb762e4b02e3d2c files/digest-mkl-8.1.014 247
+SHA256 e9d85a1bd4094dcd26349cede9b5691fda216f88caa85551a05f1062bb82a335 files/digest-mkl-8.1.014 247
diff --git a/sci-libs/mkl/files/digest-mkl-8.1.014 b/sci-libs/mkl/files/digest-mkl-8.1.014
new file mode 100644
index 000000000000..61b5b357182a
--- /dev/null
+++ b/sci-libs/mkl/files/digest-mkl-8.1.014
@@ -0,0 +1,3 @@
+MD5 c5af2e5a5cacf7f07cf0ad3c06e36497 l_mkl_p_8.1.014.tgz 114683047
+RMD160 e1dfcb3222c493955ec0a0f05368fd26af2767f9 l_mkl_p_8.1.014.tgz 114683047
+SHA256 77abc3622aaae5154a9636093259ee82f8b57d1b9d438ab10596eefbc4b2dc6c l_mkl_p_8.1.014.tgz 114683047
diff --git a/sci-libs/mkl/mkl-8.1.014.ebuild b/sci-libs/mkl/mkl-8.1.014.ebuild
new file mode 100644
index 000000000000..a293f983142d
--- /dev/null
+++ b/sci-libs/mkl/mkl-8.1.014.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-8.1.014.ebuild,v 1.1 2006/08/30 06:37:30 dberkholz Exp $
+
+inherit fortran rpm flag-o-matic
+
+MYPV=${PV%.*}
+DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, random number generators."
+HOMEPAGE="http://developer.intel.com/software/products/mkl/"
+SRC_URI="l_${PN}_p_${PV}.tgz"
+RESTRICT="nostrip fetch"
+
+#fortran95 implements a fortran 95 blas/lapack interface
+IUSE="fortran95 examples"
+SLOT="0"
+LICENSE="mkl-8.0.1"
+KEYWORDS="~x86 ~amd64 ~ia64"
+RDEPEND="virtual/libc
+	app-admin/eselect-blas
+	app-admin/eselect-cblas
+	app-admin/eselect-lapack"
+DEPEND="${RDEPEND}"
+PROVIDE="virtual/blas
+	virtual/lapack"
+
+
+S="${WORKDIR}/l_${PN}_p_${PV}"
+INSTDIR=opt/intel/${PN}/${MYPV}
+
+
+pkg_setup() {
+
+	if use fortran95; then
+		FORTRAN="ifc gfortran"
+		fortran_pkg_setup
+	fi
+
+	if  [ -z "${INTEL_LICENSE}" -a  -z \
+		$(find /opt/intel/licenses -name *mkl*.lic) ]; then
+		eerror "Did not find any valid mkl license."
+		eerror "Please locate your license file and run:"
+		eerror "\t INTEL_LICENSE=/my/license/files emerge ${PN}"
+		eerror "or place your license in /opt/intel/licenses and run emerge ${PN}"
+		elog
+		elog "http://www.intel.com/cd/software/products/asmo-na/eng/perflib/mkl/219859.htm"
+		elog "From the above url you can get a free, non-commercial"
+		elog "license to use the Intel Math Kernel Libary emailed to you."
+		elog "You cannot use mkl without this license file."
+		elog "Read the website for more information on this license."
+		elog
+	fi
+}
+
+
+# the whole shmol is to extract rpm files non-interactively
+# from the big mkl installation
+# hopefully recyclable for ipp
+src_unpack() {
+
+	ewarn
+	ewarn "Intel ${PN} requires 200Mb of disk space"
+	ewarn "Make sure you have enough space on /var and also in /opt/intel"
+	ewarn
+
+	unpack ${A}
+
+	# fake rpm commands to trick the big install script
+	mkdir -p bin
+	echo "exit 1" > bin/rpm2cpio
+	echo "exit 1" > bin/rpm
+	chmod +x bin/*
+	PATH=".:${PATH}:$PWD/bin"
+
+	cd ${S}/install
+	# answer file to make the big install script non-interactive
+	echo $"
+[${PN}_install]
+EULA_ACCEPT_REJECT=accept
+FLEXLM_LICENSE_LOCATION=${INTEL_LICENSE}
+TEMP_DIR=${WORKDIR}/rpm
+INSTALL_DESTINATION=${S}
+RPM_INSTALLATION=
+" > answers.txt
+
+	einfo "Building rpm file..."
+	./install \
+		--noroot \
+		--nonrpm \
+		--installpath ${S} \
+		--silent answers.txt &> /dev/null
+
+	[ -z $(find ${WORKDIR} -name "*.rpm") ] \
+		&& 	die "error while extracting the rpm"
+
+	rm -rf ${WORKDIR}/bin ${S}/*
+
+	cd ${S}
+	for x in $(ls ../rpm/*.rpm); do
+		einfo "Extracting $(basename ${x})..."
+		rpm_unpack ${x} || die "rpm_unpack failed"
+	done
+
+	# clean up
+	rm -rf ${WORKDIR}/rpm
+	rm -rf ${S}/${INSTDIR}/tools/environment
+}
+
+src_compile() {
+
+	case ${ARCH} in
+		amd64)
+			IARCH="em64t"
+			IKERN="em64t"
+			;;
+		ia64)
+			IARCH="64"
+			IKERN="ipf"
+			;;
+		x86)
+			IARCH="32"
+			IKERN="ia32"
+			;;
+	esac
+	ILIBDIR=${INSTDIR}/lib/${IARCH}
+	einfo "IARCH=$IARCH IKERN=$IKERN"
+
+	cd ${S}/${INSTDIR}/tools/builder
+	for x in blas cblas lapack; do
+		make ${IKERN} export=${FILESDIR}/${x}.list name=libmkl_${x} \
+			|| die "make ${IKERN} failed"
+	done
+
+	if use fortran95; then
+		local fc=${FORTRANC}
+		if [ "${FORTRANC}" = "ifc" ]; then
+			fc=ifort
+		fi
+		for x in blas lapack; do
+			cd ${S}/${INSTDIR}/interfaces/${x}95
+			make lib \
+				PLAT=lnx${IARCH/em64t/32e} \
+				FC=${fc} \
+				INSTALL_DIR=${S}/${ILIBDIR} || die "make lib failed"
+		done
+	fi
+}
+
+src_test() {
+	local fc="gnu"
+	[ "${FORTRANC}" = "ifc" ] && fc="ifort"
+
+	cd ${S}/${INSTDIR}/tests
+	for testdir in *; do
+		einfo "Testing $testdir"
+		cd ${testdir}
+		emake so$IARCH F=${fc} || die "make $testdir failed"
+	done
+}
+
+src_install () {
+	cd ${S}
+
+	# install license
+	if  [ -n "${INTEL_LICENSE}" -a -f "${INTEL_LICENSE}" ]; then
+		insinto /opt/intel/licenses
+		doins ${INTEL_LICENSE}
+	fi
+
+	# install documentation and include files
+	insinto /${INSTDIR}
+	doins -r ${INSTDIR}/{doc,include}
+	dodir /usr/include
+	dosym /${INSTDIR}/include /usr/include/${PN}
+	use examples && doins -r ${INSTDIR}/examples
+
+	# install static libraries
+	insinto /${ILIBDIR}
+	doins ${ILIBDIR}/*.a
+	dodir /usr/$(get_libdir)/{blas,lapack}/mkl
+	dosym /${ILIBDIR}/libmkl_${IKERN}.a \
+		/usr/$(get_libdir)/blas/mkl/libmkl_blas.a
+	dosym /${ILIBDIR}/libmkl_lapack.a \
+		/usr/$(get_libdir)/lapack/mkl/libmkl_lapack.a
+
+	# install shared libraries
+	insopts -m0755
+	doins ${ILIBDIR}/*.so
+	insinto /usr/$(get_libdir)/blas/mkl
+	doins ${INSTDIR}/tools/builder/libmkl_{,c}blas.so
+	insinto /usr/$(get_libdir)/lapack/mkl
+	doins ${INSTDIR}/tools/builder/libmkl_lapack.so
+
+	# install tools
+	insopts -m0644
+	insinto /${INSTDIR}
+	rm -f ${INSTDIR}/tools/builder/*.so
+	doins -r ${INSTDIR}/tools
+
+	# install eselect files
+	eselect blas add $(get_libdir) ${FILESDIR}/eselect.blas mkl
+	eselect cblas add $(get_libdir) ${FILESDIR}/eselect.cblas mkl
+	eselect lapack add $(get_libdir) ${FILESDIR}/eselect.lapack mkl
+
+	# install environment var
+	echo "LD_LIBRARY_PATH=/${ILIBDIR}" > 35mkl
+	doenvd 35mkl
+}
+
+pkg_postinst() {
+	if [[ -z "$(eselect blas show)" ]]; then
+		eselect blas set mkl
+	fi
+	if [[ -z "$(eselect cblas show)" ]]; then
+		eselect cblas set mkl
+	fi
+	if [[ -z "$(eselect lapack show)" ]]; then
+		eselect lapack set mkl
+	fi
+
+	elog "To use MKL's BLAS features, you have to issue (as root):"
+	elog "\n\teselect blas set mkl"
+	elog "To use MKL's CBLAS features, you have to issue (as root):"
+	elog "\n\teselect cblas set mkl"
+	elog "To use MKL's LAPACK features, you have to issue (as root):"
+	elog "\n\teselect lapack set mkl"
+}