Sync with gentoo-x86

6 files changed, 31 insertions, 20 deletions

diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
index 7b4de14..3d77cb1 100644
--- a/sci-libs/blas-reference/Manifest
+++ b/sci-libs/blas-reference/Manifest
@@ -19,10 +19,10 @@ MD5 2d7bae33a1553ed8eccbdb971a459ff2 files/f77-reference 396
 RMD160 13f0db8c8917b283ae330995657046f93ab03369 files/f77-reference 396
 SHA256 4714651b2f82bd42d36b8ff3bfb993c1e4478af35d40dc51210f63d74aa02b8d files/f77-reference 396
 DIST blas.tgz 94981 RMD160 d2cea3ae6156b6f583fae5e590695ffb306abb80 SHA256 bd062a79e35a9a835cfd8eaebe6262bbb195610336cf07435cd2b7df200bf084 size 94981
-EBUILD blas-reference-19940131-r3.ebuild 1265 RMD160 2d7f45837a5c49af1c0d3d9fc35406175431daa2 SHA1 de5217e31ef024c989eef1a7da42a25ada61c6ac SHA256 0ab99cf5ca4aa528fa0e19c3d83807ada7d8bb182023b7551d863584c8221080 size 1265
-MD5 b95972038163f7dfab7eafdb77a95c01 blas-reference-19940131-r3.ebuild 1265
-RMD160 2d7f45837a5c49af1c0d3d9fc35406175431daa2 blas-reference-19940131-r3.ebuild 1265
-SHA256 0ab99cf5ca4aa528fa0e19c3d83807ada7d8bb182023b7551d863584c8221080 blas-reference-19940131-r3.ebuild 1265
+EBUILD blas-reference-19940131-r3.ebuild 1385 RMD160 edcb107d99deb150d43b846479305b5d3bcda86c SHA1 9fb13591c2e3feb59392d7f1505554b6471ec3a7 SHA256 e337e270e7de648bcce2eda94573df305ea615967f6246c9524adf27e06c4962 size 1385
+MD5 8688237fe5b4b0a0d3356c1632dbbd9a blas-reference-19940131-r3.ebuild 1385
+RMD160 edcb107d99deb150d43b846479305b5d3bcda86c blas-reference-19940131-r3.ebuild 1385
+SHA256 e337e270e7de648bcce2eda94573df305ea615967f6246c9524adf27e06c4962 blas-reference-19940131-r3.ebuild 1385
 MISC ChangeLog 3517 RMD160 b1fd3df053ef9094325fa50071fde83ca52ccc1d SHA1 ac72171c48900f79c7a11a47b2a82ed153aa6225 SHA256 da06df340efe49b3922b9692c402740f045477b82672d84335e8603f617c9f1e size 3517
 MD5 83f0a14f991c70dac3702c846ff02fd1 ChangeLog 3517
 RMD160 b1fd3df053ef9094325fa50071fde83ca52ccc1d ChangeLog 3517
diff --git a/sci-libs/blas-reference/blas-reference-19940131-r3.ebuild b/sci-libs/blas-reference/blas-reference-19940131-r3.ebuild
index 62b9f88..862ba27 100644
--- a/sci-libs/blas-reference/blas-reference-19940131-r3.ebuild
+++ b/sci-libs/blas-reference/blas-reference-19940131-r3.ebuild
@@ -33,11 +33,16 @@ src_unpack() {
 }
 
 src_install() {
+	# Profile information will be installed in TOP_PATH:
+	TOP_PATH="${DESTTREE}"/$(get_libdir)/blas
+	# Libraries will be installed in RPATH:
+	RPATH="${TOP_PATH}"/reference
+
 	make DESTDIR="${D}" install || die "install failed"
 
 	# Fix for switching
-	dodir /usr/$(get_libdir)/blas/reference
-	mv ${D}/usr/$(get_libdir)/libblas* ${D}/usr/$(get_libdir)/blas/reference/
+	dodir ${RPATH}
+	mv ${D}/usr/$(get_libdir)/libblas* ${D}/${RPATH}
 
 	eselect blas add $(get_libdir) ${FILESDIR}/eselect-reference reference
 }
