Fixed for gcc-4.3, some includes files and adpated for qt-4.4. Also set some use flags as default

Package-Manager: portage-2.1.5

5 files changed, 491 insertions, 75 deletions

diff --git a/sci-mathematics/freemat/ChangeLog b/sci-mathematics/freemat/ChangeLog
index b2741353b77d..da12e6262889 100644
--- a/sci-mathematics/freemat/ChangeLog
+++ b/sci-mathematics/freemat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/freemat
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.9 2008/03/24 09:48:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.10 2008/05/20 16:44:51 bicatali Exp $
+
+  20 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/freemat-3.6-includes.patch, freemat-3.6.ebuild:
+  Fixed for gcc-4.3, some includes files and adpated for qt-4.4. Also set
+  some use flags as default
 
 *freemat-3.6 (24 Mar 2008)
 
diff --git a/sci-mathematics/freemat/Manifest b/sci-mathematics/freemat/Manifest
index e654bb6b5472..869f46d0c0f5 100644
--- a/sci-mathematics/freemat/Manifest
+++ b/sci-mathematics/freemat/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX freemat-3.6-includes.patch 12759 RMD160 a5247c91ac9704ba9bb9b3ff399236caf789f674 SHA1 e43eb18be6dc7b4ed98c13b999cd6a9410592dbd SHA256 e97129cdc8ea986dcdd95a881106397161d0d86c87592998c74561e3696620be
 AUX freemat-3.6-optional-deps.patch 2768 RMD160 53da537a8bb00e64ff887884217a7a46ccb28c05 SHA1 6b83d60570277a610f22a0e143e8afd88c44abdb SHA256 ff30ab1a5897234e91251b31bc3ef5e8acc97f8adb5b9443aebddecd83d5259c
-DIST FreeMat-3.5.tar.gz 5616432 RMD160 bf1fe57208d8ec8de283c6bbf20ceb454d182b57 SHA1 73db83936c973c0819ddbcd8bf56f774ae367b68 SHA256 cd19e6734ca091cd6f32f945c3a249be377c1874a0347870c879c807ceb46e3a
 DIST FreeMat-3.6.tar.gz 7843736 RMD160 5af31332f42aafe952c6495b16ceee5ce4ab5d1c SHA1 2ffaac015f870409ceb07eae035efb94ab1d95cb SHA256 2cbc8b4435add159df11b734fd2736029b80f6c9712e53e5aa156eac1aac5951
-EBUILD freemat-3.5.ebuild 1423 RMD160 546a3b3042d04a0f2d130dfb7d0d6a6eed837ee1 SHA1 431d35ddb48f627f8df46e9e24f157c45ceebdec SHA256 17b65de3ff2256dad99c9f9a8d5e0f80df719360a52fe7bd4d7f365abaabf6c2
-EBUILD freemat-3.6.ebuild 1704 RMD160 2e62d7cf94b5c3276bd19f42d2153a5d68c4d440 SHA1 175c3131e9501a88595cc836a9f6204f538115b3 SHA256 810be0ab9aac5d92791ad2ba4526f45211f7e28f3bf2f15e85fd7fa563d2fc39
-MISC ChangeLog 1903 RMD160 0bf979a8af69b218f878479188b163b5eec2c878 SHA1 f115e012b637ad09ec76a8d392a0335537f9fe88 SHA256 d3eb671357d85c3094e00ef8b60789b72b790ecfb994ff15306051a8fd4a8fa2
+EBUILD freemat-3.6.ebuild 1827 RMD160 aec6a80eaa46dcd5f041bf8c6c7eb7f21534ef05 SHA1 ef5045f57c5ec9b51f5ef128f41727883ee3a501 SHA256 f2b60a52b06a50283aa598bcbe6f8965c0f18db063aca7066b2d9c448bb5feab
+MISC ChangeLog 2119 RMD160 5ddff21ce32051c16efabc7ddd6f5d4cbc552f9d SHA1 826dcc52bbdcf64be97a0dac1f9dff4a13a2fcc2 SHA256 0537980e02d2d646baedcb662f265317a224b1723369e4285be08bb7ea8caa19
 MISC metadata.xml 572 RMD160 fde97cbd53281ed1aab6c786a6916388228ba8e2 SHA1 1888afa817b7a89c0785069368037187a6a555a9 SHA256 2791aebc3f4f7fc9266b5b0d5c52bd45cdb50c779e44d6eb4d9b01b4358e0ef2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH53jj1ycZbhPLE2ARAv33AJ4u8LWn51hFgxUphjkvcr654BCm4wCgneYT
