Version bump (fixes bug #153462). Removed old ebuild.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-SENTINEL-5 i686

10 files changed, 369 insertions, 125 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 5e412f9b180c..13abf24d2c33 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.58 2008/04/18 13:13:10 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.59 2008/07/24 21:59:51 markusle Exp $
+
+*octave-3.0.1 (23 Jul 2008)
+
+  23 Jul 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/octave-3.0.0-pkg.patch, +files/octave-3.0.1-add_syspath.patch,
+  +files/octave-3.0.1-chi2rnd.patch,
+  +files/octave-3.0.1-fix_handle_for_plotyy.patch,
+  +files/octave-3.0.1-no_helvetica.patch,
+  +files/octave-3.0.1-test-fix.patch, +octave-3.0.1.ebuild,
+  -octave-2.1.71-r2.ebuild:
+  Version bump (fixes bug #153462). Removed old ebuild.
+  NOTE: octave-3 is incompatible with the current monolithic 
+  octave-forge in portage. Users who need octave-forge can either:
+  (1) mask octave-3 until the new split octave-forge ebuilds are ready, or
+  (2) unmerge octave-forge, emerge octave-3, and then use the split
+  octave-forge ebuilds that are currently maintained in the science
+  overlay (see bug #179885).
 
   18 Apr 2008; Markus Dittrich <markusle@gentoo.org>
   +files/octave-2.1.73-gcc-4.3.patch, octave-2.1.73-r2.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 156d547fa0d1..a91c662a1231 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -2,18 +2,24 @@ AUX octave-2.1.72-gcc4.1-gentoo.patch 4224 RMD160 d179b48f2e47e0e9b2312b3b21cc62
 AUX octave-2.1.73-f2c-fix.patch 419 RMD160 3f8768b9073bcd2d93a5c6064d518299ad0b86a6 SHA1 3c4ee31b5d85d1d8c5f523f39ea25a4a2e577b0d SHA256 18c29afa2402e562cf11ac5a0c7718ed5c9713846dfd0245b2930aaa1939fa41
 AUX octave-2.1.73-gcc-4.3.patch 8087 RMD160 b2d9bbb8f012b6fe9106594394627fd76f112ef9 SHA1 fb5407e628ed4ecbb1ab5c0bb43a595ca2e7bbb1 SHA256 d4a080e57562163c36ab435ba09a94fa4e748a9c91f700625706967e1c0092f6
 AUX octave-2.1.73-gcc4.1-gentoo.patch 956 RMD160 f331768b814a213029014bf16021318706b084f5 SHA1 3f52c4cd9d74476d13250da9c9091f5e5d3389b1 SHA256 5526650682c4d50a10a04ebed218737246c55bceb0bb773a709a846e0adc2af5
+AUX octave-3.0.0-pkg.patch 471 RMD160 c8d7c9fddce78ef1344e5d8c8d3b95df432956c1 SHA1 43931da426dd988c451ff852391f33d236941efa SHA256 48974218d067c8e85d7cf0d4eea3921b5db743872f53131012e4c19696feb414
+AUX octave-3.0.1-add_syspath.patch 821 RMD160 951af410580969ef2dafbf76717043cbd1c5efce SHA1 b6516d6270a98af5427d267a8f91255e50bbd62e SHA256 8c592513223782ba6110d89fae55c287788330fc74eafa526e2c69abeae1276e
+AUX octave-3.0.1-chi2rnd.patch 748 RMD160 af57c8e2fd1c326a92d7078e9d076d3b952dd82a SHA1 8d87e962dc764e4330f69ff82b1dca88c0337803 SHA256 8cb556adf356bff836ab4d079f213b1e1ad7a2f6b03892ea7371e458c4eb32f1
+AUX octave-3.0.1-fix_handle_for_plotyy.patch 2112 RMD160 91679fed7b115c7f0e48824c8471359b34692f20 SHA1 e2d4dc03ed34a010cfff2205e384a35d70431255 SHA256 ee602e772b74195be2967662f799eaceb54d715cf32e6d247ad7198a629e5bc8
+AUX octave-3.0.1-no_helvetica.patch 1816 RMD160 7bfe46409699b6bd199ab725e6e324e4eea69003 SHA1 8934236ea328a7ede2016f412909c0d93842d4a1 SHA256 432b490ff6055b12d219e268391859e549e4076073ca8029b454e7644965c8e3
+AUX octave-3.0.1-test-fix.patch 2171 RMD160 a8275924c3161a7f78bcb84426527060d6c12ddd SHA1 0af5a53b2f251f9bf06976ec800b5eb217adf0bf SHA256 229bae7b5163c9d06d5df9d96db2c2ef3e0613576ec8f1b91698f286940247a0
 AUX octave-example-fix.patch 566 RMD160 9761e1a45e0d54795aff5cd50120b963492ac175 SHA1 9f84d6831a1d7773c9504a1d93308de97af85d88 SHA256 e387b14de2e5ef4e4246a84721d6b4a378670b3bffbffdc65db56e7dadcde76a
 DIST octave-2.1.57.tar.bz2 4202080 RMD160 53118458a03e7c10da3f1cc5eb65952c07744719 SHA1 126f79fd169a31883d7f7193caa459be19924acd SHA256 fbc3e2c8f603d87181d5ccd88e42dd7f3226a18151b5e068308561969e2edbd6
 DIST octave-2.1.69.tar.bz2 5818959 RMD160 88a59f0dfe4c343f011f78b07dbf069b03e29b5c SHA1 f9a43c612ac1d9a8bf25757801c46674dfe38f97 SHA256 ea27262f5ab00020f1017ccf4839cae5e6775f71d60903e5b515d472278944a9
-DIST octave-2.1.71.tar.bz2 5784751 RMD160 6728c64c63ac356908922ef8477e117cf944a7b2 SHA1 0c15d86c155e00dbff1e21be859ff82e7331b311 SHA256 c3a47eada5132bef4043cc9730466c133e1f3793f2b7f8e0e6c9620553747337
 DIST octave-2.1.72.tar.bz2 5808544 RMD160 b9a1056a98a524591b0f497f3c11ccc436a18eec SHA1 a696c65667a4a99d55279103065d1d0af5a5fb09 SHA256 d8b2dec9eb979c35be435896105c1c31dd61aa2c0f27be8b8b2645fa5d60bb90
 DIST octave-2.1.73.tar.bz2 5790133 RMD160 d34c6ecd8f84c728ad7687d9568b9d69ade6f5db SHA1 58221aa15fcefd66b03531ac0ae9b1d2356e7555 SHA256 8ccaee227c6cad3b5633a904414f17ce73de8eab2abd4d2e6a3972dd878ffbc3
+DIST octave-3.0.1.tar.bz2 9854711 RMD160 3141454b1e9a8efcac0772aed63c27aaad082861 SHA1 e4cebe74a1182df610d91e45974653227dd4b342 SHA256 310bfc622d74fd5c3727c2304ad594888f3016a89f183af7afdfef3fd5c15e6d
 EBUILD octave-2.1.57-r1.ebuild 3444 RMD160 ac7d57c312e5c849ae0fd88c33333cc7138abb1a SHA1 fbfd690dd1d977c70bee8e1692e4ad2076462776 SHA256 fc1c1399a29309a99b9d880626df3c8850c4cfb81f5f1657855605e9945b7cee
 EBUILD octave-2.1.69.ebuild 3415 RMD160 06019164d467a1cfc3607e8c8002439ee7fbb71f SHA1 3dc821b03b02599e5d27dbb1573118ca0a5b9194 SHA256 202a628e36d5578c981e5832cfaad31cf90687ad1621c8ddee4186a6b0ddf848
-EBUILD octave-2.1.71-r2.ebuild 3787 RMD160 998f60668b889a9284d0af46a37b8c485579af9a SHA1 31a873858905ea59507fa7a9c5d2daae55717da7 SHA256 e04652c5c02e2cbd91d95f610f566b04fb5da147440a97c0077e1e48e825f4b4
 EBUILD octave-2.1.72.ebuild 3893 RMD160 571014ce76eac12e6ae21ff21f087fb7258535da SHA1 f3fd6fa783473c9912105ae0256a12448843f9c5 SHA256 a91ee175a3a4a161171d5525e549f184d8b362e6e8d94923335a1f20d334fe90
 EBUILD octave-2.1.73-r1.ebuild 4441 RMD160 f25103dde6a4a9dacac56ce15e0e59ce8f0c8330 SHA1 9ee52584713d62c218956854249f757ebd70ac16 SHA256 c6dd06da30f001d494fbf3730a6ffbd8aeb50e3bf1fac4dd9c33a54dbcc46d71
 EBUILD octave-2.1.73-r2.ebuild 4603 RMD160 bf3870799101ef51bcd6370b20e26b8fbfd83401 SHA1 e5755d8a8e24af2190a78c489658b64a63a938d9 SHA256 5b0e4c2f2ef2e438177f4c689fd8babdc2e36842f687dc1d61f0a65c148b6a4f
 EBUILD octave-2.1.73.ebuild 4283 RMD160 d3b65b88c6472b892ea2286c2200ccb1e383a08a SHA1 ef7f1ac3c41f433453ae5e492fe9cadd21ce2d27 SHA256 2b4f4660cd30f3acaeff313dbc5cc7e225a8eab87998edcedf85f5c2cacffcf0
-MISC ChangeLog 16403 RMD160 f622c484a03625ba3fda4342ebb29cb7cf9a33dd SHA1 1bf74b5eb1fbe5e2c12854dc2266c71bb83f7782 SHA256 78a837b9edd2cfbca840b63bfeb9e79ad55b929ae8c76232ef076ecdc25643a9
+EBUILD octave-3.0.1.ebuild 2821 RMD160 81eea99f7dd6d97379473d422fa8e88f73a62ee5 SHA1 68e2c64c30f420a05193720250e42e2536d1639d SHA256 febdf9ce66117b7c0b7c63e3a9328a5ddce7dc52a76f03b2ae5c0e19001f30ec
+MISC ChangeLog 17201 RMD160 44f3bba9be49c3e5548ed9516c036f4fc8831715 SHA1 432f86e8350fc5461532cd1cdbb1409a64248dde SHA256 52a71d0b2a2374de3024d446395e43523e215cf6565940327ca6c5a0843885c5
 MISC metadata.xml 169 RMD160 a8b2671842bbec7d36e587fbf53c4eb111498347 SHA1 604114857745acb6253b121cda619e3c35771cc7 SHA256 7a9f25879c1299572cfaf2a3efb47313412564a1ef12c828224194f4e96edcd0
diff --git a/sci-mathematics/octave/files/octave-3.0.0-pkg.patch b/sci-mathematics/octave/files/octave-3.0.0-pkg.patch
new file mode 100644
index 000000000000..77fe1fb64735
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.0.0-pkg.patch
@@ -0,0 +1,12 @@
+diff -Naur octave-3.0.0/scripts/pkg/pkg.m octave-3.0.0.new/scripts/pkg/pkg.m
+--- octave-3.0.0/scripts/pkg/pkg.m	2007-12-20 11:55:26.000000000 -0500
++++ octave-3.0.0.new/scripts/pkg/pkg.m	2008-03-16 06:32:07.000000000 -0400
+@@ -514,7 +514,7 @@
+     ## Warn about non existent files 
+     for i = 1:length (files)
+       if (isempty (glob(files{i}))) 
+-	warning ("file %s does not exist", files{i});
++	error ("file %s does not exist", files{i});
+       endif
+     endfor
+ 
diff --git a/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch b/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch
new file mode 100644
index 000000000000..7abd25bfe64d
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch
@@ -0,0 +1,19 @@
+# patch from debian svn
+## 50_add_syspath.dpatch by Thomas Weber <thomas.weber.mail@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Put library path in loadpath (bug fix for #477556)
+## DP: http://www.cae.wisc.edu/pipermail/octave-maintainers/2008-May/007330.html
+diff -urNad octave3.0-3.0.1~/src/load-path.cc octave3.0-3.0.1/src/load-path.cc
+--- octave3.0-3.0.1~/src/load-path.cc	2008-04-21 18:00:20.000000000 +0200
++++ octave3.0-3.0.1/src/load-path.cc	2008-05-21 10:20:38.000000000 +0200
+@@ -382,7 +382,7 @@
+     xpath += dir_path::path_sep_str + tpath;
+ 
+   if (! sys_path.empty ())
+-    xpath += sys_path;
++    xpath += dir_path::path_sep_str + sys_path;
+ 
+   do_set (xpath, false);
+ }
+diff -urNad octave3.0-3.0.1~/src/load-path.cc.orig octave3.0-3.0.1/src/load-path.cc.orig
diff --git a/sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch b/sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch
new file mode 100644
index 000000000000..5a9f6abf5932
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch
@@ -0,0 +1,21 @@
+diff -Naur octave-3.0.1/scripts/statistics/distributions/chi2rnd.m octave-3.0.1.new/scripts/statistics/distributions/chi2rnd.m
+--- octave-3.0.1/scripts/statistics/distributions/chi2rnd.m	2008-04-21 11:58:40.000000000 -0400
++++ octave-3.0.1.new/scripts/statistics/distributions/chi2rnd.m	2008-06-02 06:42:34.000000000 -0400
+@@ -68,7 +68,7 @@
+      if (find (!(n > 0) | !(n < Inf)))
+        rnd = NaN * ones (sz);
+      else
+-       rnd = 2 * randg(n/2, sz)
++       rnd = 2 * randg(n/2, sz);
+      endif
+   else
+     [retval, n, dummy] = common_size (n, ones (sz));
+@@ -84,7 +84,7 @@
+ 
+     k = find ((n > 0) & (n < Inf));
+     if (any (k))
+-      rnd(k) = 2 * randg(n(k)/2, size(k))
++      rnd(k) = 2 * randg(n(k)/2, size(k));
+     endif
+   endif
+ 
diff --git a/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch b/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch
new file mode 100644
index 000000000000..38fafc14244d
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch
@@ -0,0 +1,76 @@
+## patch from debian svn
+## 50_fix_handle_for_plotyy.dpatch by Thomas Weber <thomas.weber.mail@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Bug fix for 472069
+diff -urNad octave3.0-3.0.0~/scripts/plot/plotyy.m octave3.0-3.0.0/scripts/plot/plotyy.m
+--- octave3.0-3.0.0~/scripts/plot/plotyy.m	2007-12-13 18:48:59.000000000 +0100
++++ octave3.0-3.0.0/scripts/plot/plotyy.m	2008-03-28 12:20:12.000000000 +0100
+@@ -55,7 +55,37 @@
+ 
+ function [Ax, H1, H2] = plotyy (varargin)
+ 
+-  [ax, varargin] = __plt_get_axis_arg__ ("plotyy", varargin{:});
++  ## Don't use __plt_get_axis_arg__ here as ax is a two vector for plotyy
++  if (nargin > 1 && length (varargin{1}) == 2 && ishandle(varargin{1}(1)) 
++      &&  ishandle(varargin{1}(2)) && 
++      all (floor (varargin{1}) != varargin{1}))
++    obj1 = get (varargin{1}(1));
++    obj2 = get (varargin{1}(2));
++    if (strcmp (obj1.type, "axes") || strcmp (obj2.type, "axes"))
++      ax = [obj1, obj2];
++      varargin(1) = [];
++      if (isempty (varargin))
++	varargin = {};
++      endif
++    else
++      error ("plotyy: expecting first argument to be axes handle");
++    endif
++  else
++    f = get (0, "currentfigure");
++    if (isempty (f))
++      ax(1) = axes ();
++      ax(2) = axes ();
++    else
++      ax = get (f, "children");
++      for i = 3 : length (ax)
++	delete (ax (i));
++      endfor
++      ax = ax(1:2);
++    endif
++    if (nargin < 2)
++      varargin = {};
++    endif
++  endif 
+ 
+   if (nargin < 4)
+     print_usage ();
+@@ -63,8 +93,6 @@
+ 
+   oldh = gca ();
+   unwind_protect
+-    axes (ax);
+-    newplot ();
+     [ax, h1, h2] = __plotyy__ (ax, varargin{:});
+   unwind_protect_cleanup
+     axes (oldh);
+@@ -92,6 +120,8 @@
+ 
+   xlim = [min([x1(:); x2(:)]), max([x1(:); x2(:)])];
+ 
++  axes (ax(1));
++  newplot ();
+   h1 = feval (fun1, x1, y1);
+ 
+   set (ax(1), "ycolor", getcolor (h1(1)));
+@@ -101,7 +131,9 @@
+ 
+   cf = gcf ();
+   set (cf, "nextplot", "add");
+-  ax(2) = axes ();
++  axes (ax(2));
++  newplot ();
++
+   colors = get (ax(1), "colororder");
+   set (ax(2), "colororder", [colors(2:end,:); colors(1,:)]);
+ 
diff --git a/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch b/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch
new file mode 100644
index 000000000000..35a7c9915eb6
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch
@@ -0,0 +1,48 @@
+## patch from debian svn
+## don_set_helvetica.dpatch by Thomas Weber <thomas.weber.mail@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't set Helvetica as default font, it's not available as TrueType font
+## DP: #477688
+diff -urNad octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m
+--- octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m	2008-04-21 18:00:20.000000000 +0200
++++ octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m	2008-05-25 17:30:08.000000000 +0200
+@@ -1601,7 +1601,7 @@
+ 
+ function [f, s, fnt, it, bld] = get_fontname_and_size (t)
+   if (isempty (t.fontname))
+-    fnt = "Helvetica";
++    fnt = "";
+   else
+     fnt = t.fontname;
+   endif
+@@ -1639,7 +1639,7 @@
+   if (strcmp (fld, "string"))
+     [f, s, fnt, it, bld] = get_fontname_and_size (obj);
+   else
+-    f = "Helvetica";
++    f = "";
+     s = 10;
+     fnt = f;
+     it = false;
+diff -urNad octave3.0-3.0.1~/src/graphics.cc octave3.0-3.0.1/src/graphics.cc
+--- octave3.0-3.0.1~/src/graphics.cc	2008-04-21 18:00:20.000000000 +0200
++++ octave3.0-3.0.1/src/graphics.cc	2008-05-25 17:30:08.000000000 +0200
+@@ -2336,7 +2336,7 @@
+     rotation (0),
+     horizontalalignment ("left"),
+     color (Matrix (1, 3, 0.0)),
+-    fontname ("Helvetica"),
++    fontname (""),
+     fontsize (10),
+     fontangle (radio_values ("{normal}|italic|oblique")),
+     fontweight (radio_values ("{normal}|bold|demi|light")),
+@@ -2470,7 +2470,7 @@
+   m["rotation"] = 0;
+   m["horizontalalignment"] = "left";
+   m["color"] = Matrix (1, 3, 1.0);
+-  m["fontname"] = "Helvetica";
++  m["fontname"] = "";
+   m["fontsize"] = 10;
+   m["fontangle"] = radio_property (radio_values ("{normal}|italic|oblique"));
+   m["fontweight"] = radio_property (radio_values ("{normal}|bold|demi|light"));
diff --git a/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch b/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch
new file mode 100644
index 000000000000..af4d15c40144
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch
@@ -0,0 +1,53 @@
+diff -Naur octave-3.0.1/scripts/general/interpft.m octave-3.0.1.new/scripts/general/interpft.m
+--- octave-3.0.1/scripts/general/interpft.m	2008-04-21 11:58:40.000000000 -0400
++++ octave-3.0.1.new/scripts/general/interpft.m	2008-05-28 11:54:37.000000000 -0400
+@@ -105,10 +105,6 @@
+ %! legend ('sin(4t+0.3)cos(3t-0.1','spline','interpft','data');
+ 
+ %!shared n,y
+-%! x = [0:10]'; y = sin(x); n = length (x);
+-%!assert (interpft(y, n), y, eps);
+-%!assert (interpft(y', n), y', eps);
+-%!assert (interpft([y,y],n), [y,y], eps);
+ 
+ %!error (interpft(y,n,0))
+ %!error (interpft(y,[n,n]))
+diff -Naur octave-3.0.1/test/build_sparse_tests.sh octave-3.0.1.new/test/build_sparse_tests.sh
+--- octave-3.0.1/test/build_sparse_tests.sh	2008-04-21 12:00:21.000000000 -0400
++++ octave-3.0.1.new/test/build_sparse_tests.sh	2008-05-28 12:15:14.000000000 -0400
+@@ -872,20 +872,6 @@
+ %! load(savefile,"as_save");
+ %! unlink(savefile);
+ %! assert(as_save,sparse(af));
+-%!test # save binary
+-%! savefile= tmpnam();
+-%! as_save=as; save("-binary",savefile,"bf","as_save","af");
+-%! clear as_save;
+-%! load(savefile,"as_save");
+-%! unlink(savefile);
+-%! assert(as_save,sparse(af));
+-%!test # save hdf5
+-%! savefile= tmpnam();
+-%! as_save=as; save("-hdf5",savefile,"bf","as_save","af");
+-%! clear as_save;
+-%! load(savefile,"as_save");
+-%! unlink(savefile);
+-%! assert(as_save,sparse(af));
+ %!test # save matlab
+ %! savefile= tmpnam();
+ %! as_save=as; save("-mat",savefile,"bf","as_save","af");
+diff -Naur octave-3.0.1/test/test_system.m octave-3.0.1.new/test/test_system.m
+--- octave-3.0.1/test/test_system.m	2008-04-21 12:00:22.000000000 -0400
++++ octave-3.0.1.new/test/test_system.m	2008-05-28 11:53:26.000000000 -0400
+@@ -377,11 +377,6 @@
+ %!error <Invalid call to file_in_path.*> file_in_path ("foo", "bar", "baz", "ooka");
+ 
+ %% test/octave.test/system/tilde_expand-1.m
+-%!testif HAVE_GETPWUID
+-%! x = getpwuid (getuid ());
+-%! assert((strcmp (x.dir, tilde_expand ("~"))
+-%! && strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name)))
+-%! && strcmp ("foobar", tilde_expand ("foobar"))));
+ 
+ %% test/octave.test/system/tilde_expand-2.m
+ %!error <Invalid call to tilde_expand.*> tilde_expand ();
diff --git a/sci-mathematics/octave/octave-2.1.71-r2.ebuild b/sci-mathematics/octave/octave-2.1.71-r2.ebuild
deleted file mode 100644
index c6018f1ab208..000000000000
--- a/sci-mathematics/octave/octave-2.1.71-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71-r2.ebuild,v 1.5 2007/11/20 14:46:56 markusle Exp $
-
-inherit flag-o-matic fortran
-
-DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
-		ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/${P}.tar.bz2"
-
-SLOT="0"
-IUSE="emacs static readline zlib latex hdf5 mpi blas"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2-r3
-	>=sci-visualization/gnuplot-3.7.1-r3
-	>=sci-libs/fftw-2.1.3
-	>=dev-util/gperf-2.7.2
-	zlib? ( sys-libs/zlib )
-	hdf5? ( sci-libs/hdf5 )
-	latex? ( virtual/latex-base )
-	blas? ( virtual/blas )
-	mpi? ( virtual/mpi )
-	!=app-text/texi2html-1.70"
-
-# NOTE: octave supports blas/lapack from intel but this is not open
-# source nor is it free (as in beer OR speech) Check out...
-# http://developer.intel.com/software/products/mkl/mkl52/index.htm for
-# more information
-
-src_compile() {
-	filter-flags -ffast-math
-
-	local myconf="--localstatedir=/var/state/octave --enable-rpath"
-	myconf="${myconf} --enable-lite-kernel"
-	use static || myconf="${myconf} --disable-static --enable-shared --enable-dl"
-	# Only add -lz to LDFLAGS if we have zlib in USE !
-	# BUG #52604
-	# Danny van Dyk 2004/08/26
-	use zlib && LDFLAGS="${LDFLAGS} -lz"
-
-	# MPI requires the use of gcc/g++ wrappers
-	# mpicc/mpic++
-	# octave links agains -lmpi by default
-	# mpich needs -lmpich instead
-	if use mpi; then
-		CC="mpicc" && CXX="mpiCC"
-		if has_version 'sys-cluster/mpich'; then
-			myconf="${myconf} --with-mpi=mpich"
-		else
-			myconf="${myconf} --with-mpi=mpi"
-		fi
-	else
-		myconf="${myconf} --without-mpi"
-	fi
-
-	econf \
-		$(use_with hdf5) \
-		$(use_enable readline) \
-		${myconf} \
-		LDFLAGS="${LDFLAGS}" \
-		CC="${CC}" CXX="${CXX}" || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	if use latex; then
-		octave-install-doc || die "Octave doc install failed"
-	fi
-	if use emacs; then
-		cd emacs
-		exeinto /usr/bin
-		doexe otags || die
-		doman otags.1 || die
-		for emacsdir in /usr/share/emacs/site-lisp /usr/lib/xemacs/site-lisp; do
-			insinto ${emacsdir}
-			doins *.el || die
-		done
-		cd ..
-	fi
-	dodir /etc/env.d || die
-	echo "LDPATH=/usr/lib/octave-${PV}" > "${D}"/etc/env.d/99octave || die
-
-	# Fixes ls-R files to remove /var/tmp/portage references.
-	sed -i -e "s:${D}::g" "${D}"/usr/libexec/${PN}/ls-R || die
-	sed -i -e "s:${D}::g" "${D}"/usr/share/${PN}/ls-R || die
-}
-
-pkg_postinst() {
-	echo
-	einfo "Some users have reported failures at running simple tests if"
-	einfo "octave was built with agressive optimisations. You can check if"
-	einfo "your setup is affected by this bug by running the following test"
-	einfo "(inside the octave interpreter):"
-	einfo
-	einfo "octave:1> y = [1 3 4 2 1 5 3 5 6 7 4 5 7 10 11 3];"
-	einfo "octave:2> g = [1 1 1 1 1 1 1 1 2 2 2 2 2 3 3 3];"
-	einfo "octave:3> anova(y, g)"
-	einfo
-	einfo "If these commands complete successfully with no error message,"
-	einfo "your installation should be ok. Otherwise, try recompiling"
-	einfo "octave using less agressive \"CFLAGS\" (combining \"-O3\" and"
-	einfo "\"-march=pentium4\" is known to cause problems)."
-	echo
-}
-
-octave-install-doc() {
-	echo "Installing documentation..."
-	insinto /usr/share/doc/${PF}
-	doins doc/faq/Octave-FAQ.dvi || die
-	doins doc/interpreter/octave.dvi || die
-	doins doc/liboctave/liboctave.dvi || die
-	doins doc/refcard/refcard-a4.dvi || die
-	doins doc/refcard/refcard-legal.dvi || die
-	doins doc/refcard/refcard-letter.dvi || die
-}
diff --git a/sci-mathematics/octave/octave-3.0.1.ebuild b/sci-mathematics/octave/octave-3.0.1.ebuild
new file mode 100644
index 000000000000..4e98a4ee97a2
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.0.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.0.1.ebuild,v 1.1 2008/07/24 21:59:51 markusle Exp $
+
+inherit flag-o-matic fortran xemacs-elisp-common
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+IUSE="emacs readline zlib doc hdf5 curl fftw xemacs sparse"
+KEYWORDS="~amd64 ~x86 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
+
+RDEPEND="virtual/lapack
+	dev-libs/libpcre
+	sys-libs/ncurses
+	sci-visualization/gnuplot
+	>=sci-mathematics/glpk-4.15
+	media-libs/qhull
+	fftw? ( >=sci-libs/fftw-3.1.2 )
+	zlib? ( sys-libs/zlib )
+	hdf5? ( sci-libs/hdf5 )
+	curl? ( net-misc/curl )
+	xemacs? ( virtual/xemacs )
+	sparse? ( sci-libs/umfpack
+		sci-libs/colamd
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod
+		sci-libs/cxsparse )
+	!sci-mathematics/octave-forge"
+
+DEPEND="${RDEPEND}
+	virtual/latex-base
+	sys-apps/texinfo
+	|| ( dev-texlive/texlive-genericrecommended
+		app-text/tetex
+		app-text/ptex )
+	dev-util/dejagnu
+	dev-util/gperf
+	dev-util/pkgconfig"
+
+FORTRAN="gfortran ifc g77 f2c"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0.0-pkg.patch
+	epatch "${FILESDIR}"/${P}-test-fix.patch
+	epatch "${FILESDIR}"/${P}-add_syspath.patch
+	epatch "${FILESDIR}"/${P}-fix_handle_for_plotyy.patch
+	epatch "${FILESDIR}"/${P}-no_helvetica.patch
+	epatch "${FILESDIR}"/${P}-chi2rnd.patch
+}
+
+src_compile() {
+
+	econf \
+		--localstatedir=/var/state/octave \
+		--enable-shared \
+		--with-blas="$(pkg-config --libs blas)" \
+		--with-lapack="$(pkg-config --libs lapack)" \
+		$(use_with hdf5) \
+		$(use_with curl) \
+		$(use_with zlib) \
+		$(use_with fftw) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_enable readline) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+
+	if use xemacs; then
+		cd "${S}/emacs"
+		xemacs-elisp-comp *.el
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	if use doc; then
+		einfo "Installing documentation..."
+		insinto /usr/share/doc/${PF}
+		doins $(find doc -name \*.pdf)
+	fi
+
+	if use emacs || use xemacs; then
+		cd emacs
+		exeinto /usr/bin
+		doexe octave-tags || die "Failed to install octave-tags"
+		doman octave-tags.1 || die "Failed to install octave-tags.1"
+		if use xemacs; then
+			xemacs-elisp-install ${PN} *.el *.elc
+		fi
+		cd ..
+	fi
+
+	echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
+	doenvd 99octave || die
+
+	# Fixes ls-R files to remove /var/tmp/portage references.
+	sed -i \
+		-e "s:${D}::g" \
+		"${D}"/usr/*/${PN}/ls-R \
+		|| die "Failed to fix ls-R files."
+}