Bump octave to 3.8.1

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

4 files changed, 354 insertions, 5 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 922385ed178f..52430bec9962 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.161 2014/03/06 15:51:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.162 2014/03/08 14:12:30 gienah Exp $
+
+*octave-3.8.1 (08 Mar 2014)
+
+  08 Mar 2014; Mark Wright <gienah@gentoo.org>
+  +files/octave-3.8.1-imagemagick.patch, +octave-3.8.1.ebuild:
+  Bump octave to 3.8.1
 
   06 Mar 2014; Jeroen Roovers <jer@gentoo.org> octave-3.8.0.ebuild,
   octave-3.8.1_rc4.ebuild, octave-3.8.1_rc4-r1.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 92e26356d8e9..93fd69a7c8c3 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -16,20 +16,23 @@ AUX octave-3.8.0-imagemagick.patch 5543 SHA256 27a9933b085575022b752ec979bddfce1
 AUX octave-3.8.0-llvm-3.4.patch 2424 SHA256 40c6ea5fd4c59470038624398cffcb7d9f1b60d1bf678ab168c656c894824746 SHA512 8862dfe1060cc30b083ad62863b789f9c30e7d3d9a660b6ff591f2dc29611e23a75243cd8712fde04833c8285ff57f8e6483d7b23dd1cdc1923b309b8b004ece WHIRLPOOL ecc6ca44bba42f734fa911e81c10b0c4fb8f19815330351eba28ef34df19007112baf59efc8486596354a819d04490d1937945f1c4d3438d95a7270a2f24b44e
 AUX octave-3.8.0-llvm-configure.patch 624 SHA256 96d297d78d423663567e5790407c58ddc52af6bd6c9e3ddf499dc10ad6a955cb SHA512 bdaaf2e7d7fc4254caf9a04b082dc02e58369256ce09c0c3632309f624b2b97a447020b0a37b4da4770a7f8e02ae5f1ad233c986e337e93b89bc83ed8cf34c2c WHIRLPOOL 08d3ab914c964d526f8a7b013166aa6d86258eb0a4eff11ce74c4f377dc15786c9dfe1688048537c09787f37226fd0587d4a8d5afeac74751e86547cd66a8c6d
 AUX octave-3.8.0-pkgbuilddir.patch 1413 SHA256 277a2cf88d50db3125e5bffb989626f806f7140161a12caf6db711e67443b2e9 SHA512 37b1d88f0afcde01c6c59cb1f3a8ed4a73a611d0bc2acb2d9854ad53234c92daf8e38ca8510fcee91552d87dea18bce5c7d6ff3c3b00d73898076cc3f8a3245d WHIRLPOOL d4d1494ad1e25ed13fc4b4df281b49be8d53253e78ef5cc42dfab58a4f519b4e2e66ee6865441c965dcc66791449431e97d4395711515fe20d941b73a453b92a
+AUX octave-3.8.1-imagemagick.patch 5627 SHA256 ca2ca6df409d36e0f64b6c9b5c3be6ed1bfe990d14b54f39f149cb2a938aeb89 SHA512 119aa0a3ae312f41f28a57dd1115cabad27f9a9f329eef7c9f2a8e67d994948218a4f68332c122833e58e07d2defe42079fb51a590733055451b93e0187c4dc6 WHIRLPOOL 2aee7d3f470d2405be8c998ec362277329b822108bda7393d69c5974498928e75bfd8778d016b68fd83f8758891274c79fbc7119476871380abd27f834a0a93d
 DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
 DIST octave-3.8.0.tar.bz2 17669638 SHA256 519330c6dd34eb69ca26a811722948fceac2acebd67ba924eba9b34a2e5a94f9 SHA512 2e8b81b418e235cddd6678d7cc83b8441c64b36f98854ab704c1b34d5ff711d3f6cce7ffe33f5f70a7bc231b2219b39d16033e6b9d04174cbab68f21c5a8abec WHIRLPOOL ace3d162722b0e47d78fbf8029396c3e5690a4260d5fcef09be4a1a58f7a1144888f5829a47f77d344ca20fa6844c55b80955e7093c5cd2e98a89188b6ec3708
 DIST octave-3.8.1-rc4.tar.gz 20688476 SHA256 f137c8132b77044c21e5ace97e67c3c74d36d106ba6b33f683201bfd59268e33 SHA512 295d1056a609cdeea357cab257dcbd672c8d885e67da5e20a16cc477e69deb9bcc082df6a168dfb01a3738e50ee5cb6518aa002800fa3bddbecca624e30d2e7b WHIRLPOOL 7bf1467474934fe7e69c7d1da79520c562a6c8546f541b04be99cac385439275f0353423d833ae4246c3d2a6b288dc83f73325febb2179ef81e5421472b17219
