Fix bug 501756 - sci-mathematics/octave-3.8.0 LC_ALL=et_EE - octave.cc:485:56: error: Fallow_noninteger_range_as_index was not declared in this scope. Thanks to Priit Laes for reporting and debugging.

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

3 files changed, 19 insertions, 8 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 37e082ff3aa1..ced59a472e32 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.152 2014/02/20 03:05:52 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.153 2014/02/20 05:39:59 gienah Exp $
+
+  20 Feb 2014; Mark Wright <gienah@gentoo.org> octave-3.8.0.ebuild:
+  Fix bug 501756 - sci-mathematics/octave-3.8.0 LC_ALL=et_EE - octave.cc:485:56:
+  error: Fallow_noninteger_range_as_index was not declared in this scope. Thanks
+  to Priit Laes for reporting and debugging.
 
   20 Feb 2014; Mark Wright <gienah@gentoo.org>
   files/octave-3.8.0-imagemagick.patch:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 5af54f33626c..5322b724eb9b 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -20,13 +20,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 6135 SHA256 d9eae1e5b5757b12f2e5f3217dc8e30787787d18b8d5623b945467bb4b8bf7d7 SHA512 c5bf8ffff9ec8561d278ebcba71945ef69f689648bac4b8f8c7f4e0a765caba6868239d83aba0e6f3106091443e5fa46ed2b2f451dd3795e6c7029a90e62a532 WHIRLPOOL ece270d7220ab6dfa793f5941a25c42715e69cd4e736834f5f66cd92a9d8a0d2f0eaa8f21b570928315f9e63995fe57bf6ed4679b7ef22720afbb9fd51708369
-MISC ChangeLog 35778 SHA256 b2802bbcf22865aedd3fb25e4aa5013bf3a369d0c9a3a778ddf7be3bc7015ed2 SHA512 e5a05922142b0f32838c0681721813638f1f8abf6ce109543959c6903f497ffc4c0b73ef537ae66fe2d86738c365cdeba6f58f59205b605d8e672fa0d150ec75 WHIRLPOOL f99b913c10dc2f0d72eb7726f6d2baa656f5ef4f8fbd30eb7c9f574e8f1ce8c0bef1d681d4cdef74b65e47b761a7ac9170afdbface8e7ef16630da11291fdae8
+EBUILD octave-3.8.0.ebuild 6474 SHA256 12a8d5a467008353d4f1bebe04c2c068656112b3946ea42f04433aefaab88917 SHA512 aa41365ed1381d5a99343e7f795675f6ee0b0a417a0226bc5a82ae5590abe45993c6d1f857a63e8e8510e4febbf8345f765d4ebb2d0c8466447007f6a2658271 WHIRLPOOL fddefc3438abee707694030be7f6f990a1061b6eb5393577285afa0530fd696e8629d882f95a7df696574cf5297414e7caf5f7646468ae892918d75eebbcbf85
+MISC ChangeLog 36054 SHA256 2a035dfdd144af99673ab055d00fdc60cb4248df8d164b42a1f3cb313ceac04c SHA512 6c19063ff7d12a531e35e24673715c373a8f21581475607d450ae0310d2b54cf8c5c657233e0b2502306cfadf285a44d61601f06a6fd7de011f92f7234ed9cdc WHIRLPOOL ada2dc0043f8b53f6fcd8f002c597f61e6b0955e916417d557cc95ed87d27ff995f6def3a3deb17c5510a22c87b209fa6df5abc57ab972d4b8a4eb889cc8e67e
 MISC metadata.xml 1022 SHA256 1b65adbdcc076642a258fff07b7e362922ac22a8498b20bd96e2c97a2ea45a10 SHA512 bf855dac972af2db8e39396a50fbdc1199f28bf4b29cf2c78315f608584f0258a12985f021003b84553bf289c734397d8c7f92666c022b6b1f68f1ebccf89966 WHIRLPOOL b6d90f1eeec501dab72503cc677792abca0fbc1476d627868090abc2438940ec24088fc95a53df058dffc793f8101a7057a85c64aef6395da6c39864c2f45305
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMFcRkACgkQoBEVQmGOlx+IjQEAua9gQFnQQm2rkDM9kBfJL2MY
-2JNp1uRCd1fULpc2aJIBANIsbt0JXbz9O6mUxzQVwL8evSNxT28MCnHTBeFKtUc1
-=GisU
+iF4EAREIAAYFAlMFlTcACgkQoBEVQmGOlx8j0QEA0a8j1dMGXlG+QN/ldthOCCoZ
+UQy5Q/XNAXiKYnRwLzoA/Rsgh/8tdrDZunyoT3JZlcNF6uTYV3TBp8Qdira/X2X8
+=Z5lb
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-3.8.0.ebuild b/sci-mathematics/octave/octave-3.8.0.ebuild
index 560fffc9ab86..6443702f69df 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.4 2014/02/20 01:57:16 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.0.ebuild,v 1.5 2014/02/20 05:39:59 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\([^ \t]*\)@lib\1@' | 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=( )
@@ -136,6 +136,12 @@ src_prepare() {
 		ewarn "with OpenGL graphics requires the gl2ps - but at the time of writing x11-libs/gl2ps"
 		ewarn "does not have the hppa keyword"
 	fi
+	# Fix bug 501756 - sci-mathematics/octave-3.8.0 LC_ALL=et_EE - octave.cc:485:56:
+	# error: 'Fallow_noninteger_range_as_index' was not declared in this scope
+	sed -e 's@A-Za-z0-9@[:alnum:]@g' \
+		-e 's@A-Za-z@[:alpha:]@g' \
+		-i "${S}/libinterp/mkbuiltins" \
+		|| die "Could not patch ${S}/libinterp/mkbuiltins for some non-English nocaled"
 	autotools-utils_src_prepare
 }