Removed old patches

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

11 files changed, 3 insertions, 466 deletions

diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index e7cd11b6844e..27bbdf6b2d94 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -2,16 +2,6 @@
 Hash: SHA1
 
 AUX qtiplot-0.7.7-qmake.patch 11384 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 SHA1 5cd18e99d39664ef48e0d18069d89cb4b417a175 SHA256 2d89427ab1304b1ec8165d6ceaedf474a48ba59d55dafbb4977b5ddaab8509ca
-AUX qtiplot-0.8.5-qmake.patch 467 RMD160 00b5de4a8ab62eb3d2b3b7cb4a0a69a92d42cb44 SHA1 6fdb19a48c501b3f1256e7105d383f567f17182e SHA256 51230401a221a49371db906d37eca2b2734346ff82684dc572e37294fbd1ed0f
-AUX qtiplot-0.9.6.2-fitplugins.patch 1568 RMD160 af8b05f8f49dd567fa3619b9efe799f1d74632e6 SHA1 b5c53f8a33de778366e5f1072fe283bb357d2311 SHA256 63df38507723ce3ef8ce897d9db7f0c0e86424790b8f855f529de0a48fdf1a48
-AUX qtiplot-0.9.6.2-pro.patch 2707 RMD160 ecf6c26ff4aa2269a2e4f698490b4999a1db0a08 SHA1 cb39c99487aec6027ec9feba5d410111d5cfb834 SHA256 e00d6bdbdf2cf6d587e977f56b6ce2888070beef0d1a7c0021e3f3b59522b37e
-AUX qtiplot-0.9.7-gcc4.3.patch 668 RMD160 4c4a4b6da2cb235a5d6af7866ef5526fc77fea72 SHA1 da38423aca779a3cb68ba91f50d036c807b5a0bd SHA256 1c729cddaf606fab563f1c8409fe80d37898f00836ff6498b63ffa6ac954afc5
-AUX qtiplot-0.9.7.2-liborigin-gcc4.3.patch 478 RMD160 aed7f2a772422df874144983261e22b29d9dae5c SHA1 0557981aad551dda9ad79f813acc3f00b54fc278 SHA256 239d40c778f00f55247a450c5fe9b5923d28360930aa4da48686f796f3a48068
-AUX qtiplot-0.9.7.2-pro.patch 2801 RMD160 520d78a8fac28567b8edaf8195c0c34285e77f5c SHA1 377a610c852fa40b322b839325616f4e4101430d SHA256 559d5ce6eacf5df1f08cd835582f8ce22444be5fe756543df0320f765d4a3e70
-AUX qtiplot-0.9.7.3-no-python.patch 1747 RMD160 03f86f741e84e0c2aedde9cc7915c7eaa5ec7608 SHA1 15869d3728c0456e5a2b2c26f606a1117a3e526d SHA256 7f579f499dca8afca404c700255ec2e8f4148ababd0f40dadcc7026f42bcfe25
-AUX qtiplot-0.9.7.3-pro.patch 6899 RMD160 c1e0d832ff580ae0fe6ada3bbb6c12f57e495321 SHA1 badc6ee0613d40ebdbe78a9a74730e253d8824f0 SHA256 a1941673150536446cad5d8b45bb0665be8a3c06a8adb8530960dad9d59af35c
-AUX qtiplot-0.9.7.3-qwt3d.patch 843 RMD160 02273d1f407a7c5901671ad5008860b0ad01d381 SHA1 0824134197bd971bdfd5f978bbfc0ee38a55e07e SHA256 7ff5823103bbd13b99cc5e5de0b34539cc2db24280cf95874303e9f60b686abe
-AUX qtiplot-0.9.7.3-sip.patch 1205 RMD160 0311a72e107c66adcdbf14ca97febdadf33e520c SHA1 253d87c47a74649d831f1bb1688cffa60e68cd70 SHA256 d7de2cdabba5b39ecb5b5fe002b45a946adf74a559433dc697d09bb7376165e8
 AUX qtiplot-0.9.7.4-gcc4.3.patch 614 RMD160 f2533f8f8c28489ee13f7e910b2e79524d66fa5d SHA1 f5d341dfe804a3e132038cab0e1b59e90c5df3e6 SHA256 43023cea82e3bc3ee83bf986dc9c6ccccb2c6c373fe7ff8c7849b27d7769e10b
 AUX qtiplot-0.9.7.4-liborigin-gcc4.3.patch 420 RMD160 4c91a48d2b1aa6dc6c06274eb70fb18112c49279 SHA1 41796cef78b34c8a04b8b536b1199d5c58d00629 SHA256 30fe79b3ff916c181feb3bc7e974421c1972df5bbb844f5ce82b0d8aba94286b
 AUX qtiplot-0.9.7.4-no-python.patch 1845 RMD160 01e7f8dc3f2f913d524969c995b4b2cd63cfc70b SHA1 2fe3148e008b9d5ef3b57e2444866a495c6c726e SHA256 35f6ea43207ee8ccb489b7c10757f79810d44e4a0a11cd7dea9dfcc9d4d4287e
