added mkl directory in pkgconfig cflags

Package-Manager: portage-2.1.3.12

4 files changed, 23 insertions, 18 deletions

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index 09be9a6020d6..fd28971b10d7 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2007/10/11 16:48:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.18 2007/10/15 16:07:05 bicatali Exp $
+
+  15 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> files/cblas.pc.in,
+  mkl-9.1.023.ebuild:
+  added mkl directory in pkgconfig cflags
 
   11 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> mkl-9.1.023.ebuild:
   fixed lib->get_libdir for eselect bug workaround
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 3a0b4d5f6607..25922ecda2de 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -5,24 +5,24 @@ AUX blas.pc.in 272 RMD160 6cda1e3b357cd20f9d11cace684eb052e7cb20e1 SHA1 5a93a650
 MD5 f37aa52613f32364296f5adef64029c5 files/blas.pc.in 272
 RMD160 6cda1e3b357cd20f9d11cace684eb052e7cb20e1 files/blas.pc.in 272
 SHA256 21ae12b8f1ca4f01b7ce046276a0558ad03b79a6f511cbdd5e20f80530326160 files/blas.pc.in 272
-AUX cblas.pc.in 296 RMD160 006666d64f4a623c65975a5f9f541588796aff73 SHA1 4930a616d6c6ce4218c95e9b54e7f59671bd585f SHA256 73d5e224fd48c7c7b3a36a2d7ecae2ada6ae1635b9893cfbd7d69e11b1775380
-MD5 57b2d177663b4182e7c4c43001f9fa61 files/cblas.pc.in 296
-RMD160 006666d64f4a623c65975a5f9f541588796aff73 files/cblas.pc.in 296
-SHA256 73d5e224fd48c7c7b3a36a2d7ecae2ada6ae1635b9893cfbd7d69e11b1775380 files/cblas.pc.in 296
+AUX cblas.pc.in 292 RMD160 964cda46d4fbe9c7d25512c4e8b511904d098ae4 SHA1 3a846b1790291fa899e887bcafa311d8b24234bd SHA256 90af020bc4df33e8b7388c8efa7237285b62ea28d7aabd44adce0516f4761107
+MD5 599047f14061edb5375e0037ed07a0f8 files/cblas.pc.in 292
+RMD160 964cda46d4fbe9c7d25512c4e8b511904d098ae4 files/cblas.pc.in 292
+SHA256 90af020bc4df33e8b7388c8efa7237285b62ea28d7aabd44adce0516f4761107 files/cblas.pc.in 292
 AUX lapack.pc.in 281 RMD160 23f4f81bf84270e866c385e73dbf9688eec0e214 SHA1 355f71093f52ef471fdab028deea8273eeed8759 SHA256 da94506a04082c7f9897f341d72842317e466170ae7c33a2a40bc71d3602efbf
 MD5 0eaa741317e6d753a85efd9b65d46122 files/lapack.pc.in 281
 RMD160 23f4f81bf84270e866c385e73dbf9688eec0e214 files/lapack.pc.in 281
 SHA256 da94506a04082c7f9897f341d72842317e466170ae7c33a2a40bc71d3602efbf files/lapack.pc.in 281
 DIST l_mkl_enh_p_9.1.023.tgz 316915220 RMD160 afdcb8ef28053e9ee5b1a3f8b9e6126c58b94f4b SHA1 9b03333627ab69cf9139838444e6e43d0b7404c8 SHA256 609ba57261b4959dfc8e6e56959f93ff7dba7b568ca5c80e09f4013df0207106
 DIST l_mkl_p_9.1.023.tgz 155907883 RMD160 f5d34a170c77fe9929daf6a83bade6d845ada2ad SHA1 52693b9aca15d43a890af92e0686b651834baace SHA256 7315e35a48b8cbe5af4cdcd24b2ccbd3971048b40e965ccaf9b4d655d98bdecd
