Version bump. Reorganized the ebuild to take into account new systems. Added a multi-processor profile, only used with the ifc case, but

  soon with gfortran-4.2. Fix bug #141127
Package-Manager: portage-2.1.2.7

9 files changed, 351 insertions, 5 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index dadebff03ca8..01dffc5cda04 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sci-libs/acml
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.19 2007/02/22 05:48:15 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.20 2007/06/01 16:05:35 bicatali Exp $
+
+*acml-3.6.1 (01 Jun 2007)
+*acml-3.6.0 (01 Jun 2007)
+
+  01 Jun 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/eselect.blas-mp, +files/eselect.cblas-mp, +files/eselect.lapack-mp,
+  +acml-3.6.0.ebuild, +acml-3.6.1.ebuild:
+  Version bump. Reorganized the ebuild to take into account new systems. 
+  acml-3.6.0 is for g77 and ifc compilers, acml-3.6.1 for the gfortran
+  compiler. Added a multi-processor profile, only used with the ifc case, but
+  soon with gfortran-4.2. Fix bug #141127, thanks to Adam
+  <ediap@et.put.poznan.pl>, Sun Bing <subi.the.dream.walker@gmail.com> and
+  others in the bug.
 
   22 Feb 2007; Jeff Gardner <je_fro@gentoo.org> ChangeLog:
   Really changing the manifest this time...
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index 19fd3cc8b263..7de0085a2c43 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX c-ACML.blas 465 RMD160 71b32038e97db51ff63ca9090bc1b3cd759c1768 SHA1 4110d471675aa5821bf862b9658d6c0509e98c54 SHA256 3f784a81417fc88dcbfc4bbf4b2497eeef5b1f88084ea5b948725c1aa54ef3fd
 MD5 e92e9b2507e25e7826de1be1cce7c7ae files/c-ACML.blas 465
 RMD160 71b32038e97db51ff63ca9090bc1b3cd759c1768 files/c-ACML.blas 465
@@ -6,14 +9,26 @@ AUX eselect.blas 108 RMD160 05fece4e673888d0789d3f37acf8334b6f092215 SHA1 c6c0a7
 MD5 10da41a85197dba393c5890a177411d9 files/eselect.blas 108
 RMD160 05fece4e673888d0789d3f37acf8334b6f092215 files/eselect.blas 108
 SHA256 43b03eec34f379e940fcefa1a49f97a8cc6ff3b7f5f62404af676560be941fb9 files/eselect.blas 108
+AUX eselect.blas-mp 117 RMD160 846651c8b4b8b8f530455e2d39e5e1de303010b3 SHA1 6820e9ce4ec5ccf033e9fb16d07bd5b22a12b99b SHA256 4580e7254d0299f4312dc5976b5162483d81a30114995300f3256cfafeaf2e9b
+MD5 aa54ad92f173cca943db75fbdee12342 files/eselect.blas-mp 117
+RMD160 846651c8b4b8b8f530455e2d39e5e1de303010b3 files/eselect.blas-mp 117
+SHA256 4580e7254d0299f4312dc5976b5162483d81a30114995300f3256cfafeaf2e9b files/eselect.blas-mp 117
 AUX eselect.cblas 111 RMD160 d4ff2aa58b4ed03fde8148abc4ba7e9fb3a1544a SHA1 8bcc411448dfd6312c72b274594f0d3d240d814f SHA256 a4a8acf6fd59ad749eacb9c0515afc59bae7847b5f4bd4c39bb7225d486db911
 MD5 7b432169c637b1bba33c6b26b021f2a2 files/eselect.cblas 111
 RMD160 d4ff2aa58b4ed03fde8148abc4ba7e9fb3a1544a files/eselect.cblas 111
 SHA256 a4a8acf6fd59ad749eacb9c0515afc59bae7847b5f4bd4c39bb7225d486db911 files/eselect.cblas 111
