Version bump (fixes bug #243430).

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-SENTINEL-3 i686)

2 files changed, 168 insertions, 0 deletions

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
new file mode 100644
index 000000000000..3cf5663dfa11
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch
@@ -0,0 +1,147 @@
+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
new file mode 100644
index 000000000000..881d6e043cd0
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch
@@ -0,0 +1,21 @@
+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;
+ 	}