+DIST octave-3.8.1.tar.bz2 17664241 SHA256 d6762ed2ad4a042243a095fb44c7a1d3a91c635b6dca37fcef15a5efdffa9bbd SHA512 673ff37692d2ef1116a10afb36448494e69cb01de609017af1a72c3258a1fe71012e9986aafc29127509f7e6664127b4e9b7f269322820b3464eb30ab4b4ef7f WHIRLPOOL 85729283a65051159245f31ab53951c756ea55d1cc93518dbb55b740329a89cffbdf3679ae8d2b957e1a4b47dbf5f2dd9d60f51acf32e159d821979661a5fa54
 EBUILD octave-3.6.4-r1.ebuild 3546 SHA256 1e303b6d0b5dae850e83a12cfdf2c48f856d9eedf619a8eef4538ae811b8c591 SHA512 c5740862f898795f7f69af11da70ee479e610002385bfe2d46b6ded46e7e7e8eef772bd3e21db00da148065672d6cd58cf6484d80a2b759324f1d1f7805c9d36 WHIRLPOOL 46b56b068c35bad96c458e86c87feb14b7998a7ebf05a17fb9dba31631f0dd1e7b570852c393010f925a356091e312a765e5d50fbb4fb8de7cec1f35ef8e26f9
 EBUILD octave-3.6.4.ebuild 3481 SHA256 33e2e2bc509d636036b854b1db531daaf8cbd245740696c9fbed5d7bdd632e0e SHA512 c03a63c4cec131a9384d5eacc67f8724b102e48a4356318a89b8eec2c34b2da9c19e903e2e0a2f1b408803044c7689078aaadf527b90bcd3a6c0b6b8f619ae13 WHIRLPOOL c14ff910f1bab7362fc95d4730a3a752abfc011b5d7ce655afd9bafbdac7c1dfc989a7b0286a4dbd54836cb15522149561ebaffe77c99c58762c824dfc1dc873
 EBUILD octave-3.8.0.ebuild 6180 SHA256 41c99fe7f3c15be96503a54210197dc4b6893699246352152710e6c43413c6fd SHA512 7682aa2f48982650599a463ee3a8c761943f479a805d34f4ede45ea88c20f5dc51c4170d9a8995a667cffeb88cfe5ceca3c55351503bd6ad8fc58d089ea7e4ea WHIRLPOOL 0b38206317efac4ddb57c9fc12bf56363bf95a742034a18d3a6869f4dda721980414995ec9352c8d6b1c115329eed052af8836a61919fd773ee1e6a2596ff02e
+EBUILD octave-3.8.1.ebuild 6044 SHA256 f63dfe96e4049cc9c06ee2b5b64585fd46073b967b727444270a1f8a0b43d886 SHA512 46063c87a6d938b6d458fb163e66531323c8d9d140d8bc76507cad9e7cf661e91f6ff4526cc42b63b17230141b233065d7b197bbfe83c051b2145d057ac956db WHIRLPOOL c62f4aabec268a0e06c7e03eb78b6a368738d530cecfa7a4b773c989a6942db5df2b6f79ee1c66d31b7d03e14f12429baf75c455ad020112cff9738322e9599a
 EBUILD octave-3.8.1_rc4-r1.ebuild 6128 SHA256 2af836609125c9f8fef1b24b01f5fe37c0a1a28131f7e268ff028e2eee04f381 SHA512 9cd34a50e4152e103db083c31273674493f4a51d231259b1507a13b8260cd7ac47aad61bc066dcbea3907b18b12b649dbc148fd4ce6cfe09b9f8fe10cfc62413 WHIRLPOOL c88038a012baaeba60e676729fd73efddfe6f915f9267a7fecca4808972064b4aabbb428486fe5154435a70f7df4c83b61cbec304bf55db94011ddad04ed8940
 EBUILD octave-3.8.1_rc4.ebuild 6099 SHA256 75ae4a7f987a74c218f83bb5adcda3413e1a4a6e2ed09669aa48c5ed06256153 SHA512 b0c00a5760771554879790e645e737dafb8ad05a47f370be144e37574bbaee99f87819e9deecc307cd3e26541a80c2200792ba79f92e2a27b3de1f013c1316a6 WHIRLPOOL ae0f8efedbdef9b54c41f7a40c0046ddd0e6b875539716bfba70e3d8b49119d9bce04f1478f53d94fe7c4f5676ee78a20a82c53117781f85d87c77937c26b97f
