Removed INCLUDE variable, re-arrange pkgconfig files

(Portage version: 2.1.4_rc14)

5 files changed, 36 insertions, 35 deletions

diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index f94a82c9aaf6..840e87ff5544 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.21 2007/11/21 00:29:28 bicatali Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.22 2008/01/08 09:53:37 bicatali Exp $
+
+  08 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+  files/cblas.pc.in, files/lapack.pc.in, mkl-9.1.023.ebuild:
+  Removed INCLUDE variable, re-arrange pkgconfig files
 
   21 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> mkl-9.1.023.ebuild:
   Removed PROVIDE, now lapack is new style virtual
diff --git a/sci-libs/mkl/files/blas.pc.in b/sci-libs/mkl/files/blas.pc.in
index 7ab8307605db..09cddf9581f4 100644
--- a/sci-libs/mkl/files/blas.pc.in
+++ b/sci-libs/mkl/files/blas.pc.in
@@ -1,11 +1,10 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
-includedir=/usr/include
+libdir=${prefix}/@LIBDIR@
+includedir=@INCDIR@
 
 Name: blas
 Description: MKL implementations of the F77 Basic Linear Algebra Subroutines
 Version: @PV@
 URL: http://developer.intel.com/software/products/mkl/
-Libs: @GFORTRANLIBS@ -L${libdir} -lblas
-Libs.private: @EXTLIBS@
+Libs: @GFORTRANLIBS@ -L${libdir} -lblas @EXTLIBS@
diff --git a/sci-libs/mkl/files/cblas.pc.in b/sci-libs/mkl/files/cblas.pc.in
index bbf4af767406..4e928f96e9b6 100644
--- a/sci-libs/mkl/files/cblas.pc.in
+++ b/sci-libs/mkl/files/cblas.pc.in
@@ -7,6 +7,5 @@ Name: cblas
 Description: MKL implementations of the C Basic Linear Algebra Subroutines
 Version: @PV@
 URL: http://developer.intel.com/software/products/mkl/
-Libs: @GFORTRANLIBS@ -L${libdir} -lcblas
-Libs.private: @EXTLIBS@
+Libs: @GFORTRANLIBS@ -L${libdir} -lblas @EXTLIBS@
 Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/lapack.pc.in b/sci-libs/mkl/files/lapack.pc.in
index 4e217574fa0d..92dc934ee1f4 100644
--- a/sci-libs/mkl/files/lapack.pc.in
+++ b/sci-libs/mkl/files/lapack.pc.in
@@ -1,12 +1,11 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
-includedir=/usr/include
+libdir=${prefix}/@LIBDIR@
+includedir=@INCDIR@
 
 Name: lapack
 Description: MKL implementations of the F77 Linear Algebra PACKage
 Version: @PV@
 URL: http://developer.intel.com/software/products/mkl/
 Requires: blas
-Libs: @GFORTRANLIBS@ -L${libdir} -llapack
-Libs.private: @EXTLIBS@
+Libs: @GFORTRANLIBS@ -L${libdir} -llapack @EXTLIBS@
diff --git a/sci-libs/mkl/mkl-9.1.023.ebuild b/sci-libs/mkl/mkl-9.1.023.ebuild
index 26429634d68c..700ef4b1d10a 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
+# Copyright 1999-2008 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.6 2007/11/21 00:29:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.7 2008/01/08 09:53:37 bicatali Exp $
 
 inherit eutils versionator toolchain-funcs fortran
 
@@ -79,13 +79,13 @@ src_unpack() {
 	addwrite /opt/intel
 	cp ${MKL_LICENSE} "${WORKDIR}"/
 	MKL_LIC="$(basename ${MKL_LICENSE})"
-	cat > mkl.ini << EOF
-[MKL]
-EULA_ACCEPT_REJECT=ACCEPT
-FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
-INSTALLMODE=NONRPM
-INSTALL_DESTINATION=${S}
-EOF
+	cat > mkl.ini <<- EOF
+		[MKL]
+		EULA_ACCEPT_REJECT=ACCEPT
+		FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
+		INSTALLMODE=NONRPM
+		INSTALL_DESTINATION=${S}
+	EOF
 	einfo "Extracting ..."
 	./install \
 		--silent ${PWD}/mkl.ini \
@@ -207,15 +207,16 @@ mkl_install_lib() {
 	cp -pPR "${S}"/${proflib} "${D}"${MKL_DIR}
 
 	for x in blas cblas; do
-		cat  > eselect.${x}.${prof} << EOF
-${libdir}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/lib${x}.a
-${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so
-${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so.0
-${libdir}/${x}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc
-EOF
+		cat  > eselect.${x}.${prof} <<- EOF
+			${libdir}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/lib${x}.a
+			${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so
+			${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so.0
+			${libdir}/${x}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc
+		EOF
 
 		[[ ${x} == cblas ]] && \
-			echo "${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h" >> eselect.${x}.${prof}
+			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:" \
@@ -227,12 +228,12 @@ EOF
 		doins ${x}.pc
 	done
 
-	cat > eselect.lapack.${prof} << EOF
-${libdir}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
-${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
-${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
-${libdir}/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
-EOF
+	cat > eselect.lapack.${prof} <<- EOF
+		${libdir}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
+		${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
+		${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
+		${libdir}/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
+	EOF
 	sed -e "s:@LIBDIR@:$(get_libdir):" \
 		-e "s:@PV@:${PV}:" \
 		-e "s:@EXTLIBS@:${extlibs}:g" \
@@ -279,7 +280,6 @@ src_install() {
 	done
 
 	echo "MANPATH=${MKL_DIR}/man"  >> ${env_file}
-	echo "INCLUDE=${MKL_DIR}/include" >> ${env_file}
 	doenvd ${env_file} || die "doenvd failed"
 }