+AUX eselect.cblas-mp 120 RMD160 02f23e55fece91ad48715e496a138b5b6a379320 SHA1 673041642fa5d290f7511ef08fb7db6fa3739507 SHA256 88df84eae47466abd31d5f8bef5296b720c958d7dcc33dc06f1a9ae1696533a3
+MD5 6fd0793e981562ea5f3639abf45662b8 files/eselect.cblas-mp 120
+RMD160 02f23e55fece91ad48715e496a138b5b6a379320 files/eselect.cblas-mp 120
+SHA256 88df84eae47466abd31d5f8bef5296b720c958d7dcc33dc06f1a9ae1696533a3 files/eselect.cblas-mp 120
 AUX eselect.lapack 114 RMD160 83b8e1cd596684a35ec3a828cc323f03ae639b70 SHA1 e99eb6905dfdbbade02c232c9b9d0623a56249c6 SHA256 ca24eea3b494cc7f3bd22b0393de2103d271204e752b4ff04f4f89b58b6ec9ea
 MD5 94717d22c30bcff8556afcc37a2d13fc files/eselect.lapack 114
 RMD160 83b8e1cd596684a35ec3a828cc323f03ae639b70 files/eselect.lapack 114
 SHA256 ca24eea3b494cc7f3bd22b0393de2103d271204e752b4ff04f4f89b58b6ec9ea files/eselect.lapack 114
+AUX eselect.lapack-mp 123 RMD160 783a5945cd625390fb539a782981bb6c3674656b SHA1 37e187bd013835bba41b48749cb5fd36aaf7c391 SHA256 e276165112f3f9717e863b55691d8dd47cf2632ff700e3b8b0b4156ca6e480b8
+MD5 bf14ac9cacf767fb06f85feada619f85 files/eselect.lapack-mp 123
+RMD160 783a5945cd625390fb539a782981bb6c3674656b files/eselect.lapack-mp 123
+SHA256 e276165112f3f9717e863b55691d8dd47cf2632ff700e3b8b0b4156ca6e480b8 files/eselect.lapack-mp 123
 AUX f77-ACML.blas 430 RMD160 33b75ef866e80ee056f8697a7f0e220de0e15184 SHA1 2beffc053c4c2ea3ce5635ed54629e35ad49fed1 SHA256 df878933339cfc7a51c89b0b524f9be10cefd7f2dc83e4e27f9f822920ac7ee9
 MD5 ed54e2d6cb585bafe8a23f0a5d07c02b files/f77-ACML.blas 430
 RMD160 33b75ef866e80ee056f8697a7f0e220de0e15184 files/f77-ACML.blas 430
@@ -26,6 +41,13 @@ DIST acml-3-0-0-gnu-32bit.tgz 24117886 RMD160 6c8f4829c9b8ca5ec7250e2aad4d85bdfc
 DIST acml-3-0-0-gnu-64bit.tgz 9995385 RMD160 b3f979e6c303207bc22bdcb5057fd7e4aded51e9 SHA1 aaa0efbd314c69ce5b8112bd5997a9950343f98e SHA256 c9c447f871134214ffc363d4b8f2b4df1c4ccbb82e8b4e4c90601d01a7c745e5
 DIST acml-3-1-0-gnu-32bit.tgz 24132771 RMD160 45530e58db9cc6ff31721cca1f440a852ca6a2a9 SHA1 902f14ea0accb659deab4c2552f4ecf06bb9ad37 SHA256 32581925aad8df6449453cc62eeaa28a07b6c081b625a8a77e985859466e05de
 DIST acml-3-1-0-gnu-64bit.tgz 10052069 RMD160 6b32df6645068299e3905b5758c16dc1f21960e3 SHA1 a8334109b8a723f8a1e338b611c48d9951826882 SHA256 0d0002310297d03efff198bcc3204b5f690e9387f959d8bd8b78a0e4ca0f2f14
