removed include from blas and lapack profiles. cleaning.

2 files changed, 11 insertions, 8 deletions

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index d7e1935..f76ea0b 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -2,6 +2,6 @@ DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90
 DIST atlas3.9.39.tar.bz2 5493831 RMD160 118ad28a6dab1633b55a4654a2b67688177dedb7 SHA1 025a62a6577035552cb48aeb45bb4270c3d66580 SHA256 ddb3804d3b2dada955f3b07f8c3b26aff274aaaa2de2211a15309aa892bc5c83
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.39.ebuild 5623 RMD160 205da9970ab07f0a01faf9055cc796bbc3c05e31 SHA1 fc6c8a28f73fd761094ffdaae6b9fcd87c488271 SHA256 eda4ca0c4fc10fb0cc2601fa0f93e2f3a79d1c1275695232751b59dbf2f64abf
+EBUILD atlas-3.9.39.ebuild 5875 RMD160 1903e0330eeab81b0ac3795e1bc42e3448d37b90 SHA1 9226bcf5b5053a7f3f8c7349e2c7cc2392ed03d8 SHA256 c12b5c962dc7f3baa0dee452e27ba45313bff0f1df2fc1a8444b50f1693cf52d
 MISC ChangeLog 621 RMD160 755eab85fb123a94aa51ad5cd331f2a51191f1d0 SHA1 123bb45ac67e3048c72d06505fc665923cabce03 SHA256 0baa2873a98dc52777c96696648f06ad7b51473fa08b6fa0ca03964ab54af3b7
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd
diff --git a/sci-libs/atlas/atlas-3.9.39.ebuild b/sci-libs/atlas/atlas-3.9.39.ebuild
index 5088452..e58c435 100644
--- a/sci-libs/atlas/atlas-3.9.39.ebuild
+++ b/sci-libs/atlas/atlas-3.9.39.ebuild
@@ -95,6 +95,8 @@ atlas_compile() {
 	popd > /dev/null
 }
 
+# transform a static archive into a shared library and install them
+# atlas_install_libs <mylib.a> linking libraries
 atlas_install_libs() {
 	local libname=$(basename ${1%.*})
 	einfo "Installing ${libname}"
@@ -110,7 +112,7 @@ atlas_install_libs() {
 	use static-libs && dolib.a "${S}_static"/lib/${libname}.a
 }
 
-# atlas_install_lib <lib>
+# atlas_install_profile <lib>
 atlas_install_profile() {
 	local libname=$(basename ${1%.*})
 	local modname=$(echo ${libname} | sed -r -e 's/lib(pt|f77|ptf77|)//')
@@ -121,7 +123,7 @@ atlas_install_profile() {
 		mv ${libname}.a ${libname/lib/libatl}.a
 		libname=${libname/lib/libatl}
 	fi
-	atlas_install_libs ${libname} -L. -latlas ${libs}
+	atlas_install_libs ${libname} -L. -latlas ${PTLIBS}
 	cat <<-EOF > ${profname}.pc
 		prefix=${EPREFIX}/usr
 		libdir=\${prefix}/$(get_libdir)
@@ -130,13 +132,15 @@ atlas_install_profile() {
 		Description: ${PN} ${profname}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -l${libname} ${LIBS}
+		Libs: -L\${libdir} -l${libname} -latlas ${PTLIBS}
 		Private: -lm
-		Cflags: -I\${includedir}/${PN}
 	EOF
 
 	if [[ ${modname} == clapack ]]; then
+		echo "Cflags: -I\${includedir}/${PN}" >> ${profname}.pc
 		echo "Requires: cblas" >> ${profname}.pc
+	elif [[ ${modname} == cblas ]]; then
+		echo "Cflags: -I\${includedir}/${PN}" >> ${profname}.pc
 	elif [[ ${modname} == lapack ]]; then
 		echo "Requires: cblas blas" >> ${profname}.pc
 	fi
@@ -195,9 +199,8 @@ src_test() {
 
 src_install() {
 	cd "${S}_shared/lib"
-	LIBS=-lm
-	[[ -e libptcblas.a ]] && LIBS="${libs} -lpthread"
-	atlas_install_libs libatlas.a
+	[[ -e libptcblas.a ]] && PTLIBS="-lpthread"
+	atlas_install_libs libatlas.a -lm ${PTLIBS}
 	local l
 	for l in lib*{blas,lapack}.a; do
 		atlas_install_profile ${l}