diff --git a/sci-libs/cblas-reference/Manifest b/sci-libs/cblas-reference/Manifest
index 8c84ec9..2fd6841 100644
--- a/sci-libs/cblas-reference/Manifest
+++ b/sci-libs/cblas-reference/Manifest
@@ -11,10 +11,10 @@ MD5 bddabfc29eb0e9bfb0a74c07c190a890 files/eselect-reference 161
 RMD160 a9e46d774bcb10e156a887bf04a4bb0698df5234 files/eselect-reference 161
 SHA256 91cf48fe44b0c4f54738b2a138d1bdc091388b67d33802552d7186b011d80aad files/eselect-reference 161
 DIST cblas.tgz 197694 RMD160 77bd5111659f55540c72f9fcd9277d97bd1ea33b SHA256 9b49d7177fda62b6141bf2ca29e475e86f0b12d8f72e0b944058d02b439dd52a size 197694
-EBUILD cblas-reference-20030223-r1.ebuild 1269 RMD160 323835159909ac6c5c1e02dca8ca4311bff27731 SHA1 7770767c8eee465f90297d881edb919bda564c91 SHA256 dd278e511604835681f57601b80ecac16e7a80fa10028ca24dfcb8fb555ee4e3 size 1269
-MD5 dee6c2f4874f71f2ca206a02c9b16a1f cblas-reference-20030223-r1.ebuild 1269
-RMD160 323835159909ac6c5c1e02dca8ca4311bff27731 cblas-reference-20030223-r1.ebuild 1269
-SHA256 dd278e511604835681f57601b80ecac16e7a80fa10028ca24dfcb8fb555ee4e3 cblas-reference-20030223-r1.ebuild 1269
+EBUILD cblas-reference-20030223-r1.ebuild 1294 RMD160 7e70eaced0a4884d38b42f24cb37b29a4dc4e5dc SHA1 0baa452e614bbda65391360806845579a4c79d93 SHA256 f10ac171893cc6fbf34922d43941a2bd486a49ad9d4d831d5763f9581861aa98 size 1294
+MD5 18e058d09c51a8f4800bad7361117443 cblas-reference-20030223-r1.ebuild 1294
+RMD160 7e70eaced0a4884d38b42f24cb37b29a4dc4e5dc cblas-reference-20030223-r1.ebuild 1294
+SHA256 f10ac171893cc6fbf34922d43941a2bd486a49ad9d4d831d5763f9581861aa98 cblas-reference-20030223-r1.ebuild 1294
 MISC ChangeLog 847 RMD160 b8856a206c96ea25927935acde27bfc673f40ce8 SHA1 63a8ae0880ab21ff04422801da8d5ea71d828735 SHA256 8264a72e4b233f4f7a378d816041e7e5ee13d0e12d5ebdf9ec695c10892c7a1e size 847
 MD5 89d2fb8343aa162e4f06c9bb0ce4e8d3 ChangeLog 847
 RMD160 b8856a206c96ea25927935acde27bfc673f40ce8 ChangeLog 847
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r1.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r1.ebuild
index 092e746..f1dc453 100644
--- a/sci-libs/cblas-reference/cblas-reference-20030223-r1.ebuild
+++ b/sci-libs/cblas-reference/cblas-reference-20030223-r1.ebuild
@@ -33,11 +33,14 @@ src_unpack() {
 }
 
 src_install() {
+	TOP_PATH="${DESTTREE}/$(get_libdir)/blas"
+	RPATH="${TOP_PATH}/reference"
+
 	make DESTDIR="${D}" install || die "install failed"
 
 	# Fix for switching
-	dodir /usr/$(get_libdir)/blas/reference
-	mv ${D}/usr/$(get_libdir)/libcblas* ${D}/usr/$(get_libdir)/blas/reference/
+	dodir ${RPATH}
+	mv ${D}/usr/$(get_libdir)/libcblas* ${D}/${RPATH}
 
 	dodoc "${S}"/README || die "failed to install docs"
 
diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
index fb3278e..7f6c7b3 100644
--- a/sci-libs/lapack-reference/Manifest
+++ b/sci-libs/lapack-reference/Manifest
@@ -8,10 +8,10 @@ RMD160 9929682d01a0ed8f90b37c797f882aa5c9547147 files/lapack-reference-3.0-autot
 SHA256 d5d74fe14c61ef836e03edff65fd685b5c230ce9ed0f7d842936cf48752271a0 files/lapack-reference-3.0-autotool.patch 21729
 DIST lapack-20020531-20021004.patch.bz2 59736 RMD160 126a579d242664dce53d23cdd7bef935e81b5031 SHA256 19bcae60fcec3742563d8b27e21da52677b18520c54cf0cb7a51537ec3dbd29c size 59736
 DIST lapack.tgz 4991992 RMD160 630f9d7b4b37b0d39bccd4816198271b7e9e0cce SHA256 393613641f80745e7e8445fd0f3e4f5f66a5e340c8115cd4d780b0f53e2b31a6 size 4991992
-EBUILD lapack-reference-3.0-r3.ebuild 1339 RMD160 884bcfffae42f6c65f3cdff249c0f596d9ba378a SHA1 cb5b5f884e8b32bb0367e4e8ea800b2e8e9648e3 SHA256 364078740ae3c219c7e8b04fcef16aa1c42cc5c594aecf2fab720c27bb2a9e1c size 1339
-MD5 f087a0f7daf1502cdbc572c919f95f72 lapack-reference-3.0-r3.ebuild 1339
-RMD160 884bcfffae42f6c65f3cdff249c0f596d9ba378a lapack-reference-3.0-r3.ebuild 1339
-SHA256 364078740ae3c219c7e8b04fcef16aa1c42cc5c594aecf2fab720c27bb2a9e1c lapack-reference-3.0-r3.ebuild 1339
+EBUILD lapack-reference-3.0-r3.ebuild 1372 RMD160 dae8535bfd01e2d7e4e48877dfdced379d024d6b SHA1 e1af08e68f8e6f0c80b5a4cfbf80ccb485565507 SHA256 e8bb19abfc648faf79a2ef8f3af39dc94e6da9e6fb0568b6e5440f4c2a5db5fa size 1372
+MD5 ee64bf8e5d04494e81a83a81089ec752 lapack-reference-3.0-r3.ebuild 1372
+RMD160 dae8535bfd01e2d7e4e48877dfdced379d024d6b lapack-reference-3.0-r3.ebuild 1372
+SHA256 e8bb19abfc648faf79a2ef8f3af39dc94e6da9e6fb0568b6e5440f4c2a5db5fa lapack-reference-3.0-r3.ebuild 1372
 MISC ChangeLog 1588 RMD160 e403bf5f08bc11f9665357fe7cdc2b06609a935f SHA1 2855037e13fe473d213817e8e197be0b90148d5a SHA256 e553540747fc4efb8824e92a511bf562c8413075063b5ba2c4d8aff8dc5efbc9 size 1588
 MD5 7b3e3472bf3f2540693ecf7e476fa91e ChangeLog 1588
 RMD160 e403bf5f08bc11f9665357fe7cdc2b06609a935f ChangeLog 1588
diff --git a/sci-libs/lapack-reference/lapack-reference-3.0-r3.ebuild b/sci-libs/lapack-reference/lapack-reference-3.0-r3.ebuild
index f030de8..186a427 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.0-r3.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.0-r3.ebuild
@@ -19,8 +19,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND="virtual/blas
 	app-admin/eselect-lapack"
 
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
+DEPEND="${RDEPEND}"
 
 PROVIDE="virtual/lapack"
 
@@ -37,11 +36,15 @@ src_unpack() {
 }
 
 src_install() {
+	TOP_PATH="${DESTTREE}"/lib/lapack
+	# Library will be installed in RPATH:
+	RPATH="${TOP_PATH}"/reference
+
 	make DESTDIR="${D}" install || die "install failed"
 
 	# Fix for switching
-	dodir /usr/$(get_libdir)/lapack/reference
-	mv ${D}/usr/$(get_libdir)/liblapack* ${D}/usr/$(get_libdir)/lapack/reference/
+	dodir ${RPATH}
+	mv ${D}/usr/$(get_libdir)/liblapack* ${D}/${RPATH}
 
 	dodoc "${S}"/README