+DIST acml-3-6-0-gnu-32bit.tgz 9879145 RMD160 bafa6acd1d8a319fb385245559779450c7bdcd66 SHA1 7dad2ce9fb99572da79e127c711aabe29a888298 SHA256 81ee83babf134bc021e5e64983200abf815531ee20ecc5ecc97a30bbdb5cf6dd
+DIST acml-3-6-0-gnu-64bit.tgz 11101900 RMD160 f6d674a4fbf99e79109bb379d1ba5dbaf88ce010 SHA1 6f5aab32f396ac9cf99a9c142d89f0b835cb54f0 SHA256 240cd40c9f9c993c15ec113278faf8689713b45b7626da2d0c369024bec97c03
+DIST acml-3-6-0-ifort-32bit.tgz 17399749 RMD160 c41ebe1b62470858d176c5815e05893ba4caf4ad SHA1 87254fc12032ea9ea49822e00300774d8cda73b8 SHA256 1585df79ced4ecd6fdcbb59b36e2686b61d6faf7b755d5ac5a267eddeff36340
+DIST acml-3-6-0-ifort-64bit.tgz 21966276 RMD160 a6031f5cdacdc70d11c06cf6d8e8ae3149eff55f SHA1 094eb839d6a84ac5483588e965000862ae7ce40c SHA256 bdfb47a5f018d1bcca257b9223f176726663596ae0e8337dc295a312f8382950
+DIST acml-3-6-1-gfortran-32bit.tgz 17682562 RMD160 abdb8ea2f66f08f478a951b37c5ce5945854a357 SHA1 7606b690061319c50f30af11766694205b03922f SHA256 adec95c65d1042c65fa1490978b76042c3bf9670df7c226cd28431473985898c
+DIST acml-3-6-1-gfortran-64bit-int64.tgz 19802195 RMD160 3cb2317d6a5ec62797c4a11ab1336aabb50e16fa SHA1 a9be2f4ecbfdb6e0f849f545b66e78f752367f00 SHA256 56cbbb6deac2a93d21f3954511ad95ccc2a8ce893fdbf9a8605a2d81deb1fc41
+DIST acml-3-6-1-gfortran-64bit.tgz 20452058 RMD160 8df00704e7ac037dcd55a9207f45d6f0b2214ff8 SHA1 f0d2a10e5db83dc264d6f937189ce10a1f461a4d SHA256 efec543a8185ffb6e6e68db94ef0cbd92c1b9ee1580affe6cd0a73c580ad8bdc
 EBUILD acml-3.0.0.ebuild 1846 RMD160 5ee3db8e91f7899915d60fdce14b7b40ddd6b31f SHA1 a80974232851378660ee5bee159ae97f55eac4db SHA256 fa8055de001feff29531ae264af718f39902725084bdf9871f88c111ad2507e7
 MD5 489c42e9589e445ff005b6ef91a24771 acml-3.0.0.ebuild 1846
 RMD160 5ee3db8e91f7899915d60fdce14b7b40ddd6b31f acml-3.0.0.ebuild 1846
@@ -34,10 +56,18 @@ EBUILD acml-3.1.0-r1.ebuild 2223 RMD160 61ad9b824a924d9cf403ed4fff04a66495f4fcd7
 MD5 4de0d3696313d02840d78a31b4c659b1 acml-3.1.0-r1.ebuild 2223
 RMD160 61ad9b824a924d9cf403ed4fff04a66495f4fcd7 acml-3.1.0-r1.ebuild 2223
 SHA256 2024e4b182d5f6ed35966d32704b8f11f3f55a25828bf61dafce617176595a47 acml-3.1.0-r1.ebuild 2223
-MISC ChangeLog 3113 RMD160 0562f2ab7371aaf70a2e60b4a5d05636d92cc13d SHA1 493fad153a594a02e2950ae49e316b70bc642af9 SHA256 50a290be715b9759cf6906b126b60a77987a22308c7a7b16532393d80cb0337c
-MD5 98526bf124d81e03d270c480d1c1283d ChangeLog 3113
-RMD160 0562f2ab7371aaf70a2e60b4a5d05636d92cc13d ChangeLog 3113
-SHA256 50a290be715b9759cf6906b126b60a77987a22308c7a7b16532393d80cb0337c ChangeLog 3113
+EBUILD acml-3.6.0.ebuild 3467 RMD160 db01326bc972b25ccf03163587ed37ead6cf127e SHA1 f576a5029634634efb391971549d0357027f6ffd SHA256 d54c047d0759656a765434254e56ba3ccf1a9b94fdd14f8d2b55cdb684a43e84
+MD5 ea0ae1bee66fc0838f7bba81983224d8 acml-3.6.0.ebuild 3467
+RMD160 db01326bc972b25ccf03163587ed37ead6cf127e acml-3.6.0.ebuild 3467
+SHA256 d54c047d0759656a765434254e56ba3ccf1a9b94fdd14f8d2b55cdb684a43e84 acml-3.6.0.ebuild 3467
+EBUILD acml-3.6.1.ebuild 2678 RMD160 54561743cac4009499f5380cbe0b5388a33b99e7 SHA1 857e6513fd5b91c987b523dc5e2c40a7902b3460 SHA256 0eb6bf3af653ff4f374cd23d540b996e191320b2a2f3ce3a533adf2c7a265ed2
+MD5 8b9c34e533c207cd2bcbee6ed8709aa2 acml-3.6.1.ebuild 2678
+RMD160 54561743cac4009499f5380cbe0b5388a33b99e7 acml-3.6.1.ebuild 2678
+SHA256 0eb6bf3af653ff4f374cd23d540b996e191320b2a2f3ce3a533adf2c7a265ed2 acml-3.6.1.ebuild 2678
+MISC ChangeLog 3720 RMD160 ebce412bb54c3c04ebd14a88cf2b1b02b2efe4f3 SHA1 b41b1944b31dfacfcd6bc1f380741487ed184ce2 SHA256 74026774b49099de588cb434786978b2f62bef1eb48cc47fdd203f4648968570
+MD5 f3d8998052df8eb3668e80694d37a949 ChangeLog 3720
+RMD160 ebce412bb54c3c04ebd14a88cf2b1b02b2efe4f3 ChangeLog 3720
+SHA256 74026774b49099de588cb434786978b2f62bef1eb48cc47fdd203f4648968570 ChangeLog 3720
 MISC metadata.xml 879 RMD160 2d3f16b5906f71d5d455954d5b20afdc8b8aac1f SHA1 375f02d5d2550aa144c759818140e7f1c55de278 SHA256 a2b244cea577e4260368dad481a0b5886a471185f966288bc58af29fb335fe74
 MD5 a42a87565bfb006095c3fa658c84b275 metadata.xml 879
 RMD160 2d3f16b5906f71d5d455954d5b20afdc8b8aac1f metadata.xml 879