@@ -27,7 +17,7 @@ MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkncZh8ACgkQ1ycZbhPLE2D8CACeJFP1MBx3nqhvMcmimA+pkCl4
-EzEAn0/+5JtTaROgArYzHLtxxsw8oBiJ
-=juAt
+iEYEARECAAYFAkncZrMACgkQ1ycZbhPLE2D1jwCgjjy8G0kmbl8SWxiid9v4qmNN
+lwAAoJmPsZO/Tm41h2r98T6Q59UpN0q/
+=212n
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.8.5-qmake.patch b/sci-visualization/qtiplot/files/qtiplot-0.8.5-qmake.patch
deleted file mode 100644
index 56b3e0993805..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.8.5-qmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtiplot.pro.orig	2006-05-25 14:51:40.000000000 +0200
-+++ qtiplot.pro	2006-05-25 14:54:42.000000000 +0200
-@@ -13,2 +13,2 @@
--INCLUDEPATH       += ../3rdparty/qwt/include
--INCLUDEPATH  += -I /usr/include/qwtplot3d
-+INCLUDEPATH += /usr/include/qwt
-+INCLUDEPATH += /usr/include/qwtplot3d
-@@ -17,2 +17 @@
--LIBS         += ../3rdparty/qwt/lib/libqwt.a
--LIBS         += -L /usr/lib -lgsl -lgslcblas -lqwtplot3d -lz
-+LIBS += -L_LIBDIR_ -lgsl -lgslcblas -lqwt -lqwtplot3d
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch
deleted file mode 100644
index 64e54655df61..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro
---- qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro	2007-10-29 05:44:06.000000000 +0600
-+++ qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro	2008-05-15 10:42:10.000000000 +0700
-@@ -13,10 +13,8 @@
-  

- # statically link against GSL in 3rdparty

--INCLUDEPATH += ../../3rdparty/gsl/include/

--LIBS        += ../../3rdparty/gsl/lib/libgsl.a

--LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

-+INCLUDEPATH += /usr/include/gsl

- 

- #dynamically link against GSL installed system-wide

--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

-+unix:LIBS += $$system(pkg-config --libs gsl)

- 

- target.path=/usr/lib$${libsuff}/qtiplot/plugins

-diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro
---- qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro	2007-10-29 05:44:06.000000000 +0600
-+++ qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro	2008-05-15 10:43:01.000000000 +0700
-@@ -13,10 +13,8 @@
-  

- # statically link against GSL in 3rdparty

--INCLUDEPATH += ../../3rdparty/gsl/include/

--LIBS        += ../../3rdparty/gsl/lib/libgsl.a

--LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

-+INCLUDEPATH += /usr/include/gsl

- 

- #dynamically link against GSL installed system-wide

--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

-+unix:LIBS += $$system(pkg-config --libs gsl)

- 

