Now pkg-config files link to the atlas dirs

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64

7 files changed, 23 insertions, 14 deletions

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index e0a96f79b72f..7eefefa18469 100644
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/blas-atlas
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.88 2008/09/23 14:20:11 bicatali Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.89 2009/01/14 19:11:06 bicatali Exp $
+
+  14 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+  files/cblas.pc.in, blas-atlas-3.9.3.ebuild:
+  Now pkg-config files link to the atlas dirs, also fixed cblas and blas
+  requires
 
   23 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
   files/eselect.cblas.threaded-atlas:
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild
index b8b0f474bc54..4f7b8b2e0936 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild,v 1.3 2008/08/29 00:35:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild,v 1.4 2009/01/14 19:11:06 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran multilib
 
@@ -155,7 +155,7 @@ src_install () {
 	cp "${FILESDIR}"/blas.pc.in blas.pc
 	cp "${FILESDIR}"/cblas.pc.in cblas.pc
 	sed -i \
-		-e "s:@LIBDIR@:$(get_libdir):" \
+		-e "s:@LIBDIR@:$(get_libdir)/blas/atlas:" \
 		-e "s:@PV@:${PV}:" \
 		-e "s:@EXTLIBS@:${extlibs}:g" \
 		-e "s:@THREADLIBS@:${threadlibs}:g" \
@@ -177,7 +177,7 @@ src_install () {
 		cp "${FILESDIR}"/cblas.pc.in cblas.pc
 		threadlibs="-lpthread"
 		sed -i \
-			-e "s:@LIBDIR@:$(get_libdir):" \
+			-e "s:@LIBDIR@:$(get_libdir)/blas/threaded-atlas:" \
 			-e "s:@PV@:${PV}:" \
 			-e "s:@EXTLIBS@:${extlibs}:g" \
 			-e "s:@THREADLIBS@:${threadlibs}:g" \
diff --git a/sci-libs/blas-atlas/files/blas.pc.in b/sci-libs/blas-atlas/files/blas.pc.in
index 8c0eefe28acf..5cf74ad09708 100644
--- a/sci-libs/blas-atlas/files/blas.pc.in
+++ b/sci-libs/blas-atlas/files/blas.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
+libdir=${prefix}/@LIBDIR@
 includedir=${prefix}/include
 
 Name: blas
diff --git a/sci-libs/blas-atlas/files/cblas.pc.in b/sci-libs/blas-atlas/files/cblas.pc.in
index d40314043f56..0cc53b237f54 100644
--- a/sci-libs/blas-atlas/files/cblas.pc.in
+++ b/sci-libs/blas-atlas/files/cblas.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
+libdir=${prefix}/@LIBDIR@
 includedir=${prefix}/include
 
 Name: cblas
diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index 645976f1590d..c27c9e704ee5 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/lapack-atlas
-# Copyright 2004-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.72 2008/09/05 20:50:10 bicatali Exp $
+# Copyright 2004-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.73 2009/01/14 19:14:03 bicatali Exp $
+
+  14 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> files/lapack.pc.in,
+  lapack-atlas-3.9.3.ebuild:
+  Now pkg-config files link to the atlas dirs
 
   05 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
   -files/lapack-reference-3.0-autotool.patch,
diff --git a/sci-libs/lapack-atlas/files/lapack.pc.in b/sci-libs/lapack-atlas/files/lapack.pc.in
index 26b340a4d4af..2e0fa6c6fba2 100644
--- a/sci-libs/lapack-atlas/files/lapack.pc.in
+++ b/sci-libs/lapack-atlas/files/lapack.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
+libdir=${prefix}/@LIBDIR@
 includedir=${prefix}/include
 
 Name: lapack
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild
index b9206337aaf9..6a2ca484a128 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild,v 1.3 2008/11/28 09:37:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild,v 1.4 2009/01/14 19:14:03 bicatali Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator
 
@@ -141,7 +141,7 @@ src_compile() {
 		|| die "Failed to create liblapack.la"
 
 	# making pkg-config file
-	sed -e "s:@LIBDIR@:$(get_libdir):" \
+	sed -e "s:@LIBDIR@:$(get_libdir)/lapack/atlas:" \
 		-e "s:@PV@:${PV}:" \
 		-e "s:@EXTLIBS@:-lm ${flibs}:g" \
 		"${FILESDIR}"/lapack.pc.in > "${S}"/lapack.pc \