summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2014-02-19 23:47:48 +0000
committerMark Wright <gienah@gentoo.org>2014-02-19 23:47:48 +0000
commite5df75e160d4f53f87620d90ddd6036decfd0a29 (patch)
tree1162e7080332bf36c672b8e7a92bba2d7f26a436 /sci-mathematics/octave
parentAutomated update. (diff)
downloadgentoo-2-e5df75e160d4f53f87620d90ddd6036decfd0a29.tar.gz
gentoo-2-e5df75e160d4f53f87620d90ddd6036decfd0a29.tar.bz2
gentoo-2-e5df75e160d4f53f87620d90ddd6036decfd0a29.zip
Thanks to Olivier Huber for fixing and reporting bug 501784: replace the use of "!=" and "==" in pkg_pretend with the proper operator "-ne" and "-eq". One typo is also fixed.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'sci-mathematics/octave')
-rw-r--r--sci-mathematics/octave/ChangeLog7
-rw-r--r--sci-mathematics/octave/octave-3.8.0.ebuild8
2 files changed, 10 insertions, 5 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index e555b0124b33..9b4d9ebe19b2 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,11 @@
# 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.148 2014/02/19 00:52:33 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.149 2014/02/19 23:47:48 gienah Exp $
+
+ 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
+ of "!=" and "==" in pkg_pretend with the proper operator "-ne" and "-eq". One
+ typo is also fixed.
*octave-3.8.0 (19 Feb 2014)
diff --git a/sci-mathematics/octave/octave-3.8.0.ebuild b/sci-mathematics/octave/octave-3.8.0.ebuild
index 807336a03133..06137d1c6a27 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.1 2014/02/19 00:52:33 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.0.ebuild,v 1.2 2014/02/19 23:47:48 gienah Exp $
EAPI=5
@@ -82,7 +82,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)
- einfo "Checking dependencies are built wtih the same blas lib = ${blaslib}"
+ einfo "Checking dependencies are built with the same blas lib = ${blaslib}"
local usr_lib="${ROOT}usr/$(get_libdir)"
local libs=( )
use qrupdate && libs+=( "${usr_lib}"/libqrupdate.so )
@@ -98,10 +98,10 @@ pkg_pretend() {
# earlier versions of sci-libs/cholmod were not linked with blas, while as later
# versions are if built with the lapack use flag.
scanelf -n ${i} | grep -q "${blaslib}"
- if [[ $? != 0 ]]; then
+ if [[ $? -ne 0 ]]; then
# Does it appear to be linked with some blas or lapack library?
scanelf -n ${i} | egrep -q "blas|lapack"
- if [[ $? == 0 ]]; then
+ if [[ $? -eq 0 ]]; then
eerror "*******************************************************************************"
eerror "${i} must be rebuilt with ${blaslib}"
eerror ""