- target.path=/usr/lib$${libsuff}/qtiplot/plugins

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch
deleted file mode 100644
index fb8ba3f71fd9..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -r -U2 qtiplot-0.9.6.2.orig/qtiplot/qtiplot.pro qtiplot-0.9.6.2/qtiplot/qtiplot.pro
---- qtiplot-0.9.6.2.orig/qtiplot/qtiplot.pro	2008-05-19 14:26:41.000000000 +0700
-+++ qtiplot-0.9.6.2/qtiplot/qtiplot.pro	2008-05-25 07:47:27.000000000 +0700
-@@ -18,5 +18,5 @@
- # the *.path variables defined bellow.

- ######################################################################################

--#CONFIG          += CustomInstall

-+CONFIG          += CustomInstall

- 

- CONFIG          += release

-@@ -28,10 +28,9 @@
- #############################################################################

- 

--INCLUDEPATH       += ../3rdparty/muparser/include

--INCLUDEPATH       += ../3rdparty/qwtplot3d/include

--INCLUDEPATH       += ../3rdparty/qwt/src

--INCLUDEPATH       += ../3rdparty/liborigin

--INCLUDEPATH       += ../3rdparty/gsl/include

--INCLUDEPATH       += ../3rdparty/zlib123/include

-+INCLUDEPATH       += /usr/include/muparser

-+INCLUDEPATH       += /usr/include/qwtplot3d

-+INCLUDEPATH       += /usr/include/qwt5

-+INCLUDEPATH       += /usr/include/liborigin

-+INCLUDEPATH       += /usr/include/gsl

- 

- ##################### 3rd PARTY LIBRARIES SECTION ###########################

-@@ -42,15 +41,17 @@
- 

- # statically link against libraries in 3rdparty

--unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

--unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

--unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

--unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

--unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

-+#unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

-+#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

-+#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

-+#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

-+#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

- 

- # dynamically link against dependencies if they are installed system-wide

--#unix:LIBS         += -lmuparser

--#unix:LIBS         += -lqwtplot3d

--#unix:LIBS         += -lqwt

--#unix:LIBS         += -lgsl -lgslcblas

-+unix:LIBS         += -lmuparser

-+unix:LIBS         += -lqwtplot3d

-+unix:LIBS         += -lqwt

-+unix:LIBS         += $$system(pkg-config --libs gsl)

-+unix:LIBS         += -lorigin

-+unix:LIBS         += -lz

- 

- ##################### Windows ###############################################

-@@ -240,6 +241,6 @@
- ###############################################################

- 

--	HEADERS += ../3rdparty/liborigin/OPJFile.h

--	SOURCES += ../3rdparty/liborigin/OPJFile.cpp

-+#	HEADERS += ../3rdparty/liborigin/OPJFile.h

-+#	SOURCES += ../3rdparty/liborigin/OPJFile.cpp

- 