-EBUILD mkl-9.1.023.ebuild 8482 RMD160 66f0bc995469961440c41744e8f84e55e768d31a SHA1 a349814b43a38c926bdad5a95b5aabcb3afb0ada SHA256 94742c632a9dc4aa3eb7e8537229615f0732f65f33a854dfca378d8656474e45
-MD5 cf9ac24d6ff8e9d8d5a7dd67fa56cf0d mkl-9.1.023.ebuild 8482
-RMD160 66f0bc995469961440c41744e8f84e55e768d31a mkl-9.1.023.ebuild 8482
-SHA256 94742c632a9dc4aa3eb7e8537229615f0732f65f33a854dfca378d8656474e45 mkl-9.1.023.ebuild 8482
-MISC ChangeLog 4241 RMD160 204697b269fc4558153e5128e32b375497a7e228 SHA1 b4d64788c99db00688c1e856bf215cb77bda5b6f SHA256 393d2fcce6fb9d1a0d9f4d37a00b5577fe4c4dd675fb86184d77cfeb317bf863
-MD5 346edc29be5f08e3bfc5ac6779d91c93 ChangeLog 4241
-RMD160 204697b269fc4558153e5128e32b375497a7e228 ChangeLog 4241
-SHA256 393d2fcce6fb9d1a0d9f4d37a00b5577fe4c4dd675fb86184d77cfeb317bf863 ChangeLog 4241
+EBUILD mkl-9.1.023.ebuild 8523 RMD160 5111c7c054afffb96b1a72a4955612d47acb7c43 SHA1 ba645ed052580378444d30ff1dc9d1302a09d1f5 SHA256 3e3728f0aae5e88349c587b4fd27b3897467a25e00af08541f0e5d04c50156fd
+MD5 ea594a3b958f5380c149691f0cae2281 mkl-9.1.023.ebuild 8523
+RMD160 5111c7c054afffb96b1a72a4955612d47acb7c43 mkl-9.1.023.ebuild 8523
+SHA256 3e3728f0aae5e88349c587b4fd27b3897467a25e00af08541f0e5d04c50156fd mkl-9.1.023.ebuild 8523
+MISC ChangeLog 4380 RMD160 6eca481f55b93adb6784dcf35cf9803c33f9a66b SHA1 f9dc0bf650688fb854ea17302916464ee71aba7d SHA256 eb824698a204ce7ec4adf4ca2bedf7bdbbc0c9f2c6aff17fd1b68ca52b411a70
+MD5 545b1e971ad3ffbb9c7fa5f803959284 ChangeLog 4380
+RMD160 6eca481f55b93adb6784dcf35cf9803c33f9a66b ChangeLog 4380
+SHA256 eb824698a204ce7ec4adf4ca2bedf7bdbbc0c9f2c6aff17fd1b68ca52b411a70 ChangeLog 4380
 MISC metadata.xml 605 RMD160 a48ecbc106b8037bc5ea0c075d0b1efe1c9532b2 SHA1 ca9d24da338e47cbeceec284d724405291d4d29a SHA256 449f256f34be916da81300d86c5c224fd01aeb378d35c10274de9b42e61896da
 MD5 baff61776b3939e7c0f39aca5cb99378 metadata.xml 605
 RMD160 a48ecbc106b8037bc5ea0c075d0b1efe1c9532b2 metadata.xml 605
@@ -33,7 +33,7 @@ SHA256 4d6a55d472b164daba360ca503d9071907142bb6956d5d396f235ec38df5225d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHDlP+1ycZbhPLE2ARAgJsAJ0Q/tcug4sGUqpgpnU//D5kpIMLiwCfVul/
-F1RBmeMh4dqkh6JeCPXST5E=
-=Buz9
+iD8DBQFHE5BA1ycZbhPLE2ARAuddAKCVOFn6JtV/LMpUVfmAtP5YEg7mLgCgoXpx
+g3yQvK1dbxrXcaMUGrVKZs8=
+=DfMQ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mkl/files/cblas.pc.in b/sci-libs/mkl/files/cblas.pc.in
index eea3d786f9d9..572ea1177f47 100644
--- a/sci-libs/mkl/files/cblas.pc.in
+++ b/sci-libs/mkl/files/cblas.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
 libdir=/usr/@LIBDIR@
-includedir=/usr/include
+includedir=@INCDIR@
 
 Name: cblas
 Description: MKL implementations of the C Basic Linear Algebra Subroutines
diff --git a/sci-libs/mkl/mkl-9.1.023.ebuild b/sci-libs/mkl/mkl-9.1.023.ebuild
index 36861b552ec7..6ed59bea558e 100644
--- a/sci-libs/mkl/mkl-9.1.023.ebuild
+++ b/sci-libs/mkl/mkl-9.1.023.ebuild
@@ -1,6 +1,6 @@
 # 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.1.023.ebuild,v 1.2 2007/10/11 16:48:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.3 2007/10/15 16:07:05 bicatali Exp $
 
 inherit eutils versionator toolchain-funcs fortran
 
@@ -218,6 +218,7 @@ EOF
 			echo "${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h" >> eselect.${x}.${prof}
 		eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
 		sed -e "s:@LIBDIR@:$(get_libdir):" \
+			-e "s:@INCDIR@:${MKL_DIR}/include:" \
 			-e "s:@PV@:${PV}:" \
 			-e "s:@EXTLIBS@:${extlibs}:g" \
 			"${FILESDIR}"/${x}.pc.in > ${x}.pc || die "sed ${x}.pc failed"