From: Sebastien Fabbro Date: Sat, 24 Mar 2007 23:11:42 +0000 (+0000) Subject: Version bump. Removed an older version, added longdescription in metadata.xml, fixed... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2703cd7e3cdaa395b9509375b575498cd691e22d;p=gentoo.git Version bump. Removed an older version, added longdescription in metadata.xml, fixed bug #156517. The new ebuild has a lot of changes, since Intel has changed once more the installation process. Package-Manager: portage-2.1.2.2 --- diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog index bbf4559e9569..b289ad244fca 100644 --- a/sci-libs/mkl/ChangeLog +++ b/sci-libs/mkl/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sci-libs/mkl # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.11 2007/02/22 14:03:09 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.12 2007/03/24 23:11:42 bicatali Exp $ + +*mkl-9.0.018 (24 Mar 2007) + + 24 Mar 2007; Sébastien Fabbro files/eselect.blas, + files/eselect.cblas, files/eselect.lapack, metadata.xml, + -mkl-8.0.2.004.ebuild, mkl-8.1.014.ebuild, +mkl-9.0.018.ebuild: + Version bump. Removed an older version, added longdescription in + metadata.xml, fixed bug #156517. The new ebuild has a lot of changes, + since Intel has changed once more the installation process. 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest index 7f9a563c711c..1b60f4558180 100644 --- a/sci-libs/mkl/Manifest +++ b/sci-libs/mkl/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX blas.list 1050 RMD160 618c7482be1268dad69b7ca742b8a86f8d571780 SHA1 8ee37f68cc4dea120f30edf11318ba10dde918dc SHA256 ec32a80a91afc25753a82cb57c004cd3148fe190c3d9732ea12306c2a3df4c5d MD5 c731fd1c129c0790596f7d3b153863bc files/blas.list 1050 RMD160 618c7482be1268dad69b7ca742b8a86f8d571780 files/blas.list 1050 @@ -6,51 +9,58 @@ AUX cblas.list 1783 RMD160 00d4046503262d1d380e888f3a81c3948cb60392 SHA1 7209a39 MD5 155bb697870f65349127173ec70762c9 files/cblas.list 1783 RMD160 00d4046503262d1d380e888f3a81c3948cb60392 files/cblas.list 1783 SHA256 f2a415821c3b84665f632c6108839e0bae9a15ce0fdd2d31b3480df5de597b11 files/cblas.list 1783 -AUX eselect.blas 147 RMD160 6dfb729179af076c8fe39dcae739e0b78d9e79a2 SHA1 726b0e0c243a74019552cd074998fb0ed0d24d86 SHA256 3a0016002270052a11ad16200a8f53cdc19df842fe0472c292b4c07f8a3cf8c6 -MD5 3012b966efdf8de83dd30574ed19c5c9 files/eselect.blas 147 -RMD160 6dfb729179af076c8fe39dcae739e0b78d9e79a2 files/eselect.blas 147 -SHA256 3a0016002270052a11ad16200a8f53cdc19df842fe0472c292b4c07f8a3cf8c6 files/eselect.blas 147 -AUX eselect.cblas 141 RMD160 b9bdb8c9dd605bbd6b68ef16948fccf159f80f87 SHA1 d996f7dd0e9bcd436395b9ab91675a5a9c6adcd3 SHA256 58ce9abb62e4f76e1e4e244448f764df4bf081c79e8351570a90d4aea57353a4 -MD5 de683f4e5bb7b30cfd98c191c311b31c files/eselect.cblas 141 -RMD160 b9bdb8c9dd605bbd6b68ef16948fccf159f80f87 files/eselect.cblas 141 -SHA256 58ce9abb62e4f76e1e4e244448f764df4bf081c79e8351570a90d4aea57353a4 files/eselect.cblas 141 -AUX eselect.lapack 165 RMD160 3f092a71ecce27d775d2b287e4905dd697846944 SHA1 17a7c8e51d36ffc7df46e9e7e79f9fc9943d7a8e SHA256 f63fe4be093f1d44d4ffd449c9fc360ae69239d5443e72cb7d3ea09bcdae0d8c -MD5 ca1041dd861801b27255f1b395b02d3c files/eselect.lapack 165 -RMD160 3f092a71ecce27d775d2b287e4905dd697846944 files/eselect.lapack 165 -SHA256 f63fe4be093f1d44d4ffd449c9fc360ae69239d5443e72cb7d3ea09bcdae0d8c files/eselect.lapack 165 +AUX eselect.blas 137 RMD160 593c1408b899b8c6fa1ce4307f7efc684c62fa84 SHA1 e19f7f650a178d5b7862d1106ec57dc017e6df55 SHA256 60275ee2eb6a01e6d639e3790145a9d3cb517bc626d6d64d9647398168f6114a +MD5 799706ff0fe9d3d2baffc8087d1a6c53 files/eselect.blas 137 +RMD160 593c1408b899b8c6fa1ce4307f7efc684c62fa84 files/eselect.blas 137 +SHA256 60275ee2eb6a01e6d639e3790145a9d3cb517bc626d6d64d9647398168f6114a files/eselect.blas 137 +AUX eselect.cblas 135 RMD160 a38de6026ac675ae00529f2acb22545b47fd42cb SHA1 1b52b9b6df3851a3394f01aa761134266706e552 SHA256 c6d381ae536f7c22cd104d6a9b652c0db364f243758df59cf9931de6d2c9d960 +MD5 28a9e1b6eb182224dcb19da56ea64db7 files/eselect.cblas 135 +RMD160 a38de6026ac675ae00529f2acb22545b47fd42cb files/eselect.cblas 135 +SHA256 c6d381ae536f7c22cd104d6a9b652c0db364f243758df59cf9931de6d2c9d960 files/eselect.cblas 135 +AUX eselect.lapack 155 RMD160 cfc5d3808a8ac273c1af34ac4e67b41509a01460 SHA1 0fafd36652a26051b800215337e34e86ee9b78a5 SHA256 aab2e3bd0485c847c724a7b9b6129789cf7dccd151cea81c3cfa3f3eafef0ccf +MD5 67184ecd0abcae64e1e098fa1e9c3635 files/eselect.lapack 155 +RMD160 cfc5d3808a8ac273c1af34ac4e67b41509a01460 files/eselect.lapack 155 +SHA256 aab2e3bd0485c847c724a7b9b6129789cf7dccd151cea81c3cfa3f3eafef0ccf files/eselect.lapack 155 AUX lapack.list 10195 RMD160 c1da10df54ab72aac8958915fffc89a9aa4b5605 SHA1 9a7c0e0615eb36b539474baa2405fee766f2bc5b SHA256 79c77aee2c036a0b4d00f11f02f99c6c64cfa70e501adf782cbb3049d1adc0ac MD5 6d4738fc06a14b06e9f39e7c1492c2c0 files/lapack.list 10195 RMD160 c1da10df54ab72aac8958915fffc89a9aa4b5605 files/lapack.list 10195 SHA256 79c77aee2c036a0b4d00f11f02f99c6c64cfa70e501adf782cbb3049d1adc0ac files/lapack.list 10195 -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 l_mkl_p_9.0.018.tgz 142125233 RMD160 301566c09298ede7336224d2d33f07103cac1ffe SHA1 4a6e4813cda1bc96cf0484d36485f34c1441bdf4 SHA256 28f46ec621e54dac7ee9d4ddea448b80f8c8dfb7ed047d1f7166142f16755384 DIST mkl52lin_e.tar 32296960 RMD160 9897261583e7c1a6c1cc43e15e994a53ac84b43e SHA1 5ac908f115cc6b801db3930a8d581f26a257cfd4 SHA256 92099f4f3673e66df20dda7a38bbd09bf850dbbe0a0ec0e1b9c28ee544b08640 EBUILD mkl-5.2.ebuild 1151 RMD160 1bf7946aea4427ae4a94a44b364fdbca98a4f15f SHA1 cf0c695e4666a21a5374e60d09e11c2228390fac SHA256 a6fe150320b21999f336a1696f9819c4cdbf14868c65dff2f3079b2f8c2c8e38 MD5 b5326ad7b00da4c13a0e4fb83b1e4988 mkl-5.2.ebuild 1151 RMD160 1bf7946aea4427ae4a94a44b364fdbca98a4f15f mkl-5.2.ebuild 1151 SHA256 a6fe150320b21999f336a1696f9819c4cdbf14868c65dff2f3079b2f8c2c8e38 mkl-5.2.ebuild 1151 -EBUILD mkl-8.0.2.004.ebuild 5595 RMD160 cc63c71701499397c4d2ba9d4bafc1b948e2d930 SHA1 d126bdeefbd2b461ad19a125cc6598275430822a SHA256 afb52d9eb90d5d592f1febbe0d0a612e5cfd6ae14350031dd5653d92c8c88cdb -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 -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 2681 RMD160 1d1b269d1fcea881cf754e8bb046cf9e08abc4a5 SHA1 d4f0c216f34b5506763e89e495f1c6fa443c6af8 SHA256 2a1b8b253c17f3f182faa1d40a5bc21f34e12039f0cc243b5b4d4c0722363397 -MD5 0212b98084a17528c3a81b11e35612af ChangeLog 2681 -RMD160 1d1b269d1fcea881cf754e8bb046cf9e08abc4a5 ChangeLog 2681 -SHA256 2a1b8b253c17f3f182faa1d40a5bc21f34e12039f0cc243b5b4d4c0722363397 ChangeLog 2681 -MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 -MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 -RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156 -SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156 +EBUILD mkl-8.1.014.ebuild 5840 RMD160 6288c6654c2ec68d32cab3b2107d44618017bfc2 SHA1 955ced6b57a57ad81bf8b06805f873d639568440 SHA256 cbed8013f75800922ba0ea6ffa00982058eb7f0da8189f8140c4af0c06c6a3cd +MD5 9dbdc3a1e5499e58c30b5869a9219408 mkl-8.1.014.ebuild 5840 +RMD160 6288c6654c2ec68d32cab3b2107d44618017bfc2 mkl-8.1.014.ebuild 5840 +SHA256 cbed8013f75800922ba0ea6ffa00982058eb7f0da8189f8140c4af0c06c6a3cd mkl-8.1.014.ebuild 5840 +EBUILD mkl-9.0.018.ebuild 5628 RMD160 c34ff67a4f72eb2eb0cb7c60dc67fe35b116728d SHA1 5c41dbcb694873d97fbe898896081a23b420d08e SHA256 b45ad90031b8b7c93302b6c6cbb3a5d8a9cde732ac071d40aa7a70c4c5541d20 +MD5 f976499b72ee81a55d8e477a993ef2e8 mkl-9.0.018.ebuild 5628 +RMD160 c34ff67a4f72eb2eb0cb7c60dc67fe35b116728d mkl-9.0.018.ebuild 5628 +SHA256 b45ad90031b8b7c93302b6c6cbb3a5d8a9cde732ac071d40aa7a70c4c5541d20 mkl-9.0.018.ebuild 5628 +MISC ChangeLog 3116 RMD160 84c5a2e12d6a02991824694ff02de186a568cf27 SHA1 7c2a806b71f9f0b8abcfbc600e13d71bf08470f9 SHA256 6e5cf09b40f146040351db89e9bb1e484c3cad34aa3f733796ed1b4dcc13534f +MD5 6eff809ca38248d950010977a79a9bfe ChangeLog 3116 +RMD160 84c5a2e12d6a02991824694ff02de186a568cf27 ChangeLog 3116 +SHA256 6e5cf09b40f146040351db89e9bb1e484c3cad34aa3f733796ed1b4dcc13534f ChangeLog 3116 +MISC metadata.xml 481 RMD160 a09054538928f141418c568d2c7c9bcb8d1726b5 SHA1 1712ae4b1f953abb729081ee5bcad9c25a664a33 SHA256 864fd430ba21d8659332391aa8053d4a459a579277cfadca1ba391cd5455c83e +MD5 b7e27f7b36ac93542f623ba26e01c2ce metadata.xml 481 +RMD160 a09054538928f141418c568d2c7c9bcb8d1726b5 metadata.xml 481 +SHA256 864fd430ba21d8659332391aa8053d4a459a579277cfadca1ba391cd5455c83e metadata.xml 481 MD5 7c1a441859a6cd82dd268f82deee2b6b files/digest-mkl-5.2 229 RMD160 230bb99f2455dd0bc6785d7cd709e5a134c6e4c3 files/digest-mkl-5.2 229 SHA256 0f7bad20764b96df065480ccb1095f7e5800d9003d8258d6a18f1719f041231b files/digest-mkl-5.2 229 -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 +MD5 42edf94323a04eb50e9f840c35a47855 files/digest-mkl-9.0.018 247 +RMD160 1797e61bb017ad20fedae53fae73f86a20956a58 files/digest-mkl-9.0.018 247 +SHA256 72e01afc118847f60c3abd68b2feda781b8f9f8b6ae1a45fbd416ce262df1ad2 files/digest-mkl-9.0.018 247 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFGBbA91ycZbhPLE2ARAoVYAKCRb0i1iPcanbqoHN/EX79PPxmHwACfYzTz +N2ChQqGio+Ye4RMRiwRT6Vc= +=ojH+ +-----END PGP SIGNATURE----- diff --git a/sci-libs/mkl/files/digest-mkl-8.0.2.004 b/sci-libs/mkl/files/digest-mkl-8.0.2.004 deleted file mode 100644 index ff935df18160..000000000000 --- a/sci-libs/mkl/files/digest-mkl-8.0.2.004 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fd76dc20d94950ba9d865c3703b12051 l_mkl_p_8.0.2.004.tgz 94983122 -RMD160 a11834af3cc18eddd425a1c06e3c2b31a1d69cc5 l_mkl_p_8.0.2.004.tgz 94983122 -SHA256 f74948cee237cf2f3f7c8d726327ab5caa1cd43e2c87600cd7a3411c057f0f7b l_mkl_p_8.0.2.004.tgz 94983122 diff --git a/sci-libs/mkl/files/digest-mkl-9.0.018 b/sci-libs/mkl/files/digest-mkl-9.0.018 new file mode 100644 index 000000000000..775ce9b5061b --- /dev/null +++ b/sci-libs/mkl/files/digest-mkl-9.0.018 @@ -0,0 +1,3 @@ +MD5 4780d30b60e8410427fb3736a929f8bd l_mkl_p_9.0.018.tgz 142125233 +RMD160 301566c09298ede7336224d2d33f07103cac1ffe l_mkl_p_9.0.018.tgz 142125233 +SHA256 28f46ec621e54dac7ee9d4ddea448b80f8c8dfb7ed047d1f7166142f16755384 l_mkl_p_9.0.018.tgz 142125233 diff --git a/sci-libs/mkl/files/eselect.blas b/sci-libs/mkl/files/eselect.blas index a76e5fc7d3db..7a63e53f6349 100644 --- a/sci-libs/mkl/files/eselect.blas +++ b/sci-libs/mkl/files/eselect.blas @@ -1,3 +1,3 @@ -blas/mkl/libmkl_blas.so /usr/@LIBDIR@/libblas.so -blas/mkl/libmkl_blas.so /usr/@LIBDIR@/libblas.so.0 -blas/mkl/libmkl_blas.a /usr/@LIBDIR@/libblas.a +blas/mkl/libblas.so /usr/@LIBDIR@/libblas.so +blas/mkl/libblas.so.0 /usr/@LIBDIR@/libblas.so.0 +blas/mkl/libblas.a /usr/@LIBDIR@/libblas.a diff --git a/sci-libs/mkl/files/eselect.cblas b/sci-libs/mkl/files/eselect.cblas index 720c12b34176..27127cceefcf 100644 --- a/sci-libs/mkl/files/eselect.cblas +++ b/sci-libs/mkl/files/eselect.cblas @@ -1,3 +1,3 @@ mkl/mkl_cblas.h /usr/include/cblas.h -blas/mkl/libmkl_cblas.so /usr/@LIBDIR@/libcblas.so -blas/mkl/libmkl_cblas.so /usr/@LIBDIR@/libcblas.so.0 +blas/mkl/libcblas.so.0 /usr/@LIBDIR@/libcblas.so +blas/mkl/libcblas.so /usr/@LIBDIR@/libcblas.so.0 diff --git a/sci-libs/mkl/files/eselect.lapack b/sci-libs/mkl/files/eselect.lapack index a63719995681..7385a69defbe 100644 --- a/sci-libs/mkl/files/eselect.lapack +++ b/sci-libs/mkl/files/eselect.lapack @@ -1,3 +1,3 @@ -lapack/mkl/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so -lapack/mkl/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0 -lapack/mkl/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a +lapack/mkl/liblapack.so /usr/@LIBDIR@/liblapack.so +lapack/mkl/liblapack.so.0 /usr/@LIBDIR@/liblapack.so.0 +lapack/mkl/liblapack.a /usr/@LIBDIR@/liblapack.a diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml index b229aec85b8f..755ec66a5135 100644 --- a/sci-libs/mkl/metadata.xml +++ b/sci-libs/mkl/metadata.xml @@ -2,4 +2,11 @@ sci + +The Intel 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 +library, and random number generators. It also has multiprocessor +capacities. + diff --git a/sci-libs/mkl/mkl-8.0.2.004.ebuild b/sci-libs/mkl/mkl-8.0.2.004.ebuild deleted file mode 100644 index 1e176e791be7..000000000000 --- a/sci-libs/mkl/mkl-8.0.2.004.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# 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.0.2.004.ebuild,v 1.2 2006/08/17 20:12:15 dberkholz Exp $ - -inherit fortran rpm flag-o-matic - -MYPV=${PV/.004/} -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" -} diff --git a/sci-libs/mkl/mkl-8.1.014.ebuild b/sci-libs/mkl/mkl-8.1.014.ebuild index a293f983142d..fc069dcbaa17 100644 --- a/sci-libs/mkl/mkl-8.1.014.ebuild +++ b/sci-libs/mkl/mkl-8.1.014.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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 $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-8.1.014.ebuild,v 1.2 2007/03/24 23:11:42 bicatali Exp $ inherit fortran rpm flag-o-matic @@ -90,7 +90,7 @@ RPM_INSTALLATION= --silent answers.txt &> /dev/null [ -z $(find ${WORKDIR} -name "*.rpm") ] \ - && die "error while extracting the rpm" + && die "error while extracting the rpm" rm -rf ${WORKDIR}/bin ${S}/* @@ -126,7 +126,7 @@ src_compile() { cd ${S}/${INSTDIR}/tools/builder for x in blas cblas lapack; do - make ${IKERN} export=${FILESDIR}/${x}.list name=libmkl_${x} \ + make ${IKERN} export=${FILESDIR}/${x}.list name=lib${x} \ || die "make ${IKERN} failed" done @@ -178,17 +178,22 @@ src_install () { doins ${ILIBDIR}/*.a dodir /usr/$(get_libdir)/{blas,lapack}/mkl dosym /${ILIBDIR}/libmkl_${IKERN}.a \ - /usr/$(get_libdir)/blas/mkl/libmkl_blas.a + /usr/$(get_libdir)/blas/mkl/libblas.a dosym /${ILIBDIR}/libmkl_lapack.a \ - /usr/$(get_libdir)/lapack/mkl/libmkl_lapack.a + /usr/$(get_libdir)/lapack/mkl/liblapack.a # install shared libraries insopts -m0755 doins ${ILIBDIR}/*.so insinto /usr/$(get_libdir)/blas/mkl - doins ${INSTDIR}/tools/builder/libmkl_{,c}blas.so + newins ${INSTDIR}/tools/builder/libblas.so libblas.so.0 + newins ${INSTDIR}/tools/builder/libcblas.so libcblas.so.0 insinto /usr/$(get_libdir)/lapack/mkl - doins ${INSTDIR}/tools/builder/libmkl_lapack.so + newins ${INSTDIR}/tools/builder/liblapack.so liblapack.so.0 + dosym libblas.so.0 /usr/$(get_libdir)/blas/mkl/libblas.so + dosym libcblas.so.0 /usr/$(get_libdir)/blas/mkl/libcblas.so + dosym liblapack.so.0 /usr/$(get_libdir)/lapack/mkl/liblapack.so + # install tools insopts -m0644 diff --git a/sci-libs/mkl/mkl-9.0.018.ebuild b/sci-libs/mkl/mkl-9.0.018.ebuild new file mode 100644 index 000000000000..9de46cd4b690 --- /dev/null +++ b/sci-libs/mkl/mkl-9.0.018.ebuild @@ -0,0 +1,209 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.0.018.ebuild,v 1.1 2007/03/24 23:11:42 bicatali Exp $ + +inherit toolchain-funcs fortran + +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" + +IUSE="fortran95 fftw examples" +SLOT="0" +LICENSE="mkl-9.0" +KEYWORDS="~x86 ~amd64 ~ia64" +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 intel mkl from:" + einfo "http://www.intel.com/software/products/mkl/downloads/lin_mkl.htm" + einfo "and place it in ${DISTDIR}" + einfo "Also you need to register in ${HOMEPAGE}" + einfo "and keep the license Intel sent you" +} + +pkg_setup() { + + if [[ -z "${INTEL_LICENSE}" ]] && + [[ -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/dir emerge ${PN}" + eerror "or place your license in /opt/intel/licenses" + eerror "Hint: the license file is in the email Intel sent you" + die + fi + + # setting up compilers + INTEL_CC=gnu + [[ "$(tc-getCC)" == "icc" ]] && INTEL_CC=icc + # gfortran still not compiling tests nor fortran95 interface + FORTRAN="ifc g77" + use fortran95 && FORTRAN="ifc" + fortran_pkg_setup + + # setting up architecture name + case ${ARCH} in + x86) INTEL_ARCH="32" INTEL_KERN=ia32 ;; + amd64) INTEL_ARCH="em64t" INTEL_KERN=em64t ;; + ia64) INTEL_ARCH="64" INTEL_KERN=ipf ;; + esac +} + +src_unpack() { + + ewarn + ewarn "Intel ${PN} requires 400Mb of disk space" + ewarn "Make sure you have them on ${PORTAGE_TMPDIR} and in /opt/intel" + ewarn + unpack ${A} + + cd l_${PN}_p_${PV}/install + + # make an answer file to install non-interactivaly + # (devs: to produce such a file, first do it interactively + # tar xvf l_*; cd l_*/install; ./install --duplicate answers.txt) + echo $" +[MKL] +EULA_ACCEPT_REJECT=ACCEPT +FLEXLM_LICENSE_LOCATION= +INSTALLMODE=NONRPM +INSTALL_DESTINATION=${S} +" > answers.txt + + einfo "Extracting ..." + # the binary blob extractor forces installation in /opt/intel + addwrite /opt/intel + ./install \ + --silent answers.txt \ + --log log.txt &> /dev/null + + [[ -z $(find "${WORKDIR}" -name libmkl.so) ]] \ + && die "extracting failed" + + cd "${WORKDIR}" && rm -rf l_* +} + +src_compile() { + + cd "${S}"/tools/builder + for x in blas cblas lapack; do + emake \ + export="${FILESDIR}"/${x}.list \ + name=lib${x} \ + ${INTEL_KERN} || die "emake ${x} failed" + done + + if use fortran95; then + for x in blas95 lapack95; do + cd "${S}"/interfaces/${x} + emake -j1 \ + PLAT=lnx${INTEL_ARCH/em64t/32e} \ + FC=${FORTRANC} \ + INSTALL_DIR=../../lib/${INTEL_ARCH} \ + lib || die "emake ${x} failed" + done + fi + + if use fftw; then + for x in "${S}"/interfaces/fft*; do + cd "${x}" + emake \ + F=${INTEL_CC} \ + lib${INTEL_ARCH} || die "emake ${x} failed" + done + fi +} + +src_test() { + # only testing with g77/gcc for now + cd "${S}"/tests + for testdir in * ; do + einfo "Testing ${testdir}" + cd ${testdir} + emake \ + F=gnu \ + lib${INTEL_ARCH} || die "emake ${testdir} failed" + done +} + +src_install() { + + # install license in case of the extracting did not + if [ -n "${INTEL_LICENSE}" -a -f "${INTEL_LICENSE}" ]; then + insinto /opt/intel/licenses + doins "${INTEL_LICENSE}" + fi + + local install_dir=/opt/intel/${PN}/${PV:0:3} + dodir ${install_dir} + cp -pPR include lib man doc "${D}"${install_dir} + + dodir /usr/$(get_libdir)/{blas,lapack}/mkl + dosym ${install_dir}/lib/${INTEL_ARCH}/libmkl_${INTEL_KERN}.a \ + /usr/$(get_libdir)/blas/mkl/libblas.a + dosym ${install_dir}/lib/${INTEL_ARCH}/libmkl_${INTEL_KERN}.a \ + /usr/$(get_libdir)/blas/mkl/libcblas.a + dosym /${install_dir}/lib/${INTEL_ARCH}/libmkl_lapack.a \ + /usr/$(get_libdir)/lapack/mkl/liblapack.a + + insopts -m0755 + insinto /usr/$(get_libdir)/blas/mkl + newins tools/builder/libblas.so libblas.so.0 + newins tools/builder/libcblas.so libcblas.so.0 + insinto /usr/$(get_libdir)/lapack/mkl + newins tools/builder/liblapack.so liblapack.so.0 + + dosym libblas.so.0 /usr/$(get_libdir)/blas/mkl/libblas.so + dosym libcblas.so.0 /usr/$(get_libdir)/blas/mkl/libcblas.so + dosym liblapack.so.0 /usr/$(get_libdir)/lapack/mkl/liblapack.so + + dodir /usr/include + dosym ${install_dir}/include /usr/include/${PN} + + rm -f tools/builder/*.so + for d in plugins builder support; do + insinto ${install_dir}/tools + doins -r tools/${d} + done + + if use examples; then + insinto ${install_dir} + doins -r examples + fi + + 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 + + echo "INCLUDE=${install_dir}/include" > 35mkl + echo "MANPATH=${install_dir}/man" > 35mkl + echo "LDPATH=${install_dir}/lib/${INTEL_ARCH}" >> 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" +}