- ###############################################################

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch
deleted file mode 100644
index 2b2d5126c833..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# patch needed for providing the proper includes needed for
-# gcc-4.3 (08/25/2008)
-
-diff -Naur qtiplot-0.9.7/qtiplot/src/plot2D/ScaleEngine.cpp qtiplot-0.9.7.new/qtiplot/src/plot2D/ScaleEngine.cpp
---- qtiplot-0.9.7/qtiplot/src/plot2D/ScaleEngine.cpp	2008-06-12 13:19:20.000000000 -0400
-+++ qtiplot-0.9.7.new/qtiplot/src/plot2D/ScaleEngine.cpp	2008-08-25 18:38:35.000000000 -0400
-@@ -27,6 +27,7 @@
-  *                                                                         *
-  ***************************************************************************/
- #include "ScaleEngine.h"
-+#include <limits.h>
- 
- QwtScaleTransformation* ScaleEngine::transformation() const
- {

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch
deleted file mode 100644
index 2c98b330bf24..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# fix gcc-4.3 missing headers 
-
-diff -Naur qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h
---- qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h	2008-09-21 13:22:33.000000000 -0400
-+++ qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h	2008-09-25 10:07:27.000000000 -0400
-@@ -33,6 +33,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cstring>
- #include "boost/variant.hpp"
- #include "boost/date_time/posix_time/ptime.hpp"
- 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch
deleted file mode 100644
index c4b53197e3ba..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur qtiplot-0.9.7.2/qtiplot/qtiplot.pro qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro
---- qtiplot-0.9.7.2/qtiplot/qtiplot.pro	2008-09-22 08:15:41.000000000 -0400
-+++ qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro	2008-09-25 10:16:00.000000000 -0400
-@@ -17,7 +17,7 @@
- # Uncomment the following line if you want to perform a custom installation using

- # the *.path variables defined bellow.

- ######################################################################################

--#CONFIG          += CustomInstall

-+CONFIG          += CustomInstall

- 

- CONFIG          += release

- #CONFIG          += debug

-@@ -27,13 +27,12 @@
- #!!! Warning: You must modify these paths according to your computer settings

- #############################################################################

- 

--INCLUDEPATH       += ../3rdparty/muparser/include

--INCLUDEPATH       += ../3rdparty/qwtplot3d/include

--INCLUDEPATH       += ../3rdparty/qwt/src

--INCLUDEPATH       += ../3rdparty/liborigin

--INCLUDEPATH       += ../3rdparty/gsl/include

--INCLUDEPATH       += ../3rdparty/zlib123/include

--INCLUDEPATH       += ../3rdparty/boost_1_36_0

-+INCLUDEPATH       += /usr/include/muparser

-+INCLUDEPATH       += /usr/include/qwtplot3d

-+INCLUDEPATH       += /usr/include/qwt5

-+INCLUDEPATH       += ../3rdparty/liborigin
-+INCLUDEPATH       += /usr/include/gsl

-+INCLUDEPATH       += /usr/include/boost

- 

- ##################### 3rd PARTY LIBRARIES SECTION ###########################

- #!!! Warning: You must modify these paths according to your computer settings

-@@ -42,17 +41,19 @@
- ##################### Linux (Mac OS X) ######################################

- 

- # statically link against libraries in 3rdparty

--unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

--unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

--unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

--unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

--unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

-+#unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

-+#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

-+#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

-+#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

-+#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

- 

- # dynamically link against dependencies if they are installed system-wide

--#unix:LIBS         += -lmuparser

--#unix:LIBS         += -lqwtplot3d

--#unix:LIBS         += -lqwt

--#unix:LIBS         += -lgsl -lgslcblas

-+unix:LIBS         += -lmuparser

-+unix:LIBS         += -lqwtplot3d

-+unix:LIBS         += -lqwt

-+unix:LIBS         += $$system(pkg-config --libs gsl)

-+#unix:LIBS         += -lorigin

-+unix:LIBS         += -lz

- 

- ##################### Windows ###############################################

- 

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch
deleted file mode 100644
index 841ac78df38e..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur qtiplot-0.9.7.3/qtiplot/src/scripting/ScriptEdit.cpp qtiplot-0.9.7.3.new/qtiplot/src/scripting/ScriptEdit.cpp
---- qtiplot-0.9.7.3/qtiplot/src/scripting/ScriptEdit.cpp	2008-10-20 11:59:25.000000000 -0400
-+++ qtiplot-0.9.7.3.new/qtiplot/src/scripting/ScriptEdit.cpp	2008-11-13 09:10:48.000000000 -0500
-@@ -28,7 +28,11 @@
-  ***************************************************************************/
- #include "ScriptEdit.h"
- #include "Note.h"
-+
-+#ifdef SCRIPTING_PYTHON
- #include "PythonSyntaxHighlighter.h"
-+#endif
-+
- #include "FindReplaceDialog.h"
- 
- #include <QAction>
-@@ -58,9 +62,11 @@
- 	setTextFormat(Qt::PlainText);
- 	setAcceptRichText (false);
- 
-+#ifdef SCRIPTING_PYTHON
- 	if (scriptEnv->name() == QString("Python"))
- 		d_highlighter = new PythonSyntaxHighlighter(this);
--	
-+#endif
-+
- 	d_fmt_default.setBackground(palette().brush(QPalette::Base));
- 	d_fmt_failure.setBackground(QBrush(QColor(255,128,128)));
- 
-@@ -142,6 +148,7 @@
- 		connect(myScript, SIGNAL(error(const QString&, const QString&, int)), this, SLOT(insertErrorMsg(const QString&)));
- 		connect(myScript, SIGNAL(print(const QString&)), this, SLOT(scriptPrint(const QString&)));
- 
-+#ifdef SCRIPTING_PYTHON
- 		if (scriptEnv->name() == QString("Python") && !d_highlighter)
- 			d_highlighter = new PythonSyntaxHighlighter(this);
- 		else {
-@@ -149,6 +156,7 @@
- 				delete d_highlighter;
- 			d_highlighter = 0;
- 		}
-+#endif
- 	}
- }
- 

