Cleaning old versions

(Portage version: 2.2_rc67/cvs/Linux x86_64)

11 files changed, 10 insertions, 988 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 8a5e747f8cad..73404d40b7be 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.92 2010/06/23 09:32:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.93 2010/06/24 17:12:17 bicatali Exp $
+
+  24 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/octave-2.1.72-gcc4.1-gentoo.patch, -octave-2.1.73.ebuild,
+  -octave-2.1.73-r2.ebuild, -files/octave-2.1.73-gcc-4.3.patch,
+  -files/octave-3.0.0-pkg.patch,
+  -files/octave-3.0.1-fix_handle_for_plotyy.patch,
+  -files/octave-3.0.1-no_helvetica.patch, -octave-3.0.3.ebuild,
+  -files/octave-3.0.3-test-fix.patch, -files/octave-3.2.0-dlmwrite.patch:
+  Cleaning old versions
 
   23 Jun 2010; Justin Lecher <jlec@gentoo.org> octave-2.1.73.ebuild,
   octave-2.1.73-r1.ebuild:
diff --git a/sci-mathematics/octave/files/octave-2.1.72-gcc4.1-gentoo.patch b/sci-mathematics/octave/files/octave-2.1.72-gcc4.1-gentoo.patch
deleted file mode 100644
index 92620414d089..000000000000
--- a/sci-mathematics/octave/files/octave-2.1.72-gcc4.1-gentoo.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur octave-2.1.72/liboctave/CMatrix.h octave-2.1.72-new/liboctave/CMatrix.h
---- octave-2.1.72/liboctave/CMatrix.h	2005-11-11 13:47:27.000000000 -0600
-+++ octave-2.1.72-new/liboctave/CMatrix.h	2006-03-14 11:26:53.000000000 -0600
-@@ -204,17 +204,6 @@
- 
-   ComplexMatrix expm (void) const;
- 
--  // column vector by row vector -> matrix operations
--
--  friend ComplexMatrix operator * (const ColumnVector& a,
--				   const ComplexRowVector& b);
--
--  friend ComplexMatrix operator * (const ComplexColumnVector& a,
--				   const RowVector& b);
--
--  friend ComplexMatrix operator * (const ComplexColumnVector& a,
--				   const ComplexRowVector& b);
--
-   // matrix by diagonal matrix -> matrix operations
- 
-   ComplexMatrix& operator += (const DiagMatrix& a);
-@@ -290,6 +279,17 @@
- ComplexMatrix Sylvester (const ComplexMatrix&, const ComplexMatrix&,
- 			 const ComplexMatrix&);
- 
-+// column vector by row vector -> matrix operations
-+
-+ComplexMatrix operator * (const ColumnVector& a,
-+				   const ComplexRowVector& b);
-+
-+ComplexMatrix operator * (const ComplexColumnVector& a,
-+				   const RowVector& b);
-+
-+ComplexMatrix operator * (const ComplexColumnVector& a,
-+				   const ComplexRowVector& b);
-+
- extern ComplexMatrix operator * (const Matrix&,        const ComplexMatrix&);
- extern ComplexMatrix operator * (const ComplexMatrix&, const Matrix&);
- extern ComplexMatrix operator * (const ComplexMatrix&, const ComplexMatrix&);
-diff -Naur octave-2.1.72/liboctave/dColVector.h octave-2.1.72-new/liboctave/dColVector.h
---- octave-2.1.72/liboctave/dColVector.h	2005-11-11 13:47:32.000000000 -0600
-+++ octave-2.1.72-new/liboctave/dColVector.h	2006-03-14 11:12:19.000000000 -0600
-@@ -103,6 +103,13 @@
-   ColumnVector (double *d, int l) : MArray<double> (d, l) { }
- };
- 
-+// Publish externally used friend functions.
-+
-+extern ColumnVector real (const ComplexColumnVector& a);
-+extern ColumnVector imag (const ComplexColumnVector& a);
-+
-+
-+
- MARRAY_FORWARD_DEFS (MArray, ColumnVector, double)
- 
- #endif
-diff -Naur octave-2.1.72/liboctave/dMatrix.h octave-2.1.72-new/liboctave/dMatrix.h
---- octave-2.1.72/liboctave/dMatrix.h	2005-11-11 13:47:32.000000000 -0600
-+++ octave-2.1.72-new/liboctave/dMatrix.h	2006-03-14 11:14:00.000000000 -0600
-@@ -181,10 +181,6 @@
- 
-   boolMatrix operator ! (void) const;
- 
--  // column vector by row vector -> matrix operations
--
--  friend Matrix operator * (const ColumnVector& a, const RowVector& b);
--
-   // other operations
- 
-   Matrix map (d_d_Mapper f) const;
-@@ -235,6 +231,15 @@
-   Matrix (double *d, int r, int c) : MArray2<double> (d, r, c) { }
- };
- 
-+// Publish externally used friend functions.
-+
-+extern Matrix real (const ComplexMatrix& a);
-+extern Matrix imag (const ComplexMatrix& a);
-+
-+// column vector by row vector -> matrix operations
-+
-+extern Matrix operator * (const ColumnVector& a, const RowVector& b);
-+
- extern Matrix Givens (double, double);
- 
- extern Matrix Sylvester (const Matrix&, const Matrix&, const Matrix&);
-diff -Naur octave-2.1.72/liboctave/dNDArray.h octave-2.1.72-new/liboctave/dNDArray.h
---- octave-2.1.72/liboctave/dNDArray.h	2005-11-11 13:47:32.000000000 -0600
-+++ octave-2.1.72-new/liboctave/dNDArray.h	2006-03-14 11:15:13.000000000 -0600
-@@ -131,6 +131,11 @@
-   NDArray (double *d, const dim_vector& dv) : MArrayN<double> (d, dv) { }
- };
- 
-+// Publish externally used friend functions.
-+
-+extern NDArray real (const ComplexNDArray& a);
-+extern NDArray imag (const ComplexNDArray& a);
-+
- extern NDArray min (double d, const NDArray& m);
- extern NDArray min (const NDArray& m, double d);
- extern NDArray min (const NDArray& a, const NDArray& b);
-diff -Naur octave-2.1.72/src/ov.h octave-2.1.72-new/src/ov.h
---- octave-2.1.72/src/ov.h	2005-11-11 13:48:31.000000000 -0600
-+++ octave-2.1.72-new/src/ov.h	2006-03-14 11:16:03.000000000 -0600
-@@ -814,6 +814,15 @@
-   octave_value *nil_rep (void) const;
- };
- 
-+// Publish externally used friend functions.
-+
-+extern octave_value
-+do_unary_op (octave_value::unary_op op, const octave_value& a);
-+
-+extern octave_value
-+do_binary_op (octave_value::binary_op op,
-+         const octave_value& a, const octave_value& b);
-+
- #define OV_UNOP_FN(name) \
-   inline octave_value \
-   name (const octave_value& a) \
diff --git a/sci-mathematics/octave/files/octave-2.1.73-gcc-4.3.patch b/sci-mathematics/octave/files/octave-2.1.73-gcc-4.3.patch
deleted file mode 100644
index 622b32cf1b26..000000000000
--- a/sci-mathematics/octave/files/octave-2.1.73-gcc-4.3.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur octave-2.1.73/doc/interpreter/munge-texi.cc octave-2.1.73.new/doc/interpreter/munge-texi.cc
---- octave-2.1.73/doc/interpreter/munge-texi.cc	2005-05-02 07:15:47.000000000 -0400
-+++ octave-2.1.73.new/doc/interpreter/munge-texi.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -29,6 +29,8 @@
- #include <iostream>
- #include <fstream>
- #include <string>
-+#include <cstring>
-+#include <cstdlib>
- #include <map>
- 
- static const char doc_delim = '';
-diff -Naur octave-2.1.73/liboctave/chMatrix.cc octave-2.1.73.new/liboctave/chMatrix.cc
---- octave-2.1.73/liboctave/chMatrix.cc	2005-05-02 07:16:21.000000000 -0400
-+++ octave-2.1.73.new/liboctave/chMatrix.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -32,6 +32,7 @@
- 
- #include <iostream>
- #include <string>
-+#include <cstring>
- 
- #include "lo-error.h"
- #include "str-vec.h"
-diff -Naur octave-2.1.73/liboctave/data-conv.cc octave-2.1.73.new/liboctave/data-conv.cc
---- octave-2.1.73/liboctave/data-conv.cc	2005-05-02 07:16:22.000000000 -0400
-+++ octave-2.1.73.new/liboctave/data-conv.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -28,6 +28,7 @@
- #include <cctype>
- 
- #include <iostream>
-+#include <cstdlib>
- 
- #include "byte-swap.h"
- #include "data-conv.h"
-diff -Naur octave-2.1.73/liboctave/lo-sysdep.cc octave-2.1.73.new/liboctave/lo-sysdep.cc
---- octave-2.1.73/liboctave/lo-sysdep.cc	2005-05-02 07:16:26.000000000 -0400
-+++ octave-2.1.73.new/liboctave/lo-sysdep.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -27,6 +27,7 @@
- 
- #include <iostream>
- #include <string>
-+#include <cstring>
- 
- #ifdef HAVE_UNISTD_H
- #ifdef HAVE_SYS_TYPES_H
-diff -Naur octave-2.1.73/liboctave/lo-utils.cc octave-2.1.73.new/liboctave/lo-utils.cc
---- octave-2.1.73/liboctave/lo-utils.cc	2005-05-02 07:16:26.000000000 -0400
-+++ octave-2.1.73.new/liboctave/lo-utils.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -31,6 +31,7 @@
- #include <cstdio>
- 
- #include <string>
-+#include <cstring>
- 
- #ifdef HAVE_UNISTD_H
- #ifdef HAVE_SYS_TYPES_H
-diff -Naur octave-2.1.73/liboctave/oct-env.cc octave-2.1.73.new/liboctave/oct-env.cc
---- octave-2.1.73/liboctave/oct-env.cc	2005-05-02 07:16:27.000000000 -0400
-+++ octave-2.1.73.new/liboctave/oct-env.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -45,6 +45,7 @@
- #include <cstdlib>
- 
- #include <string>
-+#include <cstring>
- 
- #ifdef HAVE_UNISTD_H
- #ifdef HAVE_SYS_TYPES_H
-diff -Naur octave-2.1.73/liboctave/oct-sort.cc octave-2.1.73.new/liboctave/oct-sort.cc
---- octave-2.1.73/liboctave/oct-sort.cc	2005-05-02 07:16:28.000000000 -0400
-+++ octave-2.1.73.new/liboctave/oct-sort.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -84,6 +84,9 @@
- #include <config.h>
- #endif
- 
-+#include <cstdlib>
-+#include <cstring>
-+
- #include "lo-mappers.h"
- #include "quit.h"
- #include "oct-sort.h"
-diff -Naur octave-2.1.73/src/DLD-FUNCTIONS/sort.cc octave-2.1.73.new/src/DLD-FUNCTIONS/sort.cc
---- octave-2.1.73/src/DLD-FUNCTIONS/sort.cc	2006-03-20 16:11:03.000000000 -0500
-+++ octave-2.1.73.new/src/DLD-FUNCTIONS/sort.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -294,7 +294,7 @@
- template class octave_sort<vec_index<unsigned EIGHT_BYTE_INT> *>;
- 
- template <>
--static octave_value
-+octave_value
- mx_sort (ArrayN<double> &m, int dim, sortmode mode)
- {
-   octave_value retval;
-@@ -345,11 +345,12 @@
- 	  // things up.
- 
- 	  if (lo_ieee_signbit (octave_NaN))
-+	  {
- 	    if (mode == UNDEFINED || mode == ASCENDING)
- 	      {
- 		unsigned int i = 0;
- 		double *vtmp = (double *)p;
--		while (xisnan (vtmp[i++]) && i < ns);
-+		while (xisnan (vtmp[i++]) && i < ns) {}
- 		for (unsigned int l = 0; l < ns - i + 1; l++)
- 		  vtmp[l] = vtmp[l+i-1];
- 		for (unsigned int l = ns - i + 1; l < ns; l++)
-@@ -359,12 +360,13 @@
- 	      {
- 		unsigned int i = ns;
- 		double *vtmp = (double *)p;
--		while (xisnan (vtmp[--i]) && i > 0);
-+		while (xisnan (vtmp[--i]) && i > 0) {}
- 		for (int l = i; l >= 0; l--)
- 		  vtmp[l-i+ns-1] = vtmp[l];
- 		for (unsigned int l = 0; l < ns - i - 1; l++)
- 		  vtmp[l] = octave_NaN;
- 	      }
-+	  }
- 
- 	  p += ns;
- 	}
-@@ -404,10 +406,11 @@
- 	  // fix things up.
- 
- 	  if (lo_ieee_signbit (octave_NaN))
-+	  {
- 	    if (mode == UNDEFINED || mode == ASCENDING)
- 	      {
- 		unsigned int i = 0;
--		while (xisnan (v[i++*stride + offset]) && i < ns);
-+		while (xisnan (v[i++*stride + offset]) && i < ns) {}
- 		for (unsigned int l = 0; l < ns - i + 1; l++)
- 		  v[l*stride + offset] = v[(l+i-1)*stride + offset];
- 		for (unsigned int l = ns - i + 1; l < ns; l++)
-@@ -416,12 +419,13 @@
- 	    else
- 	      {
- 		unsigned int i = ns;
--		while (xisnan (v[--i*stride + offset]) && i > 0);
-+		while (xisnan (v[--i*stride + offset]) && i > 0) {}
- 		for (int l = i; l >= 0; l--)
- 		  v[(l-i+ns-1)*stride + offset] = v[l*stride + offset];
- 		for (unsigned int l = 0; l < ns - i - 1; l++)
- 		  v[l*stride + offset] = octave_NaN;
- 	      }
-+	  }
- 	}
-     }
- 
-@@ -431,7 +435,7 @@
- }
- 
- template <>
--static octave_value_list
-+octave_value_list
- mx_sort_indexed (ArrayN<double> &m, int dim, sortmode mode)
- {
-   octave_value_list retval;
-@@ -506,10 +510,11 @@
-       // If it will be sorted to the beginning, fix things up.
- 
-       if (lo_ieee_signbit (octave_NaN))
-+      {
- 	if (mode == UNDEFINED || mode == ASCENDING)
- 	  {
- 	    unsigned int i = 0;
--	    while (xisnan (v[i++*stride+offset]) && i < ns);
-+	    while (xisnan (v[i++*stride+offset]) && i < ns) {}
- 	    OCTAVE_LOCAL_BUFFER (double, itmp, i - 1);
- 	    for (unsigned int l = 0; l < i -1; l++)
- 	      itmp[l] = idx(l*stride + offset);
-@@ -527,7 +532,7 @@
- 	else 
- 	  {
- 	    unsigned int i = ns;
--	    while (xisnan (v[--i*stride+offset]) && i > 0);
-+	    while (xisnan (v[--i*stride+offset]) && i > 0) {}
- 	    OCTAVE_LOCAL_BUFFER (double, itmp, ns - i - 1);
- 	    for (unsigned int l = 0; l < ns - i -1; l++)
- 	      itmp[l] = idx((l+i+1)*stride + offset);
-@@ -542,6 +547,7 @@
- 		idx(l*stride + offset) = itmp[k];
- 	      }
- 	  }
-+	}
-     }
- 
-   retval(1) = idx;
-diff -Naur octave-2.1.73/src/file-io.cc octave-2.1.73.new/src/file-io.cc
---- octave-2.1.73/src/file-io.cc	2006-03-20 16:11:02.000000000 -0500
-+++ octave-2.1.73.new/src/file-io.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -42,6 +42,7 @@
- #include <cerrno>
- #include <climits>
- #include <cstdio>
-+#include <cstring>
- 
- #include <iostream>
- #include <vector>
-diff -Naur octave-2.1.73/src/oct-stream.cc octave-2.1.73.new/src/oct-stream.cc
---- octave-2.1.73/src/oct-stream.cc	2005-05-05 15:07:24.000000000 -0400
-+++ octave-2.1.73.new/src/oct-stream.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -1255,7 +1255,7 @@
- 			int c3 = is.get ();
- 
- 			if (c3 != EOF)
--
-+			{
- 			  if (c3 == 'f')
- 			    {
- 			      int c4 = is.get ();
-@@ -1290,6 +1290,7 @@
- 
- 			      is >> ref;
- 			    }
-+			}
- 		      }
- 		    else
- 		      {
-diff -Naur octave-2.1.73/src/ov-fcn-inline.cc octave-2.1.73.new/src/ov-fcn-inline.cc
---- octave-2.1.73/src/ov-fcn-inline.cc	2005-05-02 07:17:16.000000000 -0400
-+++ octave-2.1.73.new/src/ov-fcn-inline.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -126,7 +126,7 @@
-       OSSTREAM buf;
- 
-       // Skip preceeding newline(s)
--      while (is.get (c) && c == '\n');
-+      while (is.get (c) && c == '\n') {}
- 
-       if (is)
- 	{
-diff -Naur octave-2.1.73/src/parse.y octave-2.1.73.new/src/parse.y
---- octave-2.1.73/src/parse.y	2006-03-20 16:11:03.000000000 -0500
-+++ octave-2.1.73.new/src/parse.y	2008-04-18 08:56:55.000000000 -0400
-@@ -34,6 +34,7 @@
- 
- #include <cassert>
- #include <cstdio>
-+#include <cstring>
- 
- #ifdef YYBYACC
- #include <cstdlib>
-diff -Naur octave-2.1.73/src/pr-output.cc octave-2.1.73.new/src/pr-output.cc
---- octave-2.1.73/src/pr-output.cc	2005-05-02 07:17:17.000000000 -0400
-+++ octave-2.1.73.new/src/pr-output.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -1602,7 +1602,7 @@
- }
- 
- template <>
--static inline void
-+inline void
- pr_plus_format (std::ostream& os, const Complex& c)
- {
-   double rp = c.real ();
-diff -Naur octave-2.1.73/src/unwind-prot.cc octave-2.1.73.new/src/unwind-prot.cc
---- octave-2.1.73/src/unwind-prot.cc	2005-05-02 07:17:20.000000000 -0400
-+++ octave-2.1.73.new/src/unwind-prot.cc	2008-04-18 08:56:55.000000000 -0400
-@@ -30,6 +30,7 @@
- #endif
- 
- #include <cstddef>
-+#include <cstring>
- 
- #include "CMatrix.h"
- 
diff --git a/sci-mathematics/octave/files/octave-3.0.0-pkg.patch b/sci-mathematics/octave/files/octave-3.0.0-pkg.patch
deleted file mode 100644
index 77fe1fb64735..000000000000
--- a/sci-mathematics/octave/files/octave-3.0.0-pkg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-fix_handle_for_plotyy.patch b/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch
deleted file mode 100644
index 38fafc14244d..000000000000
--- a/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-## 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
deleted file mode 100644
index 35a7c9915eb6..000000000000
--- a/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-## 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.3-test-fix.patch b/sci-mathematics/octave/files/octave-3.0.3-test-fix.patch
deleted file mode 100644
index fc976928c3b0..000000000000
--- a/sci-mathematics/octave/files/octave-3.0.3-test-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur octave-3.0.3/scripts/general/interpft.m octave-3.0.3.new/scripts/general/interpft.m
---- octave-3.0.3/scripts/general/interpft.m	2008-09-29 01:36:19.000000000 -0400
-+++ octave-3.0.3.new/scripts/general/interpft.m	2008-11-17 06:41:18.000000000 -0500
-@@ -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, 2*eps);
--%!assert (interpft(y', n), y', 2*eps);
--%!assert (interpft([y,y],n), [y,y], 2*eps);
- 
- %!error (interpft(y,n,0))
- %!error (interpft(y,[n,n]))
-diff -Naur octave-3.0.3/test/build_sparse_tests.sh octave-3.0.3.new/test/build_sparse_tests.sh
---- octave-3.0.3/test/build_sparse_tests.sh	2008-09-24 03:13:50.000000000 -0400
-+++ octave-3.0.3.new/test/build_sparse_tests.sh	2008-11-17 06:38:19.000000000 -0500
-@@ -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.3/test/test_system.m octave-3.0.3.new/test/test_system.m
---- octave-3.0.3/test/test_system.m	2008-09-24 03:13:50.000000000 -0400
-+++ octave-3.0.3.new/test/test_system.m	2008-11-17 06:38:19.000000000 -0500
-@@ -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/files/octave-3.2.0-dlmwrite.patch b/sci-mathematics/octave/files/octave-3.2.0-dlmwrite.patch
deleted file mode 100644
index 1521165ac2f7..000000000000
--- a/sci-mathematics/octave/files/octave-3.2.0-dlmwrite.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur octave-3.2.0/scripts/io/dlmwrite.m octave-3.2.0.new/scripts/io/dlmwrite.m
---- octave-3.2.0/scripts/io/dlmwrite.m	2009-05-25 02:04:59.000000000 -0400
-+++ octave-3.2.0.new/scripts/io/dlmwrite.m	2009-09-08 22:08:40.000000000 -0400
-@@ -85,7 +85,7 @@
- function dlmwrite (file, a, varargin)
- 
-   if (nargin < 2 || ! ischar (file))
--    ptint_usage ();
-+    print_usage ();
-   endif
- 
-   ## set defaults
diff --git a/sci-mathematics/octave/octave-2.1.73-r2.ebuild b/sci-mathematics/octave/octave-2.1.73-r2.ebuild
deleted file mode 100644
index 2334e21d73db..000000000000
--- a/sci-mathematics/octave/octave-2.1.73-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v 1.11 2009/09/23 20:11:50 patrick Exp $
-
-inherit flag-o-matic fortran autotools xemacs-elisp-common
-
-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 doc hdf5 mpi xemacs"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-util/dejagnu
-	>=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
-	virtual/blas
-	virtual/lapack
-	zlib? ( sys-libs/zlib )
-	hdf5? ( sci-libs/hdf5 )
-	doc? ( virtual/latex-base )
-	mpi? ( virtual/mpi )
-	xemacs? ( app-editors/xemacs )
-	!=app-text/texi2html-1.70"
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-# 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
-FORTRAN="gfortran g77 f2c"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc4.1-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-example-fix.patch
-	epatch "${FILESDIR}"/${P}-f2c-fix.patch
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-	eautoconf
-}
-
-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 && append-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"
-		if has_version 'sys-cluster/mpich' ; then
-				CXX="mpiCC"
-				myconf="${myconf} --with-mpi=mpich"
-		elif has_version 'sys-cluster/mpich2' ; then
-			if built_with_use sys-cluster/mpich2 cxx ; then
-				elog "mpich2 must be built without C++ support!"
-				die "please rebuild mpich2 with USE=-cxx..."
-			fi
-		    F77="mpif77"
-		    myconf="${myconf} --with-mpi=mpich"
-		else
-		    myconf="${myconf} --with-mpi=mpi"
-		fi
-	else
-	    CC="$(tc-getCC)"
-	    CXX="$(tc-getCXX)"
-	    myconf="${myconf} --without-mpi"
-	fi
-
-	CC="${CC}" CXX="${CXX}" F77="${F77}" \
-	econf \
-		$(use_with hdf5) \
-		$(use_enable readline) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use xemacs; then
-		cd "${S}/emacs"
-		xemacs-elisp-comp *.el
-	fi
-}
-
-src_install() {
-	# needed to avoid possible sandbox violations by latex
-	export VARTEXFONTS="${T}/fonts"
-
-	make install DESTDIR="${D}" || die "make install failed"
-	if use doc; then
-		octave-install-doc || die "Octave doc install failed"
-	fi
-	if use emacs || use xemacs; then
-		cd emacs
-		exeinto /usr/bin
-		doexe otags || die
-		doman otags.1 || die
-		if use xemacs; then
-			xemacs-elisp-install ${PN} *.el *.elc
-		fi
-		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-2.1.73.ebuild b/sci-mathematics/octave/octave-2.1.73.ebuild
deleted file mode 100644
index 9f27909978b6..000000000000
--- a/sci-mathematics/octave/octave-2.1.73.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild,v 1.13 2010/06/23 09:32:45 jlec 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 doc hdf5 mpi blas"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
-
-DEPEND=">=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 )
-	doc? ( virtual/latex-base )
-	blas? ( virtual/blas )
-	mpi? ( virtual/mpi )
-	!=app-text/texi2html-1.70"
-RDEPEND="${DEPEND}"
-# 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc4.1-gentoo.patch
-}
-
-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 && append-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"
-		if has_version 'sys-cluster/mpich' ; then
-				CXX="mpiCC"
-				myconf="${myconf} --with-mpi=mpich"
-		elif has_version 'sys-cluster/mpich2' ; then
-			if built_with_use sys-cluster/mpich2 cxx ; then
-				elog "mpich2 must be built without C++ support!"
-				die "please rebuild mpich2 with USE=-cxx..."
-			fi
-		    F77="mpif77"
-		    myconf="${myconf} --with-mpi=mpich"
-		else
-		    myconf="${myconf} --with-mpi=mpi"
-		fi
-	else
-	    CC="$(tc-getCC)"
-	    CXX="$(tc-getCXX)"
-	    myconf="${myconf} --without-mpi"
-	fi
-
-	CC="${CC}" CXX="${CXX}" F77="${F77}" \
-	econf \
-		$(use_with hdf5) \
-		$(use_enable readline) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# needed to avoid possible sandbox violations by latex
-	export VARTEXFONTS="${T}/fonts"
-
-	make install DESTDIR="${D}" || die "make install failed"
-	if use doc; 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.3.ebuild b/sci-mathematics/octave/octave-3.0.3.ebuild
deleted file mode 100644
index d02943f9ca53..000000000000
--- a/sci-mathematics/octave/octave-3.0.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.0.3.ebuild,v 1.10 2009/10/12 20:06:24 jer 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="alpha amd64 hppa ppc ~ppc64 sparc x86"
-
-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? ( app-editors/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/ptex )
-	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}"/${PN}-3.0.1-fix_handle_for_plotyy.patch
-	epatch "${FILESDIR}"/${PN}-3.0.1-no_helvetica.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)
-
-	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."
-}