Fix bug 501762, pkg-pretend check that dependencies are built with the same blas library as currently selected with "eselect blas show" was incorrect when "pkg-config --libs-only-l blas" listed more than 1 library, thanks to Helmut Jarausch for reporting.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

3 files changed, 14 insertions, 8 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 9b4d9ebe19b2..0a89ba9f75c1 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.149 2014/02/19 23:47:48 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.150 2014/02/20 00:59:19 gienah Exp $
+
+  20 Feb 2014; Mark Wright <gienah@gentoo.org> octave-3.8.0.ebuild:
+  Fix bug 501762, pkg-pretend check that dependencies are built with the same
+  blas library as currently selected with "eselect blas show" was incorrect when
+  "pkg-config --libs-only-l blas" listed more than 1 library, thanks to Helmut
+  Jarausch for reporting.
 
   19 Feb 2014; Mark Wright <gienah@gentoo.org> octave-3.8.0.ebuild:
   Thanks to Olivier Huber for fixing and reporting bug 501784: replace the use
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index a1cd78b58fc7..5ff5a5f1b6ce 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -19,13 +19,13 @@ DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd
 DIST octave-3.8.0.tar.bz2 17669638 SHA256 519330c6dd34eb69ca26a811722948fceac2acebd67ba924eba9b34a2e5a94f9 SHA512 2e8b81b418e235cddd6678d7cc83b8441c64b36f98854ab704c1b34d5ff711d3f6cce7ffe33f5f70a7bc231b2219b39d16033e6b9d04174cbab68f21c5a8abec WHIRLPOOL ace3d162722b0e47d78fbf8029396c3e5690a4260d5fcef09be4a1a58f7a1144888f5829a47f77d344ca20fa6844c55b80955e7093c5cd2e98a89188b6ec3708
 EBUILD octave-3.6.4-r1.ebuild 3509 SHA256 3eec5c95449373742628be9031622a5b7c6771203df72da13f3654be9c011c50 SHA512 1e4e72e3f67a46c31ee84208141535305d2daa6770dd2767cc523951e140d95de0bda897a1a0f1f88a16cd120b0cccf6ee7691d73effb02d83b1d8b760c85564 WHIRLPOOL 3bf445ad674658f35f0b3ea0665788d328c84f12d166c6f512033b4531c6a9260806d4d68256dc974826abadf85994fcd7cadd64368cd9c4ebd818974c224177
 EBUILD octave-3.6.4.ebuild 3478 SHA256 686c2b49e3aaadf7bc41ecc46908126d65f1510c285a575efb74a5586d28d3b4 SHA512 897cac6e403bf709b6eafa0fa885905b91015d40cff5fd7d6187bd45c0ec95dd68dee3415152b9c29b85bc48b781797b1ada9d3001ea0625c6f97f5bd4dd48b7 WHIRLPOOL 09fdeafb13a7a814fd1304a493c76227fe7b0b7ea420cdcab2c944864a0319f62505f214be9796edee57cc370e8a7e6be0dbbe55035afbbc2a4c37033a6bebf4