-@@ -585,13 +593,16 @@
- 
- void ScriptEdit::rehighlight()
- {
-+#ifdef SCRIPTING_PYTHON
- 	if (scriptEnv->name() != QString("Python"))
- 		return;
--
-+#endif
- 	if (d_highlighter)
- 		delete d_highlighter;
- 
-+#ifdef SCRIPTING_PYTHON
- 	d_highlighter = new PythonSyntaxHighlighter(this);
-+#endif
- }
- 
- void ScriptEdit::showFindDialog(bool replace)
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch
deleted file mode 100644
index 3cf5663dfa11..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -Naur qtiplot-0.9.7.3/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.3.new/fitPlugins/exp_saturation/exp_saturation.pro
---- qtiplot-0.9.7.3/fitPlugins/exp_saturation/exp_saturation.pro	2008-10-13 03:43:31.000000000 -0400
-+++ qtiplot-0.9.7.3.new/fitPlugins/exp_saturation/exp_saturation.pro	2008-10-24 10:15:30.000000000 -0400
-@@ -12,12 +12,12 @@
- DESTDIR           = ../

-  

- # statically link against GSL in 3rdparty

--INCLUDEPATH += ../../3rdparty/gsl/include/

--LIBS        += ../../3rdparty/gsl/lib/libgsl.a

--LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

-+#LIBS        += ../../3rdparty/gsl/lib/libgsl.a

-+#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

- 

- #dynamically link against GSL installed system-wide

--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

-+INCLUDEPATH += /usr/include/gsl

-+unix:LIBS += $$system(pkg-config --libs gsl)

- 

- target.path=/usr/lib$${libsuff}/qtiplot/plugins

- INSTALLS += target

-diff -Naur qtiplot-0.9.7.3/fitPlugins/explin/explin.pro qtiplot-0.9.7.3.new/fitPlugins/explin/explin.pro
---- qtiplot-0.9.7.3/fitPlugins/explin/explin.pro	2008-10-13 03:43:31.000000000 -0400
-+++ qtiplot-0.9.7.3.new/fitPlugins/explin/explin.pro	2008-10-24 10:15:49.000000000 -0400
-@@ -12,12 +12,13 @@
- DESTDIR           = ../

-  

- # statically link against GSL in 3rdparty

--INCLUDEPATH += ../../3rdparty/gsl/include/

--LIBS        += ../../3rdparty/gsl/lib/libgsl.a

--LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

-+#INCLUDEPATH += ../../3rdparty/gsl/include/

-+#LIBS        += ../../3rdparty/gsl/lib/libgsl.a

-+#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

- 

- #dynamically link against GSL installed system-wide

--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

-+INCLUDEPATH += /usr/include/gsl

-+unix:LIBS += $$system(pkg-config --libs gsl)

- 

- target.path=/usr/lib$${libsuff}/qtiplot/plugins

- INSTALLS += target

-diff -Naur qtiplot-0.9.7.3/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.3.new/fitPlugins/fitRational0/fitRational0.pro
---- qtiplot-0.9.7.3/fitPlugins/fitRational0/fitRational0.pro	2008-10-13 12:14:52.000000000 -0400
-+++ qtiplot-0.9.7.3.new/fitPlugins/fitRational0/fitRational0.pro	2008-10-24 10:16:08.000000000 -0400
-@@ -12,12 +12,13 @@
- DESTDIR           = ../