-LG2J9HBDXDgtKy9lSrp3hDY=
-=uj37
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/freemat/files/freemat-3.6-includes.patch b/sci-mathematics/freemat/files/freemat-3.6-includes.patch
new file mode 100644
index 000000000000..61a1e4d16f4a
--- /dev/null
+++ b/sci-mathematics/freemat/files/freemat-3.6-includes.patch
@@ -0,0 +1,472 @@
+--- ./libs/libCore/IO.cpp.orig	2008-03-14 15:43:03.000000000 +0000
++++ ./libs/libCore/IO.cpp	2008-05-20 17:18:35.000000000 +0100
+@@ -19,8 +19,8 @@
+  */
+ 
+ #include "Array.hpp"
+-#include <stdio.h>
+-#include <errno.h>
++#include <cstdio>
++#include <cerrno>
+ #include <math.h>
+ #include "Malloc.hpp"
+ #include "HandleList.hpp"
+--- ./libs/libCore/Random.cpp.orig	2008-03-15 05:16:27.000000000 +0000
++++ ./libs/libCore/Random.cpp	2008-05-20 17:18:35.000000000 +0100
+@@ -21,7 +21,7 @@
+ #include "Exception.hpp"
+ #include "Malloc.hpp"
+ #include <math.h>
+-#include <stdio.h>
++#include <cstdio>
+ #include "RanLib.hpp"
+ 
+ static bool initialized = false;
+--- ./libs/libCore/Constructors.cpp.orig	2008-03-14 15:43:03.000000000 +0000
++++ ./libs/libCore/Constructors.cpp	2008-05-20 17:18:35.000000000 +0100
+@@ -21,10 +21,10 @@
+ #include "Math.hpp"
+ #include "Exception.hpp"
+ #include <math.h>
+-#include <stdio.h>
++#include <cstdio>
+ #include "Core.hpp"
+ #include "Malloc.hpp"
+-#include <ctype.h>
++#include <cctype>
+ 
+ 
+ //!
+--- ./libs/libCore/RanLib.cpp.orig	2008-03-14 15:43:03.000000000 +0000
++++ ./libs/libCore/RanLib.cpp	2008-05-20 17:18:35.000000000 +0100
+@@ -18,11 +18,9 @@
+  */
+ 
+ #include "Exception.hpp"
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+ #include <math.h>
+-#include <stdlib.h>
+ #include "RanLib.hpp"
+ 
+ /* 
+@@ -68,7 +68,6 @@
+    email: matumoto@math.keio.ac.jp
+ */
+ 
+-#include <stdio.h>
+ 
+ /* Period parameters */  
+ #define N 624
+--- ./libs/libCore/Directory.cpp.orig	2008-03-14 15:43:03.000000000 +0000
++++ ./libs/libCore/Directory.cpp	2008-05-20 17:18:35.000000000 +0100
+@@ -20,7 +20,7 @@
+ #include "Array.hpp"
+ #include "Interpreter.hpp"
+ #include "Utils.hpp"
+-#include <stdio.h>
++#include <cstdio>
+ #include "System.hpp"
+ #include <QtCore>
+ 
+--- ./libs/libFreeMat/Scope.hpp.orig	2008-05-20 15:26:51.000000000 +0100
++++ ./libs/libFreeMat/Scope.hpp	2008-05-20 15:27:26.000000000 +0100
+@@ -24,6 +24,7 @@
+  * A Scope is a combination of a variable hashtable and a function hashtable.
+  */
+ #include <string>
++#include <algorithm>
+ #include <QMutex>
+ 
+ #include "Array.hpp"
+--- ./libs/libFreeMat/Malloc.cpp.orig	2008-05-20 15:28:34.000000000 +0100
++++ ./libs/libFreeMat/Malloc.cpp	2008-05-20 15:29:19.000000000 +0100
+@@ -19,9 +19,9 @@
+ 
+ #include "Malloc.hpp"
+ #include "Exception.hpp"
+-#include <stdlib.h>
+-#include <stdio.h>
+-
++#include <cstdlib>
++#include <cstdio>
++#include <cstring>
+ 
+ void* Malloc(int count) {
+   void* ptr;
+--- ./libs/libFreeMat/Context.hpp.orig	2008-05-20 15:46:01.000000000 +0100
++++ ./libs/libFreeMat/Context.hpp	2008-05-20 15:47:46.000000000 +0100
+@@ -30,7 +30,7 @@
+ #include <QDebug>
+ #include <QList>
+ #include <QMutex>
+-#include <stdarg.h>
++#include <cstdarg>
+ 
+ /**
+  * This class represents a reference to an array in a scope
+--- ./libs/libFreeMat/Token.cpp.orig	2008-05-20 15:30:09.000000000 +0100
++++ ./libs/libFreeMat/Token.cpp	2008-05-20 15:31:57.000000000 +0100
+@@ -1,7 +1,8 @@
+ #include "Token.hpp"
+ #include "Serialize.hpp"
+ #include <iostream>
+-#include <errno.h>
++#include <cerrno>
++#include <climits>
+ 
+ // These must appear as sequential token numbers
+ string fm_reserved[22] = {
+--- ./libs/libFreeMat/File.hpp.orig	2008-05-20 15:46:12.000000000 +0100
++++ ./libs/libFreeMat/File.hpp	2008-05-20 15:47:35.000000000 +0100
+@@ -19,7 +19,7 @@
+ 
+ #ifndef __File_hpp__
+ #define __File_hpp__
+-#include <stdio.h>
++#include <cstdio>
+ #include "Stream.hpp"
+ #include <string>
+ 
+--- ./libs/libFreeMat/Scanner.cpp.orig	2008-05-20 15:32:16.000000000 +0100
++++ ./libs/libFreeMat/Scanner.cpp	2008-05-20 15:32:56.000000000 +0100
+@@ -1,8 +1,9 @@
+ #include "Scanner.hpp"
+ #include <iostream>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <ctype.h>
++#include <algorithm>
++#include <cstdio>
++#include <cstdlib>
++#include <cctype>
+ #include "Exception.hpp"
+ 
+ extern string fm_reserved[];
+--- ./libs/libFreeMat/LAPACK.hpp.orig	2008-05-20 15:46:19.000000000 +0100
++++ ./libs/libFreeMat/LAPACK.hpp	2008-05-20 15:47:16.000000000 +0100
+@@ -20,7 +20,7 @@
+ #ifndef __FMLAPACK_hpp__
+ #define __FMLAPACK_hpp__
+ 
+-#include <string.h>
++#include <cstring>
+ 
+ // Lapack routines used are declared here
+ extern "C" {
+--- ./libs/libFreeMat/Print.hpp.orig	2008-05-20 15:46:29.000000000 +0100
++++ ./libs/libFreeMat/Print.hpp	2008-05-20 15:46:53.000000000 +0100
+@@ -23,8 +23,8 @@
+ #include <vector>
+ #include <list>
+ #include <string>
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+ #include "Array.hpp"
+ 
+ class Interpreter;
+--- ./libs/libFreeMat/Sparse.cpp.orig	2008-05-20 15:34:58.000000000 +0100
++++ ./libs/libFreeMat/Sparse.cpp	2008-05-20 15:33:55.000000000 +0100
+@@ -29,7 +29,7 @@
+ #include "LAPACK.hpp"
+ #include "MemPtr.hpp"
+ #include "Math.hpp"
+-#include <math.h>
++#include <cmath>
+ 
+ // Routines that need to be Colon-compliant
+ // SetSparseNDimSubsets
+--- ./libs/libFreeMat/Serialize.cpp.orig	2008-05-20 15:36:42.000000000 +0100
++++ ./libs/libFreeMat/Serialize.cpp	2008-05-20 15:36:02.000000000 +0100
+@@ -20,7 +20,7 @@
+ #include "Serialize.hpp"
+ #include "Exception.hpp"
+ #include "Malloc.hpp"
+-#include <stdio.h>
++#include <cstdio>
+ 
+ #ifdef WIN32
+ #include <winsock2.h>
+--- ./libs/libFreeMat/SingularValueDecompose.cpp.orig	2008-05-20 15:35:16.000000000 +0100
++++ ./libs/libFreeMat/SingularValueDecompose.cpp	2008-05-20 15:35:31.000000000 +0100
+@@ -19,8 +19,8 @@
+ 
+ #include "SingularValueDecompose.hpp"
+ #include "LAPACK.hpp"
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+ #include "Malloc.hpp"
+ 
+ #define min(a,b) ((a) < (b) ? (a) : (b))
+--- ./libs/libFreeMat/Array.cpp.orig	2008-05-20 15:37:11.000000000 +0100
++++ ./libs/libFreeMat/Array.cpp	2008-05-20 15:37:48.000000000 +0100
+@@ -24,8 +24,8 @@
+ #include "IEEEFP.hpp"
+ #include "Interpreter.hpp"
+ #include "Sparse.hpp"
+-#include <math.h>
+-#include <stdio.h>
++#include <cmath>
++#include <cstdio>
+ #include <set>
+ 
+ #include "FunctionDef.hpp"
+--- ./libs/libFreeMat/Dimensions.cpp.orig	2008-05-20 15:37:29.000000000 +0100
++++ ./libs/libFreeMat/Dimensions.cpp	2008-05-20 15:38:08.000000000 +0100
+@@ -19,9 +19,9 @@
+ 
+ #include "Dimensions.hpp"
+ #include "Exception.hpp"
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <string>
+-#include <stdio.h>
++#include <cstdio>
+ #include "Malloc.hpp"
+ #include "Interpreter.hpp"
+ 
+--- ./libs/libFreeMat/EigenDecompose.cpp.orig	2008-05-20 15:38:34.000000000 +0100
++++ ./libs/libFreeMat/EigenDecompose.cpp	2008-05-20 15:39:44.000000000 +0100
+@@ -19,8 +19,8 @@
+ 
+ #include "EigenDecompose.hpp"
+ #include "LAPACK.hpp"
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+ #include "Malloc.hpp"
+ 
+ #define MAX(a,b) ((a) > (b) ? (a) : (b))
+--- ./libs/libFreeMat/Interpreter.cpp.orig	2008-05-20 15:38:41.000000000 +0100
++++ ./libs/libFreeMat/Interpreter.cpp	2008-05-20 15:39:18.000000000 +0100
+@@ -18,8 +18,8 @@
+  */
+ 
+ #include "Interpreter.hpp"
+-#include <math.h>
+-#include <stdio.h>
++#include <cmath>
++#include <cstdio>
+ #include "Exception.hpp"
+ #include "Math.hpp"
+ #include "Array.hpp"
+@@ -30,7 +30,7 @@
+ #include "Module.hpp"
+ #include "File.hpp"
+ #include "Serialize.hpp"
+-#include <signal.h>
++#include <csignal>
+ #include "Class.hpp"
+ #include "Print.hpp"
+ #include "MemPtr.hpp"
+@@ -38,7 +38,7 @@
+ #include <qeventloop.h>
+ #include <QtCore>
+ #include <fstream>
+-#include <stdarg.h>
++#include <cstdarg>
+ #include "JIT.hpp"
+ #include "JITFunc.hpp"
+ 
+--- ./libs/libFreeMat/Exception.cpp.orig	2008-05-20 15:40:54.000000000 +0100
++++ ./libs/libFreeMat/Exception.cpp	2008-05-20 15:42:02.000000000 +0100
+@@ -17,9 +17,9 @@
+  *
+  */
+ 
+-#include <string.h>
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cstring>
++#include <cstdlib>
++#include <cstdio>
+ #include <iostream>
+ #include "Exception.hpp"
+ #include "Malloc.hpp"
+--- ./libs/libFreeMat/FunctionDef.cpp.orig	2008-05-20 15:41:04.000000000 +0100
++++ ./libs/libFreeMat/FunctionDef.cpp	2008-05-20 15:41:23.000000000 +0100
+@@ -22,7 +22,7 @@
+ #include "Parser.hpp"
+ #include "Exception.hpp"
+ #include <iostream>
+-#include <signal.h>
++#include <csignal>
+ #include "SymbolTable.hpp"
+ #include "Types.hpp"
+ #include "MexInterface.hpp"
+--- ./libs/libFreeMat/Math.cpp.orig	2008-05-20 15:42:37.000000000 +0100
++++ ./libs/libFreeMat/Math.cpp	2008-05-20 15:44:27.000000000 +0100
+@@ -26,7 +26,7 @@
+ #include "EigenDecompose.hpp"
+ #include "Malloc.hpp"
+ #include "Sparse.hpp"
+-#include <math.h>
++#include <cmath>
+ 
+ // Sparse ops: +, -, neg, *
+ 
+--- ./libs/libFreeMat/LeastSquaresSolver.cpp.orig	2008-05-20 15:42:17.000000000 +0100
++++ ./libs/libFreeMat/LeastSquaresSolver.cpp	2008-05-20 15:44:51.000000000 +0100
+@@ -19,8 +19,8 @@
+ 
+ #include "LeastSquaresSolver.hpp"
+ #include "LAPACK.hpp"
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+ #include "Malloc.hpp"
+ 
+ #define MSGBUFLEN 2048
+--- ./libs/libFreeMat/LinearEqSolver.cpp.orig	2008-05-20 15:42:26.000000000 +0100
++++ ./libs/libFreeMat/LinearEqSolver.cpp	2008-05-20 15:44:41.000000000 +0100
+@@ -19,8 +19,8 @@
+ 
+ #include "LinearEqSolver.hpp"
+ #include "LAPACK.hpp"
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+ #include <iostream>
+ #include "Malloc.hpp"
+ 
+--- ./libs/libFreeMat/MatrixMultiply.cpp.orig	2008-05-20 15:42:45.000000000 +0100
++++ ./libs/libFreeMat/MatrixMultiply.cpp	2008-05-20 15:44:16.000000000 +0100
+@@ -18,9 +18,9 @@
+  */
+ 
+ #include "MatrixMultiply.hpp"
+-#include <math.h>
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cmath>
++#include <cstdlib>
++#include <cstdio>
+ 
+ extern "C" {
+   void sgemm_ (char * ta, char* tb, int* m, int* n, int* k, float *alp,
+--- ./libs/libFreeMat/Print.cpp.orig	2008-05-20 15:42:54.000000000 +0100
++++ ./libs/libFreeMat/Print.cpp	2008-05-20 15:43:58.000000000 +0100
+@@ -2,8 +2,8 @@
+ #include "IEEEFP.hpp"
+ #include "FunctionDef.hpp"
+ #include "Interpreter.hpp"
+-#include <math.h>
+-#include <string.h>
++#include <cmath>
++#include <cstring>
+ 
+ #define MSGBUFLEN 2048
+ 
+--- ./libs/libFreeMat/QRDecompose.cpp.orig	2008-05-20 15:43:12.000000000 +0100
++++ ./libs/libFreeMat/QRDecompose.cpp	2008-05-20 15:43:45.000000000 +0100
+@@ -19,8 +19,8 @@
+ 
+ #include "QRDecompose.hpp"
+ #include "LAPACK.hpp"
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+ #include "Malloc.hpp"
+ 
+ #define MIN(a,b) (((a) < (b)) ? (a) : (b))
+--- ./libs/libXP/System.cpp.orig	2008-03-14 15:43:11.000000000 +0000
++++ ./libs/libXP/System.cpp	2008-05-20 17:18:36.000000000 +0100
+@@ -18,7 +18,7 @@
+  */
+ #include "System.hpp"
+ #include "Exception.hpp"
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <QProcess>
+ #include <QtGui>
+ #ifdef Q_OS_WIN32
+--- ./libs/libMex/mxArray.cpp.orig	2008-03-14 15:43:03.000000000 +0000
++++ ./libs/libMex/mxArray.cpp	2008-05-20 17:18:36.000000000 +0100
+@@ -17,8 +17,8 @@
+  *
+  */
+ #include "mex.h"
+-#include <string.h>
+-#include <stdlib.h>
++#include <cstring>
++#include <cstdlib>
+ #include <set>
+ #include <string>
+ 
+--- ./libs/libGraphics/HandleCommands.cpp.orig	2008-03-14 15:43:05.000000000 +0000
++++ ./libs/libGraphics/HandleCommands.cpp	2008-05-20 17:18:36.000000000 +0100
+@@ -27,7 +27,7 @@
+ #include <qgl.h>
+ #include <QtGui>
+ #include <QtSvg>
+-#include <ctype.h>
++#include <cctype>
+ #include <algorithm>
+ #include "HandleLineSeries.hpp"
+ #include "HandleObject.hpp"
+--- ./src/main.cpp.orig	2008-03-14 15:42:59.000000000 +0000
++++ ./src/main.cpp	2008-05-20 17:18:36.000000000 +0100
+@@ -20,9 +20,9 @@
+ #include <QtGui>
+ #include <QDebug>
+ #include <unistd.h>
+-#include <signal.h>
+-#include <stdio.h>
+-#include <stdlib.h>
++#include <csignal>
++#include <cstdio>
++#include <cstdlib>
+ #include "MainApp.hpp"
+ #include <qapplication.h>
+ #include "Exception.hpp"
+--- ./src/MainApp.cpp.orig	2008-03-16 20:00:20.000000000 +0000
++++ ./src/MainApp.cpp	2008-05-20 17:18:36.000000000 +0100
+@@ -46,7 +46,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <qsocketnotifier.h>
+-#include <signal.h>
++#include <csignal>
+ #include <unistd.h>
+ 
+ sig_t signal_suspend_default;
+--- ./src/DumbTerminal.cpp.orig	2008-03-14 15:42:59.000000000 +0000
++++ ./src/DumbTerminal.cpp	2008-05-20 17:18:36.000000000 +0100
+@@ -20,7 +20,7 @@
+ #include "DumbTerminal.hpp"
+ #include <qapplication.h>
+ #include <qeventloop.h>
+-#include <stdio.h>
++#include <cstdio>
+ #include <unistd.h>
+ 
+ DumbTerminal::DumbTerminal() {
+--- ./src/Terminal.cpp.orig	2008-03-14 15:42:59.000000000 +0000
++++ ./src/Terminal.cpp	2008-05-20 17:18:36.000000000 +0100
+@@ -19,11 +19,11 @@
+ #include <qapplication.h>
+ #include "Serialize.hpp"
+ #include "Terminal.hpp"
+-#include <errno.h>
++#include <cerrno>
+ #include <unistd.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #ifdef Q_WS_X11
+ #include <term.h>
+ #include <curses.h>
diff --git a/sci-mathematics/freemat/freemat-3.5.ebuild b/sci-mathematics/freemat/freemat-3.5.ebuild
deleted file mode 100644
index abd47db43b42..000000000000
--- a/sci-mathematics/freemat/freemat-3.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-3.5.ebuild,v 1.4 2008/01/13 14:52:50 bicatali Exp $
-
-inherit flag-o-matic qt4
-
-MY_PN=FreeMat
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Environment for rapid engineering and scientific processing"
-HOMEPAGE="http://freemat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freemat/${MY_P}.tar.gz"
-
-IUSE="ncurses ffcall fftw umfpack arpack portaudio"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="$(qt4_min_version 4.2)
-	dev-libs/libpcre
-	virtual/lapack
-	ncurses? ( >=sys-libs/ncurses-5.4 )
-	umfpack? ( sci-libs/umfpack )
-	arpack? ( sci-libs/arpack )
-	fftw? ( >=sci-libs/fftw-3 )
-	portaudio? ( media-libs/portaudio )"
-
-RDEPEND="${DEPEND}
-	ffcall? ( dev-libs/ffcall )"
-
-DEPEND="dev-util/pkgconfig"
-
-QT4_BUILT_WITH_USE_CHECK="opengl"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	# -O3 still doesn't compile freemat-3.5
-	replace-flags -O3 -O2
-	econf \
-		--with-blas="(pkg-config --libs blas)" \
-		--with-lapack="(pkg-config --libs lapack)" \
-		$(use_with ncurses) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS ChangeLog || die "dodoc failed"
-}
-
-pkg_postint() {
-	einfo "Initializing freemat data directory"
-	FreeMat -i "${ROOT}"/usr/share/${MY_P}
-}
diff --git a/sci-mathematics/freemat/freemat-3.6.ebuild b/sci-mathematics/freemat/freemat-3.6.ebuild
index 44c8178328b1..4f1b9c71c38e 100644
--- a/sci-mathematics/freemat/freemat-3.6.ebuild
+++ b/sci-mathematics/freemat/freemat-3.6.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-3.6.ebuild,v 1.1 2008/03/24 09:48:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-3.6.ebuild,v 1.2 2008/05/20 16:44:51 bicatali Exp $
 
-inherit eutils qt4 autotools
+EAPI="1"
+inherit eutils autotools
 
 MY_PN=FreeMat
 MY_P=${MY_PN}-${PV}
@@ -11,18 +12,20 @@ DESCRIPTION="Environment for rapid engineering and scientific processing"
 HOMEPAGE="http://freemat.sourceforge.net/"
 SRC_URI="mirror://sourceforge/freemat/${MY_P}.tar.gz"
 
-IUSE="arpack ffcall fftw ncurses portaudio umfpack"
+IUSE="+arpack ffcall +fftw ncurses portaudio +umfpack"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="$(qt4_min_version 4.2)
+RDEPEND="|| ( >=x11-libs/qt-4.2:4
+			  ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) )
 	dev-libs/libpcre
 	virtual/lapack
+	virtual/opengl
 	ncurses? ( >=sys-libs/ncurses-5.4 )
 	umfpack? ( sci-libs/umfpack )
 	arpack? ( sci-libs/arpack )
-	fftw? ( >=sci-libs/fftw-3 )
+	fftw? ( >=sci-libs/fftw-3:3.0 )
 	portaudio? ( media-libs/portaudio )
 	ffcall? ( dev-libs/ffcall )"
 
@@ -30,6 +33,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 QT4_BUILT_WITH_USE_CHECK="opengl"
+
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
@@ -37,6 +41,7 @@ src_unpack() {
 	cd "${S}"
 	# allow enable/disable for configure
 	epatch "${FILESDIR}"/${P}-optional-deps.patch
+	epatch "${FILESDIR}"/${P}-includes.patch
 	eautoreconf
 }