-EBUILD octave-3.8.0.ebuild 6048 SHA256 e34d19d0e42a934ba64899740fe773c5456815f7bc579486201b6ef62e0f722e SHA512 9a057cdffbf24896d8344af8c4108f80303aac0e5af99026e1b673175cf8fe2693a7eb8d82d2b29b4ec8606781aae25ef6296df2eaa7388a07f8e5bc3f61cadf WHIRLPOOL 5b4d71d39cf6691be7b75f4b6d3d027cb1cd8f2ba4f341210012b08e54df5d6ee6878f5da594c589c26c7e26b025353e5091286f9924045c6174312f94587c85
-MISC ChangeLog 34766 SHA256 bdeba11e2970791a5c1a88473f371f746c37763e39124b659af0f71eaf6d9975 SHA512 9f0860b1f2c6e90987c4faadff508cd5f8fe0d00617be66d802b01c3388be377d21967b7da1d0b15b256ec6a0e92f51714d647417984df77f2bc6f27f6e70535 WHIRLPOOL 0bb8a16d004a49cc60b33493dcc69c0f5339be1a08e18e087503f27b532564a447c707b592948a833aa1be256797ef468d50e49f6052f215ab5030259e53d56c
+EBUILD octave-3.8.0.ebuild 6059 SHA256 43130b7d67b2375cbac9113130b102523ac317aefd7320b1b64d1f318e664aa7 SHA512 c0f0a983b22dde058d98e68c2c36200a25d9f776370528e864f5afa2878adae2ebe1e2c1f6067fde24194b71f1863fd2d41b722b42d105da04490a8c59947a66 WHIRLPOOL d48af931f30f3bf2a14c24dc33e6bec4395790d68e4dee069fb5202b967f2c69e42e88429f600cf428b78b65c87d13bd43b1395bf13ebdced2e98c8a24c949e9
+MISC ChangeLog 35099 SHA256 54950c79d4ab2aba008b6ef5ace992c75aae166b3320a134b4ad9174eff6c16c SHA512 324b3d58daf277f68b1f4586df9e49ed307d5cb5cd105d0c96ef66a53d375e9c51cd080b82073ccc04e18f47993df0d98cfc788194b52e713c420511c347e68c WHIRLPOOL c72085156fab5827f7b2fec0e34c2646a8323368ede1878cc9b0821f824993bc0aa8b1b767f690b1e1d7f0e6456b391f2d8ee59085336c60fcceec3c3080a720
 MISC metadata.xml 1022 SHA256 1b65adbdcc076642a258fff07b7e362922ac22a8498b20bd96e2c97a2ea45a10 SHA512 bf855dac972af2db8e39396a50fbdc1199f28bf4b29cf2c78315f608584f0258a12985f021003b84553bf289c734397d8c7f92666c022b6b1f68f1ebccf89966 WHIRLPOOL b6d90f1eeec501dab72503cc677792abca0fbc1476d627868090abc2438940ec24088fc95a53df058dffc793f8101a7057a85c64aef6395da6c39864c2f45305
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMFQq0ACgkQoBEVQmGOlx8OxAD/dJsnnCCffso0w+hXLbwUQTYu
-eoGr7cBSyJ4mhKr1IZIBALzQlmovVqjdMqBBVFs39quLv/Rw1NXK1oQ0Y8fgRXuc
-=xbw4
+iF4EAREIAAYFAlMFU28ACgkQoBEVQmGOlx9OGwEA1CZw0ddxtBeBc4vyMFTXkgOl
+cI9rBIjfS39ZLQxN9woA+gJK8RQjkYVRDflqeeehnQ39OQEPVdFIHxdx0yC9L9v6
+=q5Lz
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-3.8.0.ebuild b/sci-mathematics/octave/octave-3.8.0.ebuild
index 06137d1c6a27..89276e82f0ed 100644
--- a/sci-mathematics/octave/octave-3.8.0.ebuild
+++ b/sci-mathematics/octave/octave-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.0.ebuild,v 1.2 2014/02/19 23:47:48 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.0.ebuild,v 1.3 2014/02/20 00:59:19 gienah Exp $
 
 EAPI=5
 
@@ -81,7 +81,7 @@ PATCHES=(
 
 pkg_pretend() {
 	if use qrupdate || use sparse; then
-		local blaslib=$(pkg-config --libs-only-l "blas" | sed -e 's@.*-l@lib@' | cut -d' ' -f 1)
+		local blaslib=$(pkg-config --libs-only-l "blas" | sed -e 's@-l\([^ \t]*\)@lib\1@' | cut -d' ' -f 1)
 		einfo "Checking dependencies are built with the same blas lib = ${blaslib}"
 		local usr_lib="${ROOT}usr/$(get_libdir)"
 		local libs=( )