-  

- # statically link against GSL in 3rdparty

--INCLUDEPATH += ../../3rdparty/gsl/include/

--LIBS        += ../../3rdparty/gsl/lib/libgsl.a

--LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

-+#INCLUDEPATH += ../../3rdparty/gsl/include/

-+#LIBS        += ../../3rdparty/gsl/lib/libgsl.a

-+#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

- 

- #dynamically link against GSL installed system-wide

--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

-+INCLUDEPATH += /usr/include/gsl
-+unix:LIBS += $$system(pkg-config --libs gsl)
- 

- target.path=/usr/lib$${libsuff}/qtiplot/plugins

- INSTALLS += target

-diff -Naur qtiplot-0.9.7.3/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.3.new/fitPlugins/fitRational1/fitRational1.pro
---- qtiplot-0.9.7.3/fitPlugins/fitRational1/fitRational1.pro	2007-10-28 19:44:06.000000000 -0400
-+++ qtiplot-0.9.7.3.new/fitPlugins/fitRational1/fitRational1.pro	2008-10-24 10:16:25.000000000 -0400
-@@ -12,12 +12,13 @@
- DESTDIR           = ../

-  

- # statically link against GSL in 3rdparty

--INCLUDEPATH += ../../3rdparty/gsl/include/

--LIBS        += ../../3rdparty/gsl/lib/libgsl.a

--LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

-+#INCLUDEPATH += ../../3rdparty/gsl/include/

-+#LIBS        += ../../3rdparty/gsl/lib/libgsl.a

-+#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

- 

- #dynamically link against GSL installed system-wide

--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

-+INCLUDEPATH += /usr/include/gsl

-+unix:LIBS += $$system(pkg-config --libs gsl)

- 

- target.path=/usr/lib$${libsuff}/qtiplot/plugins

- INSTALLS += target

-diff -Naur qtiplot-0.9.7.3/qtiplot/qtiplot.pro qtiplot-0.9.7.3.new/qtiplot/qtiplot.pro
---- qtiplot-0.9.7.3/qtiplot/qtiplot.pro	2008-10-22 13:57:19.000000000 -0400
-+++ qtiplot-0.9.7.3.new/qtiplot/qtiplot.pro	2008-10-24 11:03:21.000000000 -0400
-@@ -23,7 +23,7 @@
- win32:LIBS 		  += ../3rdparty/libpng/libpng.a

- 

- # Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.

--#CONFIG          += CustomInstall

-+CONFIG          += CustomInstall

- 

- CONFIG          += release

- #CONFIG          += debug

-@@ -33,13 +33,12 @@
- #!!! Warning: You must modify these paths according to your computer settings

- #############################################################################

- 

--INCLUDEPATH       += ../3rdparty/muparser/include

--INCLUDEPATH       += ../3rdparty/qwtplot3d/include

--INCLUDEPATH       += ../3rdparty/qwt/src

--INCLUDEPATH       += ../3rdparty/liborigin

--INCLUDEPATH       += ../3rdparty/gsl/include

--INCLUDEPATH       += ../3rdparty/zlib123/include

--INCLUDEPATH       += ../3rdparty/boost_1_36_0

-+INCLUDEPATH       += /usr/include/muparser
-+INCLUDEPATH       += /usr/include/qwtplot3d
-+INCLUDEPATH       += /usr/include/qwt5
-+INCLUDEPATH       += ../3rdparty/liborigin
-+INCLUDEPATH       += /usr/include/gsl
-+INCLUDEPATH       += /usr/include/boost
- 

- ##################### 3rd PARTY LIBRARIES SECTION ###########################

- #!!! Warning: You must modify these paths according to your computer settings

-@@ -48,15 +47,15 @@
- ##################### Linux (Mac OS X) ######################################

- 

- # statically link against libraries in 3rdparty

--unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

--unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

--unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

--unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