@@ -48,3 +78,16 @@ SHA256 452806a4581be468261f2c28eb6ada9cf3f1f0efb4217662de654085ba0c7253 files/di
 MD5 a7cd760fb34a3f70b2f1cd76c4ee794e files/digest-acml-3.1.0-r1 518
 RMD160 92c9e2afa50e9ea265fd1e73f175a3a55fc588af files/digest-acml-3.1.0-r1 518
 SHA256 6b247371ce9a1a190f833759fc570bc065870f0e0a9bdcd406a001541e933887 files/digest-acml-3.1.0-r1 518
+MD5 0825c9a4d803ec3e005d86b883c72998 files/digest-acml-3.6.0 1045
+RMD160 574657f2c6a1f3697428f9522c5d67fa18ce5193 files/digest-acml-3.6.0 1045
+SHA256 47bd4eee1e3dfc0f1b508ce5a41054c23089bb9b9d7add427abcdc24942a1887 files/digest-acml-3.6.0 1045
+MD5 f822ee466ea41e1f6900d64b52a495c6 files/digest-acml-3.6.1 840
+RMD160 47a3138d09b475dcfe429b1ac3fc9c8a31bee749 files/digest-acml-3.6.1 840
+SHA256 b1ab60561ac029d5f444f7c4b5c7c7dc1793f89ae5ec1b20baa7d4bfdb10a025 files/digest-acml-3.6.1 840
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGYEPa1ycZbhPLE2ARArzgAJwP+ejtb9dumRI+gNX+z49NNkQoqQCfSWKk
+FstcwB9BMkLwFBwvCa2Xm0s=
+=0RgR
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-3.6.0.ebuild b/sci-libs/acml/acml-3.6.0.ebuild
new file mode 100644
index 000000000000..f084d0168b28
--- /dev/null
+++ b/sci-libs/acml/acml-3.6.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0.ebuild,v 1.1 2007/06/01 16:05:35 bicatali Exp $
+
+inherit eutils toolchain-funcs fortran
+
+DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
+HOMEPAGE="http://developer.amd.com/acml.jsp"
+
+MY_PV=${PV//\./\-}
+S=${WORKDIR}
+
+SRC_URI="amd64? ( ifc? ( acml-${MY_PV}-ifort-64bit.tgz )
+				!ifc? ( acml-${MY_PV}-gnu-64bit.tgz ) )
+	x86? ( ifc? ( acml-${MY_PV}-ifort-32bit.tgz )
+		!ifc? ( acml-${MY_PV}-gnu-32bit.tgz ) )"
+
+RESTRICT="fetch nostrip"
+IUSE="ifc openmp doc examples"
+LICENSE="ACML"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="app-admin/eselect-blas
+	app-admin/eselect-cblas
+	app-admin/eselect-lapack"
+
+DEPEND="${RDEPEND}"
+
+PROVIDE="virtual/blas
+	virtual/lapack"
+
+pkg_nofetch() {
+	einfo "Please download the ACML from:"
+	einfo "${HOMEPAGE}"
+	einfo "and place it in ${DISTDIR}"
+	einfo "The previous versions could be found at"
+	einfo "http://developer.amd.com/acmlarchive.jsp"
+}
+
+pkg_setup() {
+	if use openmp && ! use ifc; then
+		eerror "Multi-processors ACML not available for g77 compiler"
+		eerror "Please either unset openmp USE flag, choose ifc or update acml"
+		die "setup openmp failed"
+	fi
+	elog "From version 3.5.0 on, ACML no longer supports"
+	elog "hardware without SSE/SSE2 instructions. "
+	elog "For older 32-bit hardware that does not support SSE/SSE2,"
+	elog "you must continue to use an older version (ACML 3.1.0 and ealier)."
+	epause
+	FORTRAN="g77"
+	use ifc && FORTRAN="ifc"
+	fortran_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	(DISTDIR="${S}" unpack contents-acml-*.tgz)
+	local fort
+	case ${FORTRANC} in
+		g77)
+			fort=gnu
+			;;
+		ifc|ifort)
+			fort=ifort
+			;;
+		*)
+			eerror "Unsupported fortran compiler: $FORTRANC"
+			die
+			;;
+	esac
+	local bits="32"
+	use amd64 && bits="64"
+	ACMLDIR=${S}/${fort}${bits}
+	use openmp && ACMLDIR="${ACMLDIR} ${ACMLDIR}_smp"
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+	return
+}
+
+src_test() {
+	for f in ${ACMLDIR}; do
+		einfo "Testing acml for $(basename ${f})"
+		for d in . acml_mv; do
+			cd "${f}/examples/${d}"
+			emake \
+				ACMLDIR="${f}" \
+				F77="${FORTRANC}" \
+				CC="$(tc-getCC)" \
+				CPLUSPLUS="$(tc-getCXX)" \
+				|| die "emake test in ${d} failed"
+			emake clean
+		done
+	done
+}
+
+src_install() {
+	# Libraries
+	for f in ${ACMLDIR}; do
+		dolib ${f}/lib/* || die "dolib failed"
+	done
+
+	# Headers (same openmp or not)
+	insinto /usr/include/acml
+	doins ${f}*/include/* || die "doins headers failed"
+	dosym acml/acml.h /usr/include/acml.h
+
+	# Documentation
+	dodoc ReleaseNotes*
+	cd ${S}/Doc
+	dodoc *.txt
+	doinfo *info*
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		doins acml.pdf
+		dohtml html/*
+	fi
+	if use examples; then
+		for f in ${ACMLDIR}; do
+			insinto "/usr/share/doc/${PF}/examples/$(basename ${f})"
+			doins -r ${f}/examples/*
+		done
+	fi
+
+	# eselect files
+	for l in blas cblas lapack; do
+		eselect ${l} add $(get_libdir) "${FILESDIR}"/eselect.${l} acml
+		use openmp && eselect ${l} add $(get_libdir) "${FILESDIR}"/eselect.${l}-mp acml-mp
+	done
+}
+
+pkg_postinst() {
+	# set acml if none are set yet
+	for l in blas cblas lapack; do
+		if [[ -z "$(eselect ${l} show)" ]]; then
+			if use openmp; then
+				eselect ${l} set acml-mp
+			else
+				eselect ${l} set acml
+			fi
+		fi
+		elog "To use ACML's BLAS features, you have to issue (as root):"
+		elog "\n\teselect ${l} set acml # or acml-mp for multi-processors\n"
+	done
+}
diff --git a/sci-libs/acml/acml-3.6.1.ebuild b/sci-libs/acml/acml-3.6.1.ebuild
new file mode 100644
index 000000000000..d59a5a09db61
--- /dev/null
+++ b/sci-libs/acml/acml-3.6.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1.ebuild,v 1.1 2007/06/01 16:05:35 bicatali Exp $
+
+inherit eutils toolchain-funcs fortran
+
+DESCRIPTION="AMD Core Math Library (ACML) for x86 and amd64 CPUs"
+HOMEPAGE="http://developer.amd.com/acml.jsp"
+
+MY_PV=${PV//\./\-}
+S=${WORKDIR}
+SRC_URI="x86? ( acml-${MY_PV}-gfortran-32bit.tgz )
+	amd64? ( int64? ( acml-${MY_PV}-gfortran-64bit-int64.tgz )
+		!int64? ( acml-${MY_PV}-gfortran-64bit.tgz ) )"
+
+RESTRICT="fetch nostrip"
+IUSE="int64 doc examples"
+LICENSE="ACML"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="app-admin/eselect-blas
+	app-admin/eselect-cblas
+	app-admin/eselect-lapack"
+
+DEPEND="${RDEPEND}"
+
+PROVIDE="virtual/blas
+	virtual/lapack"
+
+pkg_nofetch() {
+	einfo "Please download the ACML from:"
+	einfo "${HOMEPAGE}"
+	einfo "and place it in ${DISTDIR}"
+	einfo "The previous versions could be found at"
+	einfo "http://developer.amd.com/acmlarchive.jsp"
+}
+
+pkg_setup() {
+	elog "From version 3.5.0 on, ACML no longer supports"
+	elog "hardware without SSE/SSE2 instructions. "
+	elog "For older 32-bit hardware that does not support SSE/SSE2,"
+	elog "you must continue to use an older version (ACML 3.1.0 and ealier)."
+	epause
+	FORTRAN="gfortran"
+	fortran_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	(DISTDIR="${S}" unpack contents-acml-*.tgz)
+	local bits="32"
+	use amd64 && bits="64"
+	local i64=""
+	use int64 && i64="_int64"
+	ACMLDIR=${S}/${FORTRANC}${bits}${i64}
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+	return
+}
+
+src_test() {
+	einfo "Testing acml"
+	for d in . acml_mv; do
+		cd "${ACMLDIR}/examples/${d}"
+		emake \
+			ACMLDIR="${ACMLDIR}" \
+			F77="${FORTRANC}" \
+			CC="$(tc-getCC)" \
+			CPLUSPLUS="$(tc-getCXX)" \
+			|| die "emake test in ${d} failed"
+		emake clean
+	done
+}
+
+src_install() {
+	# Libraries
+	dolib ${ACMLDIR}/lib/* || die "dolib failed"
+
+	# Headers
+	insinto /usr/include/acml
+	doins ${ACMLDIR}/include/* || die "doins headers failed"
+	dosym acml/acml.h /usr/include/acml.h
+
+	# Documentation
+	dodoc ReleaseNotes*
+	cd ${S}/Doc
+	dodoc *.txt
+	doinfo *info*
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		doins acml.pdf
+		dohtml html/*
+	fi
+	use examples && doins -r ${ACMLDIR}/examples
+
+	# eselect files
+	for l in blas cblas lapack; do
+		eselect ${l} add $(get_libdir) "${FILESDIR}"/eselect.${l} acml
+	done
+}
+
+pkg_postinst() {
+	# set acml if none are set yet
+	for l in blas cblas lapack; do
+		[[ -z "$(eselect ${l} show)" ]] && eselect ${l} set acml
+		elog "To use ACML's BLAS features, you have to issue (as root):"
+		elog "\n\teselect ${l} set acml # or acml-mp for multi-processors\n"
+	done
+}
diff --git a/sci-libs/acml/files/digest-acml-3.6.0 b/sci-libs/acml/files/digest-acml-3.6.0
new file mode 100644
index 000000000000..78ad50e56f66
--- /dev/null
+++ b/sci-libs/acml/files/digest-acml-3.6.0
@@ -0,0 +1,12 @@
+MD5 544b271fac69f3a5de4859c42962d257 acml-3-6-0-gnu-32bit.tgz 9879145
+RMD160 bafa6acd1d8a319fb385245559779450c7bdcd66 acml-3-6-0-gnu-32bit.tgz 9879145
+SHA256 81ee83babf134bc021e5e64983200abf815531ee20ecc5ecc97a30bbdb5cf6dd acml-3-6-0-gnu-32bit.tgz 9879145
+MD5 cd29b05621cc8af7094bc30e3d8288e3 acml-3-6-0-gnu-64bit.tgz 11101900
+RMD160 f6d674a4fbf99e79109bb379d1ba5dbaf88ce010 acml-3-6-0-gnu-64bit.tgz 11101900
+SHA256 240cd40c9f9c993c15ec113278faf8689713b45b7626da2d0c369024bec97c03 acml-3-6-0-gnu-64bit.tgz 11101900
+MD5 b142edc1cd30cee76262c7df3d6e491c acml-3-6-0-ifort-32bit.tgz 17399749
+RMD160 c41ebe1b62470858d176c5815e05893ba4caf4ad acml-3-6-0-ifort-32bit.tgz 17399749
+SHA256 1585df79ced4ecd6fdcbb59b36e2686b61d6faf7b755d5ac5a267eddeff36340 acml-3-6-0-ifort-32bit.tgz 17399749
+MD5 e887b75ceec837ba9778b3fe18913faa acml-3-6-0-ifort-64bit.tgz 21966276
+RMD160 a6031f5cdacdc70d11c06cf6d8e8ae3149eff55f acml-3-6-0-ifort-64bit.tgz 21966276
+SHA256 bdfb47a5f018d1bcca257b9223f176726663596ae0e8337dc295a312f8382950 acml-3-6-0-ifort-64bit.tgz 21966276
diff --git a/sci-libs/acml/files/digest-acml-3.6.1 b/sci-libs/acml/files/digest-acml-3.6.1
new file mode 100644
index 000000000000..31c6126b2492
--- /dev/null
+++ b/sci-libs/acml/files/digest-acml-3.6.1
@@ -0,0 +1,9 @@
+MD5 3aa80dc1a5fed2ccedceacffcbf22501 acml-3-6-1-gfortran-32bit.tgz 17682562
+RMD160 abdb8ea2f66f08f478a951b37c5ce5945854a357 acml-3-6-1-gfortran-32bit.tgz 17682562
+SHA256 adec95c65d1042c65fa1490978b76042c3bf9670df7c226cd28431473985898c acml-3-6-1-gfortran-32bit.tgz 17682562
+MD5 1eb1958766688332a83e4b9807031495 acml-3-6-1-gfortran-64bit-int64.tgz 19802195
+RMD160 3cb2317d6a5ec62797c4a11ab1336aabb50e16fa acml-3-6-1-gfortran-64bit-int64.tgz 19802195
+SHA256 56cbbb6deac2a93d21f3954511ad95ccc2a8ce893fdbf9a8605a2d81deb1fc41 acml-3-6-1-gfortran-64bit-int64.tgz 19802195
+MD5 f1df8d99221337e5644e85ca790e19c2 acml-3-6-1-gfortran-64bit.tgz 20452058
+RMD160 8df00704e7ac037dcd55a9207f45d6f0b2214ff8 acml-3-6-1-gfortran-64bit.tgz 20452058
+SHA256 efec543a8185ffb6e6e68db94ef0cbd92c1b9ee1580affe6cd0a73c580ad8bdc acml-3-6-1-gfortran-64bit.tgz 20452058
diff --git a/sci-libs/acml/files/eselect.blas-mp b/sci-libs/acml/files/eselect.blas-mp
new file mode 100644
index 000000000000..58af5042ffe3
--- /dev/null
+++ b/sci-libs/acml/files/eselect.blas-mp
@@ -0,0 +1,3 @@
+libacml_mp.so /usr/@LIBDIR@/libblas.so
+libacml_mp.so /usr/@LIBDIR@/libblas.so.0
+libacml_mp.a /usr/@LIBDIR@/libblas.a
diff --git a/sci-libs/acml/files/eselect.cblas-mp b/sci-libs/acml/files/eselect.cblas-mp
new file mode 100644
index 000000000000..e5d94c4f315f
--- /dev/null
+++ b/sci-libs/acml/files/eselect.cblas-mp
@@ -0,0 +1,3 @@
+libacml_mp.so /usr/@LIBDIR@/libcblas.so
+libacml_mp.so /usr/@LIBDIR@/libcblas.so.0
+libacml_mp.a /usr/@LIBDIR@/libcblas.a
diff --git a/sci-libs/acml/files/eselect.lapack-mp b/sci-libs/acml/files/eselect.lapack-mp
new file mode 100644
index 000000000000..5ad6e799543e
--- /dev/null
+++ b/sci-libs/acml/files/eselect.lapack-mp
@@ -0,0 +1,3 @@
+libacml_mp.so /usr/@LIBDIR@/liblapack.so
+libacml_mp.so /usr/@LIBDIR@/liblapack.so.0
+libacml_mp.a /usr/@LIBDIR@/liblapack.a