-MISC ChangeLog 37942 SHA256 841e104c83ddddc4f041961607230c6978e7a6e448a322b9d29045a5c38d0360 SHA512 c7395283c8e94b27a144fb014264f50bf13d47ea2025c2a5b5030ddbe66a4746a68396c1c6dbbdd61742189fccc55e078ee6de63ebfa7020d5c6b809797638c5 WHIRLPOOL d7fe72dbe601b11d1090b4e1299bbfb38839b2d0017aaf439e583251676f0e47dbcb437c77762bb38a5e72993f25a881286ac538fb7341e6c06095c5249b694b
+MISC ChangeLog 38108 SHA256 919df3b7bfa330d8d51a2d70ece83af16954b3c00ae9fbb527582e24ff6f6473 SHA512 5dde07aed0f2441fd162473fa22310df67edb0bd4cd83f8f95e5931ac218f2930dc9c70bc2a1adab928a69c4ce3d2d5c272d6ccc6cdcbe92d6f559b3aa46d66f WHIRLPOOL 7ea948d2bdf56306e9eed37d445841dd83e4b91bf18dd43963d27994a0c7255267619d0e238cf61f1e8e0a2ba2cbd8e162247477c8e2b53c57966db497e0ba9f
 MISC metadata.xml 1086 SHA256 a4f870296c42bebec9c57c95dd6ed0c847de692b004a4dd4dfb54611d44b514a SHA512 63bc97ab9911e4b1dcc9fd5ae465e124eafb05e83aa3feaf7f2adcb862b57b54bd75d99841d68af3f1cdc5cfe2bed91d0b606d00910a23eb7bbcc57ec048d5b5 WHIRLPOOL c00282871a332d1ccf36d98fc1d8a6709b61fbfeb8425dc1849d595ff357660db9f51dc13ef2a4a7b9bb257c0d424e7909179d61a1f7a1b651e821372065c926
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMYmXQACgkQVWmRsqeSphMvVgCfVLvwH/gSZZj/PWk7KDXJoMFW
-f2QAn1rMbadjG8J6gaSjJhnyArlYpG6h
-=qutl
+iF4EAREIAAYFAlMbJVgACgkQoBEVQmGOlx/VfwEAnZtpBxGNwaBx3nBbAa4s8SjB
+fQWkQyFZZZP52U+qZfEBAId9c8sPogYcEIfQ6SF33WsywfoD6d87QYikzncVVD80
+=yR7k
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/files/octave-3.8.1-imagemagick.patch b/sci-mathematics/octave/files/octave-3.8.1-imagemagick.patch
new file mode 100644
index 000000000000..f3415505dffb
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.1-imagemagick.patch
@@ -0,0 +1,138 @@
+--- octave-3.8.1-orig/libinterp/dldfcn/__magick_read__.cc	2014-03-07 06:37:51.000000000 +1100
++++ octave-3.8.1/libinterp/dldfcn/__magick_read__.cc	2014-03-09 00:18:04.593088077 +1100
+@@ -38,8 +38,15 @@
+ #include "gripes.h"
+ 
+ #ifdef HAVE_MAGICK
+-
++#define MAGICKCORE_EXCLUDE_DEPRECATED 1
+ #include <Magick++.h>
++#if !defined(QuantumRange) && defined(MaxRGB)
++#define QuantumRange MaxRGB
++#endif
++#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth)
++#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth
++#endif
++
+ #include <clocale>
+ 
+ // In theory, it should be enough to check the class:
+@@ -104,12 +111,18 @@
+ get_depth (Magick::Image& img)
+ {
+   octave_idx_type depth = img.depth ();
++#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
++#define Magick MagickCore
++#endif
+   if (depth == 8
+       && img.channelDepth (Magick::RedChannel)     == 1
+       && img.channelDepth (Magick::CyanChannel)    == 1
+       && img.channelDepth (Magick::OpacityChannel) == 1
+       && img.channelDepth (Magick::GrayChannel)    == 1)
+     depth = 1;
++#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
++#undef Magick
++#endif
+ 
+   return depth;
+ }
+@@ -332,7 +345,10 @@
+   if (imvec[def_elem].depth () == 32)
+     divisor = std::numeric_limits<uint32_t>::max ();
+   else
+-    divisor = MaxRGB / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
++  {
++    using namespace Magick;
++    divisor = QuantumRange / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
++  }
+ 
+   // FIXME: this workaround should probably be fixed in GM by creating a
+   //        new ImageType BilevelMatteType
+@@ -464,7 +480,8 @@
+                 for (octave_idx_type row = 0; row < nRows; row++)
+                   {
+                     img_fvec[idx] = pix->red / divisor;
+-                    a_fvec[idx]   = (MaxRGB - pix->opacity) / divisor;
++                    using namespace Magick;
++                    a_fvec[idx]   = (QuantumRange - pix->opacity) / divisor;
+                     pix += row_shift;
+                     idx++;
+                   }
+@@ -541,7 +558,8 @@
+                     rbuf[idx]     = pix->red     / divisor;
+                     gbuf[idx]     = pix->green   / divisor;
+                     bbuf[idx]     = pix->blue    / divisor;
+-                    a_fvec[a_idx++] = (MaxRGB - pix->opacity) / divisor;
++                    using namespace Magick;
++                    a_fvec[a_idx++] = (QuantumRange - pix->opacity) / divisor;
+                     pix += row_shift;
+                     idx++;
+                   }
+@@ -626,7 +644,8 @@
+                     mbuf[idx]     = pix->green   / divisor;
+                     ybuf[idx]     = pix->blue    / divisor;
+                     kbuf[idx]     = pix->opacity / divisor;
+-                    a_fvec[a_idx++] = (MaxRGB - *apix) / divisor;
++                    using namespace Magick;
++                    a_fvec[a_idx++] = (QuantumRange - *apix) / divisor;
+                     pix += row_shift;
+                     idx++;
+                   }
+@@ -685,9 +704,10 @@
+       // Restore locale from before GraphicsMagick initialisation
+       setlocale (LC_ALL, locale.c_str ());
+ 
+-      if (QuantumDepth < 32)
++      using namespace Magick;
++      if (MAGICKCORE_QUANTUM_DEPTH < 32)
+         warning ("your version of %s limits images to %d bits per pixel",
+-                 MagickPackageName, QuantumDepth);
++                 MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
+ 
+       initialized = true;
+     }
+@@ -1060,8 +1080,9 @@
+   // From GM documentation:
+   //  Color arguments are must be scaled to fit the Quantum size according to
+   //  the range of MaxRGB
++  using namespace Magick;
+   const double divisor = static_cast<double>((uint64_t (1) << bitdepth) - 1)
+-                         / MaxRGB;
++                         / QuantumRange;
+ 
+   const P *img_fvec = img.fortran_vec ();
+   const P *a_fvec   = alpha.fortran_vec ();
+@@ -1111,8 +1132,9 @@
+                 for (octave_idx_type row = 0; row < nRows; row++)
+                   {
+                     double grey = double (*img_fvec) / divisor;
++                    using namespace Magick;
+                     Magick::Color c (grey, grey, grey,
+-                                     MaxRGB - (double (*a_fvec) / divisor));
++                                     QuantumRange - (double (*a_fvec) / divisor));
+                     pix[GM_idx] = c;
+                     img_fvec++;
+                     a_fvec++;
+@@ -1178,10 +1200,11 @@
+               {
+                 for (octave_idx_type row = 0; row < nRows; row++)
+                   {
++                    using namespace Magick;
+                     Magick::Color c (double (*img_fvec)          / divisor,
+                                      double (img_fvec[G_offset]) / divisor,
+                                      double (img_fvec[B_offset]) / divisor,
+-                                     MaxRGB - (double (*a_fvec) / divisor));
++                                     QuantumRange - (double (*a_fvec) / divisor));
+                     pix[GM_idx] = c;
+                     img_fvec++;
+                     a_fvec++;
+@@ -1257,7 +1280,8 @@
+                                      double (img_fvec[Y_offset]) / divisor,
+                                      double (img_fvec[K_offset]) / divisor);
+                     pix[GM_idx] = c;
+-                    ind[GM_idx] = MaxRGB - (double (*a_fvec) / divisor);
++                    using namespace Magick;
++                    ind[GM_idx] = QuantumRange - (double (*a_fvec) / divisor);
+                     img_fvec++;
+                     a_fvec++;
+                     GM_idx += nCols;
diff --git a/sci-mathematics/octave/octave-3.8.1.ebuild b/sci-mathematics/octave/octave-3.8.1.ebuild
new file mode 100644
index 000000000000..1788646c04cf
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.8.1.ebuild
@@ -0,0 +1,202 @@
+# 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.1.ebuild,v 1.1 2014/03/08 14:12:30 gienah Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl postscript
+	+qhull +qrupdate readline +sparse static-libs X zlib"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	dev-libs/libpcre
+	sys-libs/ncurses
+	jit? ( sys-devel/llvm )
+	virtual/lapack
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0 )
+	glpk? ( sci-mathematics/glpk )
+	gnuplot? ( sci-visualization/gnuplot )
+	gui? ( x11-libs/qscintilla )
+	hdf5? ( sci-libs/hdf5 )
+	imagemagick? ( || (
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx] ) )
+	opengl? (
+		media-libs/freetype:2
+		media-libs/fontconfig
+		>=x11-libs/fltk-1.3:1[opengl]
+		x11-libs/gl2ps
+		virtual/glu )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		media-gfx/transfig )
+	qhull? ( media-libs/qhull )
+	qrupdate? ( sci-libs/qrupdate )
+	readline? ( sys-libs/readline )
+	sparse? (
+		sci-libs/arpack
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod
+		sci-libs/colamd
+		sci-libs/cxsparse
+		sci-libs/umfpack )
+	X? ( x11-libs/libX11 )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-genericrecommended
+		dev-texlive/texlive-metapost
+		sys-apps/texinfo )
+	dev-util/gperf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-3.4.3-texi.patch
+	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
+	"${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
+	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
+	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+)
+
+pkg_pretend() {
+	if use qrupdate || use sparse; then
+		local blaslib=$($(tc-getPKG_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=( )
+		use qrupdate && libs+=( "${usr_lib}"/libqrupdate.so )
+		use sparse && libs+=(
+			"${usr_lib}"/libarpack.so
+			"${usr_lib}"/libcholmod.so
+			"${usr_lib}"/libspqr.so
+			"${usr_lib}"/libumfpack.so
+		)
+		for i in ${libs[*]}
+		do
+			# Is it not linked with the current blas?  This check is not enough though, as
+			# 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 [[ $? -ne 0 ]]; then
+				# Does it appear to be linked with some blas or lapack library?
+				scanelf -n ${i} | egrep -q "blas|lapack"
+				if [[ $? -eq 0 ]]; then
+					eerror "*******************************************************************************"
+					eerror "${i} must be rebuilt with ${blaslib}"
+					eerror ""
+					eerror "To check the libaries ${i} is currently built with:"
+					eerror ""
+					eerror "scanelf -n ${i}"
+					eerror ""
+					eerror "To find the package that needs to be rebuilt:"
+					eerror ""
+					eerror "equery belongs ${i}"
+					eerror "*******************************************************************************"
+					die
+				fi
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# nasty prefix hack for fltk:1 linking
+	if use prefix && use opengl; then
+		sed -i \
+			-e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
+			configure.ac
+	fi
+	if has_version ">=sys-devel/llvm-3.4"; then
+		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
+	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 locales"
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	# unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable gui gui)
+		$(use_enable jit)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with hdf5)
+		$(use_with opengl)
+		$(use_with qhull)
+		$(use_with qrupdate)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with X x)
+		$(use_with zlib z)
+	)
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			myeconfargs+=( "--with-magick=GraphicsMagick" )
+		else
+			myeconfargs+=( "--with-magick=ImageMagick" )
+		fi
+	else
+		myeconfargs+=( "--without-magick" )
+	fi
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	emake
+	if use java || use jit ; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc $(find doc -name \*.pdf)
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
+	doenvd 99octave
+}