--unix:LIBS         += /usr/local/lib/libboost_date_time-gcc41-mt.a

--unix:LIBS         += /usr/local/lib/libboost_thread-gcc41-mt.a

-+#unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

-+#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

-+#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

-+#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

-+#unix:LIBS         += /usr/local/lib/libboost_date_time-gcc41-mt.a

-+#unix:LIBS         += /usr/local/lib/libboost_thread-gcc41-mt.a

- 

- # dynamically link against dependencies if they are installed system-wide

--#unix:LIBS         += -lmuparser

-+unix:LIBS         += -lmuparser -lqwtplot3d -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread
- #unix:LIBS         += -lqwt

- #unix:LIBS         += -lgsl -lgslcblas

- 

-@@ -184,7 +183,7 @@
- ################# Default Modules #############################

- ###############################################################

- 

--include(../3rdparty/qwtplot3d/qwtplot3d.pri)

-+#include(../3rdparty/qwtplot3d/qwtplot3d.pri)

- include(src/analysis/analysis.pri)

- include(src/core/core.pri)

- include(src/lib/libqti.pri)

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch
deleted file mode 100644
index 881d6e043cd0..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur qtiplot-0.9.7.3/qtiplot/src/plot3D/Graph3D.cpp qtiplot-0.9.7.3.new/qtiplot/src/plot3D/Graph3D.cpp
---- qtiplot-0.9.7.3/qtiplot/src/plot3D/Graph3D.cpp	2008-10-20 06:32:35.000000000 -0400
-+++ qtiplot-0.9.7.3.new/qtiplot/src/plot3D/Graph3D.cpp	2008-10-24 11:04:56.000000000 -0400
-@@ -777,7 +777,7 @@
- void Graph3D::setNumbersFont(const QFont& font)
- {
- 	sp->coordinates()->setNumberFont (font);
--	sp->legend()->axis()->setNumberFont (font);
-+	//sp->legend()->axis()->setNumberFont (font);
- 	sp->makeCurrent();
- 	sp->updateGL();
- }
-@@ -1570,7 +1570,7 @@
- void Graph3D::setNumbersColor(const QColor& numColor)
- {
- 	if(numCol != numColor){
--		sp->legend()->axis()->setNumberColor(Qt2GL(numColor));
-+		//sp->legend()->axis()->setNumberColor(Qt2GL(numColor));
- 		sp->coordinates()->setNumberColor(Qt2GL(numColor));
- 		numCol = numColor;
- 	}
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch
deleted file mode 100644
index 2182c14e673e..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur qtiplot-0.9.7.3/qtiplot/src/scripting/qti.sip qtiplot-0.9.7.3.new/qtiplot/src/scripting/qti.sip
---- qtiplot-0.9.7.3/qtiplot/src/scripting/qti.sip	2008-10-20 06:32:35.000000000 -0400
-+++ qtiplot-0.9.7.3.new/qtiplot/src/scripting/qti.sip	2008-12-18 17:24:44.000000000 -0500
-@@ -74,8 +74,6 @@
-   MdiSubWindow(const MdiSubWindow&);

- };

- 

--typedef QList<MdiSubWindow*> MDIWindowList;

--

- class Table: MdiSubWindow

- {

- %TypeHeaderCode

-@@ -1072,7 +1070,7 @@
-     Graph3D* plotParametricSurface(const QString&, const QString&, const QString&,

-             double, double, double, double, int=40, int=40, bool=true, bool=true) /PyName=plot3D/;

- 

--  MDIWindowList windowsList() /PyName=windows/;

-+  QList<MdiSubWindow*> windowsList() /PyName=windows/;

- 

-   // folders

-   Folder *activeFolder() /NoDerived/;

-@@ -1867,7 +1865,7 @@
- #include "src/core/Folder.h"

- %End

- public:

--  MDIWindowList windowsList() /PyName=windows/;

-+  QList<MdiSubWindow*> windowsList() /PyName=windows/;

- // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly

- //  void setFolderName(const QString&) /PyName=setName/;

-   QString name();