More texinfo fix, thanks Caster Ti.Vector (bug #473756)

Package-Manager: portage-2.2.01.22013-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

6 files changed, 60 insertions, 379 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 9dc9044cd6c3..39ebce9b8459 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.138 2013/05/22 04:27:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.139 2013/06/19 16:17:15 bicatali Exp $
+
+  19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/octave-3.6.3-rcond.patch, -octave-3.6.3.ebuild,
+  files/octave-3.6.4-texinfo.patch, octave-3.6.4.ebuild:
+  More texinfo fix, thanks Caster Ti.Vector (bug #473756)
 
   22 May 2013; Sébastien Fabbro <bicatali@gentoo.org>
   +files/octave-3.6.4-texinfo.patch, octave-3.6.4.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 8a2ffa1ee23f..4bbc29c4a1d4 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -5,20 +5,17 @@ AUX octave-3.4.3-help.patch 579 SHA256 786d6a265d9efa5c606ad84b8d957cf6d0143dae1
 AUX octave-3.4.3-pkgbuilddir.patch 1532 SHA256 5f771b92de6994e267d5f8b1abe7733cb75e9c0cb936728fc31fac3369b78093 SHA512 a6612c26d20c82181e7e1530a4d0cf342ee9f127711c37e44b7a48bfb90eb5d8347cbf424edb951c24ad81645d492814e772aea6bdb027f4eac12fbb4c4bd26f WHIRLPOOL 9863475237b1d8ed2a381ed5ea87f4831b53425f824b489adf83c4db256f608a40fc44f5c111139789a43c3dfa2df6266ab6ac856f12e324392230d580cbd4f2
 AUX octave-3.4.3-texi.patch 375 SHA256 91fb6bfb0825e8159fa38c1f2113a1fc831c3156f0674f49145e6f0f83ff43e7 SHA512 d6d917f421c5c51dd02d01599d312d03d3f1dbec029862fcab5268527f95d8ffe18db86dbc56827b6a8741fb08856ab66a68e6fa965a90397d3a22a14e87b5b8 WHIRLPOOL 0ef4ccd18689190240064cc8fac7df52b7ffb3993b5a8ffb8591e922b935387864723d4cb58d6e0f9be72c1912cca7e49322c5f6098912868c7ae2f6b2ae826b
 AUX octave-3.6.3-legendtext.patch 406 SHA256 86e7bde6f8e4452d706257ce6af69463a056495af4e011575918f4a756bdc99d SHA512 d0607740e0152cc745a11e34ff7ccaf5054e1ef242e74145524b1743617cf5176006a849b7f283ac6c5818f0c86798f9b94c709f1289afc01cc260aaa04ee2ea WHIRLPOOL 72ebcb5d9fcadc681d7949626747981415e820b55e90c66716c51d625df1f3dbc0aefe9fcb8cf90db22b23664657eee617c1a8bcd840badf105452158c5d224d
-AUX octave-3.6.3-rcond.patch 6632 SHA256 7149a7f49915ec72d39222c0247a63cce41e1305ad718114a375c2736911e055 SHA512 62c3bd854cd8cefede58b6d7feaf94fc78544f89ba9f2d7323cc58abdcbb7001e3bb5862a33d5387f270054e7a6a3385befaff48daa523506ff43099b590526c WHIRLPOOL 2d1ac8e82f695423d5268368ab383f0824d099d27c0d20c9f6e9198ed4f048ce7318d5364ca34546893dbde7b89931b1dbbedc6d24ccc60bb06a7692f6d3cf99
-AUX octave-3.6.4-texinfo.patch 14381 SHA256 dfd1c298dddaa4770e97d15f88d1d5a37a02602c96f13f4b51f6237af9909fa9 SHA512 a9007b252d2b64fd1630d12f91a3e6ce2ec7c43a08755cf75d7a1481bff514e9cd702ebf510f1705f7a2abb43a5a920ad3b24227ddda53a4e55c20022fb687f8 WHIRLPOOL d524ff153f690a0ba6862b8494fc436b0055a3a539f0f11bad897e11d3b93b734783098449be42720eae76562b4e4cbded5738c875024f8e16a609487fa3fb98
+AUX octave-3.6.4-texinfo.patch 15072 SHA256 1c1c51369eb4d1a67df898bf0fef1cbec2a08f3a5a7860ad7b1e24a05b3d51fe SHA512 8d7fe866487923e944c5cba882e3cdc1d5f6df2bfb8b40a63753bdc8bf9b251cd15a2c60f46e3b2269c92a83e124286cbf16ab997d5ef3125fedce53ccf6dc74 WHIRLPOOL a2d5f4c1639c8842f7a1ac95c03b0e1f21f2183834aa2a75c8db7a5f7314fac6e26f41ff0cc34efcc7ec33649275709c36864b50426678c40e965a083f05a042
 DIST octave-3.4.3.tar.bz2 15085117 SHA256 94d119cc93a38465e9c00dd36b9cc063abbda7ae8cb39407cf88a2bddc9dc148 SHA512 11cb6d9ba32b468ee8fbf86b9e1de642eb22e0864b1eee68883e3e2336b109f1a8b1bb5d81a10961a5a64e467b7112247ac28f5b951f84c5eaa5a2beff31dfe2 WHIRLPOOL d61c344e834165ba4f0ac41ef9a4f218fd558ab564c4446ae5fcfa8d185b9f0c882cf08ac924a83309d70a1b175d9284c0d56b7d98b526e9c1a30ef5d4f24fca
-DIST octave-3.6.3.tar.bz2 15602522 SHA256 e37d09550f1cb406745619a5602aa3e8a97d2fe056b5c770db9984e2fc162886 SHA512 27caf2061e32e3a50478441f7795953fbfa4d876277fa91f657d61811389c1ca96a1b956852c1957724dbc0f8a187189a537b4254f9b3b6ac8d3a4f897435de4 WHIRLPOOL a2433d957e7a97f9627f4a472f9c3ce59ba09ca1aac3d58db30e0e10bcfd3da1e123174943a7c4fb3594b843eed8d3b0c7ff33301a05a11561e4611a9295a4f3
 DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
 EBUILD octave-3.4.3-r1.ebuild 2766 SHA256 90b6ff79229c7dbe36dcb37e4828f04bce615c67ddf580287fd90196a77c0f17 SHA512 82dc40f651313f4e55033a57d86174d2b881221707b77da3496a1805ce6b2283a4b1d7442360e38831b01e1bc9c68c093245b1e857869a7edefe24dc0609f0b8 WHIRLPOOL 5024f9d725eac14dc049c1e24fad953064a2cd03b297ae443db9e834a20d207374b84859f7a0359d52b7fd2724605e8b22d8af59f7393ef5258f8893b40374f5
-EBUILD octave-3.6.3.ebuild 3415 SHA256 4ebf488ccdf64c3a0afbc21b4e5ae8e20271ec9cd5d8a69aa86e6d12a5f3f053 SHA512 88cbd4a2ddeb9d31f14ac8e07afb0d0a64eb42a469e63944f90db81205f61b2998e2b187cb3401bd51de872a2ecc5cb75ae318065a044280ade8dfd69aa4cc25 WHIRLPOOL 8c6271c08501ea7a5389918a5f0c54cc6c15e5746693a4b1885f484fdeb5dd3586a229e1321030230f468cf1070b24fe069ccce3d7d20b1660f2e410309b5eae
-EBUILD octave-3.6.4.ebuild 3449 SHA256 f44e17df2c98702e5fe2c5dfc9b2802f00813e5bced10b102e1beac675d52a99 SHA512 0fb4a817c85d51fbab2eb2cf4e6e1996305e234072f8768a89fa66f978da5920941b36ed5c78360033a1dd5163ccb9075457771346a91f91c1aef7c04cca17b6 WHIRLPOOL 5d92beb35f405cefe38b8d45e3eda753135ab7d39879c64478db2ede3b3b7a4def437e2a44124f536c450a3fa1c148ef23cc069002e6e05f29516a14824aca60
-MISC ChangeLog 32759 SHA256 af376df4f9371d153a5c9dd8457e7644e6bfb05645d116d081f3c4e6aa1fa1d0 SHA512 aa7f22dc23db372cdc0571dd9378f0012bdd04845d24f63001a37420380599700292ecc51dffd4142bd5c6fc3b5586d7c86b204be927fc25fd951bf8696f0be4 WHIRLPOOL 6596adff53526fae4a70abc59ce794e4620c5a90d99f1be96a3f3a0269fd4a041b74b6112b7ed84ec1d2be3ee0ec9a8422eb39a0ec6da165dd48592b449c09dd
+EBUILD octave-3.6.4.ebuild 3478 SHA256 5985e0f49262201336ca183f83b1f1edacb45aedcff6ad768af3cda4ee449eea SHA512 8b200240ea0edf15af846380ba9ec54068c263a10297721b209d0e6aced214002701d0d59aa63536d66363de84e605126f1d1febb93627eb65767b1b781abbae WHIRLPOOL ac2e3aec5fdbb16f42ab1db34ad9587d1cbeb7cc0a1bb2185916befadba6b8b7d00bde80bd52c1ba806c6add8ae95cd0507ed998e4367116a75ac9551518e7dd
+MISC ChangeLog 32987 SHA256 0f3df1ea61b9aab734df44c153e4c48e677425cbd6c3883b8bebe0101d09a0cc SHA512 1357e8a610152eb002393682826973a19854b1295fe4d83340b06de8624642c222631252fef48b1531cbd0aa55feca7be9cf7496fa18de9d89d9a2a02566a06c WHIRLPOOL 7e77814170808203ed0cd672d9c5eb023c914d2dc47fc53d2f4aa347e13823e4a1eefaa97c2586fd17f0a03c9cbacb720b1e1449f1fa2f5ca060aa11bd30c274
 MISC metadata.xml 959 SHA256 54af60069164b7969cce2ab5e613874f6cb222021c06a449401529c3258923c6 SHA512 2314a5ae45baaf959fbe19f54476c77b048a419bb838d0295b2e9e52dfde2f2255737f6de213a0a94927e125d0df2c114d7a5c1198063b4bd809f1a74e82aa6d WHIRLPOOL 4f18232a77db14b72ff00eb0fc2306cd00e914d16652610646b9d1a5f8d505a28174e615da42ab4a70467bbdf17b4db4d0e140215bba7ef243817f7787adcc32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGcTeAACgkQ1ycZbhPLE2AhYACfTrxvxNRq+PRm5dqw+71MlF3Y
-ZTgAnR326+3/WirkBgIi8PIe5IvRQoY9
-=vZBY
+iEYEAREIAAYFAlHB2ZEACgkQ1ycZbhPLE2BFPwCghya2Yx1sVh+/cOPd6NOWXxgz
+Hz0AoIcweUFtpViPLc0HY/4nDknT5CV3
+=9rRs
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/files/octave-3.6.3-rcond.patch b/sci-mathematics/octave/files/octave-3.6.3-rcond.patch
deleted file mode 100644
index 45dcecc07f00..000000000000
--- a/sci-mathematics/octave/files/octave-3.6.3-rcond.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-Description: Fix rcond function
- Use new copy of data for full factorization if positive definite cholesky
- factorization fails.
-Origin: upstream, http://hg.savannah.gnu.org/hgweb/octave/rev/197774b411ec
-Bug: http://savannah.gnu.org/bugs/?37336
-Applied-Upstream: version, 3.6.4
-Last-Update: 2012-09-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/liboctave/CMatrix.cc b/liboctave/CMatrix.cc
---- a/liboctave/CMatrix.cc
-+++ b/liboctave/CMatrix.cc
-@@ -1786,13 +1786,15 @@
-       else if (typ == MatrixType::Full || typ == MatrixType::Hermitian)
-         {
-           double anorm = -1.0;
--          ComplexMatrix atmp = *this;
--          Complex *tmp_data = atmp.fortran_vec ();
- 
-           if (typ == MatrixType::Hermitian)
-             {
-               octave_idx_type info = 0;
-               char job = 'L';
-+
-+              ComplexMatrix atmp = *this;
-+              Complex *tmp_data = atmp.fortran_vec ();
-+
-               anorm = atmp.abs().sum().
-                 row(static_cast<octave_idx_type>(0)).max();
- 
-@@ -1829,6 +1831,9 @@
-             {
-               octave_idx_type info = 0;
- 
-+              ComplexMatrix atmp = *this;
-+              Complex *tmp_data = atmp.fortran_vec ();
-+
-               Array<octave_idx_type> ipvt (dim_vector (nr, 1));
-               octave_idx_type *pipvt = ipvt.fortran_vec ();
- 
-@@ -2098,8 +2103,10 @@
-         {
-           info = 0;
-           char job = 'L';
-+
-           ComplexMatrix atmp = *this;
-           Complex *tmp_data = atmp.fortran_vec ();
-+
-           anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max();
- 
-           F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
-diff --git a/liboctave/dMatrix.cc b/liboctave/dMatrix.cc
---- a/liboctave/dMatrix.cc
-+++ b/liboctave/dMatrix.cc
-@@ -1454,13 +1454,15 @@
-       else if (typ == MatrixType::Full || typ == MatrixType::Hermitian)
-         {
-           double anorm = -1.0;
--          Matrix atmp = *this;
--          double *tmp_data = atmp.fortran_vec ();
- 
-           if (typ == MatrixType::Hermitian)
-             {
-               octave_idx_type info = 0;
-               char job = 'L';
-+
-+              Matrix atmp = *this;
-+              double *tmp_data = atmp.fortran_vec ();
-+
-               anorm = atmp.abs().sum().
-                 row(static_cast<octave_idx_type>(0)).max();
- 
-@@ -1495,6 +1497,9 @@
-             {
-               octave_idx_type info = 0;
- 
-+              Matrix atmp = *this;
-+              double *tmp_data = atmp.fortran_vec ();
-+
-               Array<octave_idx_type> ipvt (dim_vector (nr, 1));
-               octave_idx_type *pipvt = ipvt.fortran_vec ();
- 
-@@ -1760,8 +1765,10 @@
-         {
-           info = 0;
-           char job = 'L';
-+
-           Matrix atmp = *this;
-           double *tmp_data = atmp.fortran_vec ();
-+
-           anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max();
- 
-           F77_XFCN (dpotrf, DPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
-@@ -1838,6 +1845,7 @@
- 
-           Matrix atmp = *this;
-           double *tmp_data = atmp.fortran_vec ();
-+
-           if(anorm < 0.)
-             anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max();
- 
-diff --git a/liboctave/fCMatrix.cc b/liboctave/fCMatrix.cc
---- a/liboctave/fCMatrix.cc
-+++ b/liboctave/fCMatrix.cc
-@@ -1782,13 +1782,15 @@
-       else if (typ == MatrixType::Full || typ == MatrixType::Hermitian)
-         {
-           float anorm = -1.0;
--          FloatComplexMatrix atmp = *this;
--          FloatComplex *tmp_data = atmp.fortran_vec ();
- 
-           if (typ == MatrixType::Hermitian)
-             {
-               octave_idx_type info = 0;
-               char job = 'L';
-+
-+              FloatComplexMatrix atmp = *this;
-+              FloatComplex *tmp_data = atmp.fortran_vec ();
-+
-               anorm = atmp.abs().sum().
-                 row(static_cast<octave_idx_type>(0)).max();
- 
-@@ -1825,6 +1827,9 @@
-             {
-               octave_idx_type info = 0;
- 
-+              FloatComplexMatrix atmp = *this;
-+              FloatComplex *tmp_data = atmp.fortran_vec ();
-+
-               Array<octave_idx_type> ipvt (dim_vector (nr, 1));
-               octave_idx_type *pipvt = ipvt.fortran_vec ();
- 
-@@ -2094,8 +2099,10 @@
-         {
-           info = 0;
-           char job = 'L';
-+
-           FloatComplexMatrix atmp = *this;
-           FloatComplex *tmp_data = atmp.fortran_vec ();
-+
-           anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max();
- 
-           F77_XFCN (cpotrf, CPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
-diff --git a/liboctave/fMatrix.cc b/liboctave/fMatrix.cc
---- a/liboctave/fMatrix.cc
-+++ b/liboctave/fMatrix.cc
-@@ -1454,13 +1454,15 @@
-       else if (typ == MatrixType::Full || typ == MatrixType::Hermitian)
-         {
-           float anorm = -1.0;
--          FloatMatrix atmp = *this;
--          float *tmp_data = atmp.fortran_vec ();
- 
-           if (typ == MatrixType::Hermitian)
-             {
-               octave_idx_type info = 0;
-               char job = 'L';
-+
-+              FloatMatrix atmp = *this;
-+              float *tmp_data = atmp.fortran_vec ();
-+
-               anorm = atmp.abs().sum().
-                 row(static_cast<octave_idx_type>(0)).max();
- 
-@@ -1495,6 +1497,9 @@
-             {
-               octave_idx_type info = 0;
- 
-+              FloatMatrix atmp = *this;
-+              float *tmp_data = atmp.fortran_vec ();
-+
-               Array<octave_idx_type> ipvt (dim_vector (nr, 1));
-               octave_idx_type *pipvt = ipvt.fortran_vec ();
- 
-@@ -1760,8 +1765,10 @@
-         {
-           info = 0;
-           char job = 'L';
-+
-           FloatMatrix atmp = *this;
-           float *tmp_data = atmp.fortran_vec ();
-+
-           anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max();
- 
-           F77_XFCN (spotrf, SPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
-@@ -1838,6 +1845,7 @@
- 
-           FloatMatrix atmp = *this;
-           float *tmp_data = atmp.fortran_vec ();
-+
-           if(anorm < 0.)
-             anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max();
- 
-diff --git a/src/DLD-FUNCTIONS/rcond.cc b/src/DLD-FUNCTIONS/rcond.cc
---- a/src/DLD-FUNCTIONS/rcond.cc
-+++ b/src/DLD-FUNCTIONS/rcond.cc
-@@ -93,4 +93,12 @@
- %!assert( rcond ([1 1; 2 1]), 1/9)
- %!assert( rcond (magic (4)), 0, eps)
- 
-+%!shared x, sx
-+%! x = [-5.25, -2.25; -2.25, 1] * eps () + ones (2) / 2;
-+%! sx = [-5.25, -2.25; -2.25, 1] * eps ("single") + ones (2) / 2;
-+%!assert (rcond (x) < eps ());
-+%!assert (rcond (sx) < eps ('single'));
-+%!assert (rcond (x*i) < eps ());
-+%!assert (rcond (sx*i) < eps ('single'));
-+
- */
-
diff --git a/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch b/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch
index be67d23c98b9..67f876f7bc42 100644
--- a/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch
+++ b/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch
@@ -1,6 +1,6 @@
-diff -ur octave-3.6.4-orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpreter/audio.texi
---- octave-3.6.4-orig/doc/interpreter/audio.texi	2013-02-21 21:37:50.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/audio.texi	2013-05-01 23:23:21.338665377 +0200
+diff -Nur octave-3.6.4.orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpreter/audio.texi
+--- octave-3.6.4.orig/doc/interpreter/audio.texi	2013-02-21 12:37:50.000000000 -0800
++++ octave-3.6.4/doc/interpreter/audio.texi	2013-06-19 08:52:43.259790240 -0700
 @@ -146,18 +146,18 @@
  Load the RIFF/WAVE sound file @var{filename}, and return the samples
  in vector @var{y}.  If the file contains multichannel data, then
@@ -28,9 +28,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpret
  Return the number of samples (@var{n}) and channels (@var{ch})
  instead of the audio data.
  @seealso{@ref{doc-wavwrite,,wavwrite}}
-diff -ur octave-3.6.4-orig/doc/interpreter/io.texi octave-3.6.4/doc/interpreter/io.texi
---- octave-3.6.4-orig/doc/interpreter/io.texi	2013-02-21 21:37:51.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/io.texi	2013-05-01 22:59:08.537582265 +0200
+diff -Nur octave-3.6.4.orig/doc/interpreter/io.texi octave-3.6.4/doc/interpreter/io.texi
+--- octave-3.6.4.orig/doc/interpreter/io.texi	2013-02-21 12:37:51.000000000 -0800
++++ octave-3.6.4/doc/interpreter/io.texi	2013-06-19 08:52:43.259790240 -0700
 @@ -1391,22 +1391,22 @@
  for the file.  Valid values for @var{arch} are:
  
@@ -60,9 +60,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/io.texi octave-3.6.4/doc/interpreter/
  Cray floating format.
  @end table
  
-diff -ur octave-3.6.4-orig/doc/interpreter/octave.texi octave-3.6.4/doc/interpreter/octave.texi
---- octave-3.6.4-orig/doc/interpreter/octave.texi	2013-02-21 21:19:23.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/octave.texi	2013-05-01 22:58:26.561420772 +0200
+diff -Nur octave-3.6.4.orig/doc/interpreter/octave.texi octave-3.6.4/doc/interpreter/octave.texi
+--- octave-3.6.4.orig/doc/interpreter/octave.texi	2013-02-21 12:19:23.000000000 -0800
++++ octave-3.6.4/doc/interpreter/octave.texi	2013-06-19 08:52:43.259790240 -0700
 @@ -129,7 +129,9 @@
  @sp 2
  @multitable @columnfractions 0.4 0.025 0.65
@@ -74,9 +74,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/octave.texi octave-3.6.4/doc/interpre
  @tab
  @c this is a spacer column
  @tab
-diff -ur octave-3.6.4-orig/doc/interpreter/plot.texi octave-3.6.4/doc/interpreter/plot.texi
---- octave-3.6.4-orig/doc/interpreter/plot.texi	2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/plot.texi	2013-05-01 23:07:36.586442176 +0200
+diff -Nur octave-3.6.4.orig/doc/interpreter/plot.texi octave-3.6.4/doc/interpreter/plot.texi
+--- octave-3.6.4.orig/doc/interpreter/plot.texi	2013-02-21 12:37:52.000000000 -0800
++++ octave-3.6.4/doc/interpreter/plot.texi	2013-06-19 08:52:43.260790204 -0700
 @@ -2707,21 +2707,20 @@
  Set the data aspect ratio of the current axes.  The aspect ratio is
  a normalized 3-element vector representing the span of the x, y, and
@@ -200,9 +200,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/plot.texi octave-3.6.4/doc/interprete
  Return a structure, @var{appdata}, whose fields correspond to the appdata
  properties.
  @end deftypefn
-diff -ur octave-3.6.4-orig/doc/interpreter/poly.texi octave-3.6.4/doc/interpreter/poly.texi
---- octave-3.6.4-orig/doc/interpreter/poly.texi	2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/poly.texi	2013-05-01 23:28:59.515000917 +0200
+diff -Nur octave-3.6.4.orig/doc/interpreter/poly.texi octave-3.6.4/doc/interpreter/poly.texi
+--- octave-3.6.4.orig/doc/interpreter/poly.texi	2013-02-21 12:37:52.000000000 -0800
++++ octave-3.6.4/doc/interpreter/poly.texi	2013-06-19 08:52:43.260790204 -0700
 @@ -82,8 +82,8 @@
  (@var{x}-@var{mu}(1))/@var{mu}(2).
  If @var{x} is a vector or matrix, the polynomial is evaluated for each of
@@ -214,9 +214,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/poly.texi octave-3.6.4/doc/interprete
  @deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s}, @var{mu})
  In addition to evaluating the polynomial, the second output
  represents the prediction interval, @var{y} +/- @var{dy}, which
-diff -ur octave-3.6.4-orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter/set.texi
---- octave-3.6.4-orig/doc/interpreter/set.texi	2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/set.texi	2013-05-01 23:30:00.161810855 +0200
+diff -Nur octave-3.6.4.orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter/set.texi
+--- octave-3.6.4.orig/doc/interpreter/set.texi	2013-02-21 12:37:52.000000000 -0800
++++ octave-3.6.4/doc/interpreter/set.texi	2013-06-19 08:52:43.260790204 -0700
 @@ -150,8 +150,9 @@
         3   4
  @end group
@@ -228,9 +228,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter
  
  Return index vectors @var{ia} and @var{ib} such that @code{a(ia)} and
  @code{b(ib)} are disjoint sets whose union is @var{c}.
-diff -ur octave-3.6.4-orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpreter/signal.texi
---- octave-3.6.4-orig/doc/interpreter/signal.texi	2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/signal.texi	2013-05-01 23:31:41.111833440 +0200
+diff -Nur octave-3.6.4.orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpreter/signal.texi
+--- octave-3.6.4.orig/doc/interpreter/signal.texi	2013-02-21 12:37:52.000000000 -0800
++++ octave-3.6.4/doc/interpreter/signal.texi	2013-06-19 08:52:43.261790169 -0700
 @@ -454,17 +454,17 @@
  
  For fastest computation, @var{n} should factor into a small number of
@@ -255,9 +255,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpre
  Plot the pass band, stop band and phase response of @var{h} rather
  than returning them.
  @end deftypefn
-diff -ur octave-3.6.4-orig/doc/interpreter/strings.texi octave-3.6.4/doc/interpreter/strings.texi
---- octave-3.6.4-orig/doc/interpreter/strings.texi	2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/strings.texi	2013-05-01 22:27:29.646311770 +0200
+diff -Nur octave-3.6.4.orig/doc/interpreter/strings.texi octave-3.6.4/doc/interpreter/strings.texi
+--- octave-3.6.4.orig/doc/interpreter/strings.texi	2013-02-21 12:37:52.000000000 -0800
++++ octave-3.6.4/doc/interpreter/strings.texi	2013-06-19 08:52:43.261790169 -0700
 @@ -1136,7 +1136,7 @@
  @item %s
  The word is parsed as a string.
@@ -267,9 +267,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/strings.texi octave-3.6.4/doc/interpr
  @itemx %n
  The word is parsed as a number and converted to double.
  
-diff -ur octave-3.6.4-orig/doc/interpreter/system.texi octave-3.6.4/doc/interpreter/system.texi
---- octave-3.6.4-orig/doc/interpreter/system.texi	2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/system.texi	2013-05-01 23:45:09.981978551 +0200
+diff -Nur octave-3.6.4.orig/doc/interpreter/system.texi octave-3.6.4/doc/interpreter/system.texi
+--- octave-3.6.4.orig/doc/interpreter/system.texi	2013-02-21 12:37:52.000000000 -0800
++++ octave-3.6.4/doc/interpreter/system.texi	2013-06-19 08:52:43.261790169 -0700
 @@ -839,7 +839,7 @@
  @deftypefnx {Function File} {} datetick (@var{axis}, @var{form})
  @deftypefnx {Function File} {} datetick (@dots{}, "keeplimits")
@@ -358,3 +358,21 @@ diff -ur octave-3.6.4-orig/doc/interpreter/system.texi octave-3.6.4/doc/interpre
  Check out a license for @var{feature}, returning 1 on success and 0
  on failure.
  
+diff -Nur octave-3.6.4.orig/doc/liboctave/liboctave.texi octave-3.6.4/doc/liboctave/liboctave.texi
+--- octave-3.6.4.orig/doc/liboctave/liboctave.texi	2013-02-21 12:19:23.000000000 -0800
++++ octave-3.6.4/doc/liboctave/liboctave.texi	2013-06-19 08:54:27.914379692 -0700
+@@ -80,10 +80,10 @@
+ @end ifnottex
+ 
+ @titlepage
+-@title{Octave C++ Classes}
+-@subtitle{Edition 1.0 for Octave version @value{VERSION}}
+-@subtitle{September 1993}
+-@author{John W. Eaton}
++@title@{Octave C++ Classes@}
++@subtitle@{Edition 1.0 for Octave version @value{VERSION}@}
++@subtitle@{September 1993@}
++@author@{John W. Eaton@}
+ @page
+ @vskip 0pt plus 1filll
+ Copyright @copyright{} 1996, 1997 John W. Eaton.
diff --git a/sci-mathematics/octave/octave-3.6.3.ebuild b/sci-mathematics/octave/octave-3.6.3.ebuild
deleted file mode 100644
index efbd05a5f5cd..000000000000
--- a/sci-mathematics/octave/octave-3.6.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.3.ebuild,v 1.6 2013/01/11 21:44:11 bicatali Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2
-
-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"
-IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick 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
-	virtual/lapack
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0 )
-	glpk? ( sci-mathematics/glpk )
-	gnuplot? ( sci-visualization/gnuplot )
-	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]
-		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}
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-genericrecommended
-		sys-apps/texinfo )
-	dev-util/gperf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help,texi}.patch
-	"${FILESDIR}"/${PN}-3.6.3-{rcond,legendtext}.patch
-)
-
-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
-	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 readline)
-		$(use_with curl)
-		$(use_with fftw fftw3)
-		$(use_with fftw fftw3f)
-		$(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_install() {
-	autotools-utils_src_install
-	use doc && dodoc $(find doc -name \*.pdf)
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${P}" > 99octave
-	doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild
index 7759c25fd2b8..626ac116c194 100644
--- a/sci-mathematics/octave/octave-3.6.4.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v 1.2 2013/05/22 04:27:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v 1.3 2013/06/19 16:17:15 bicatali Exp $
 
 EAPI=5
 
@@ -91,6 +91,7 @@ src_configure() {
 		--localstatedir="${EPREFIX}/var/state/octave"
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		$(use_enable prefix rpath)
 		$(use_enable doc docs)
 		$(use_enable readline)
 		$(use_with curl)
@@ -126,6 +127,6 @@ src_install() {
 	autotools-utils_src_install
 	use doc && dodoc $(find doc -name \*.pdf)
 	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${P}" > 99octave
+	echo "LDPATH=${EROOT%/}/usr/$(get_libdir)/${P}" > 99octave
 	doenvd 99octave
 }