Version bump, fixing bug #256543, bug #262939, bug #263675, bug #265623. Removed old version.

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

9 files changed, 270 insertions, 319 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 4eef78b07a22..be289fde6f89 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.41 2009/04/08 08:53:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.42 2009/04/14 11:58:42 bicatali Exp $
+
+*qtiplot-0.9.7.7 (14 Apr 2009)
+
+  14 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/qtiplot-0.9.7.4-gcc4.3.patch,
+  -files/qtiplot-0.9.7.4-liborigin-gcc4.3.patch,
+  -files/qtiplot-0.9.7.4-no-python.patch, -files/qtiplot-0.9.7.4-pro.patch,
+  -files/qtiplot-0.9.7.4-sip.patch, +files/qtiplot-0.9.7.7-docbuild.patch,
+  +files/qtiplot-0.9.7.7-syslibs.patch, -qtiplot-0.9.7.4.ebuild,
+  +qtiplot-0.9.7.7.ebuild:
+  Version bump, fixing bug #256543, bug #262939, bug #263675, bug #265623.
+  Removed old version.
 
   08 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
   -qtiplot-0.8.5.ebuild, -qtiplot-0.9.7.2.ebuild, -qtiplot-0.9.7.3.ebuild:
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-gcc4.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-gcc4.3.patch
deleted file mode 100644
index 639aa8d40d31..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-gcc4.3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# patch needed for providing the proper includes needed for
-# gcc-4.3 (08/25/2008)
-
-Index: qtiplot-0.9.7.4/qtiplot/src/plot2D/ScaleEngine.cpp
-===================================================================
---- qtiplot-0.9.7.4.orig/qtiplot/src/plot2D/ScaleEngine.cpp
-+++ qtiplot-0.9.7.4/qtiplot/src/plot2D/ScaleEngine.cpp
-@@ -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.4-liborigin-gcc4.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-liborigin-gcc4.3.patch
deleted file mode 100644
index 0e6c1bbb8f10..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-liborigin-gcc4.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# fix gcc-4.3 missing headers 
-
-Index: qtiplot-0.9.7.4/3rdparty/liborigin/OriginObj.h
-===================================================================
---- qtiplot-0.9.7.4.orig/3rdparty/liborigin/OriginObj.h
-+++ qtiplot-0.9.7.4/3rdparty/liborigin/OriginObj.h
-@@ -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.4-no-python.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-no-python.patch
deleted file mode 100644
index de2db4c7811b..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-no-python.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: qtiplot-0.9.7.4/qtiplot/src/scripting/ScriptEdit.cpp
-===================================================================
---- qtiplot-0.9.7.4.orig/qtiplot/src/scripting/ScriptEdit.cpp
-+++ qtiplot-0.9.7.4/qtiplot/src/scripting/ScriptEdit.cpp
-@@ -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 @@ ScriptEdit::ScriptEdit(ScriptingEnv *env
- 	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 @@ void ScriptEdit::customEvent(QEvent *e)
- 		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 @@ void ScriptEdit::customEvent(QEvent *e)
- 				delete d_highlighter;
- 			d_highlighter = 0;
- 		}
-+#endif
- 	}
- }
- 

-@@ -585,13 +593,16 @@ void ScriptEdit::setDirPath(const QStrin
- 
- 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.4-pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-pro.patch
deleted file mode 100644
index 9c170de02cd3..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-pro.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Index: qtiplot-0.9.7.4/fitPlugins/explin/explin.pro
-===================================================================
---- qtiplot-0.9.7.4.orig/fitPlugins/explin/explin.pro
-+++ qtiplot-0.9.7.4/fitPlugins/explin/explin.pro
-@@ -12,12 +12,13 @@ CONFIG           += dll 

- 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

-Index: qtiplot-0.9.7.4/fitPlugins/exp_saturation/exp_saturation.pro
-===================================================================
---- qtiplot-0.9.7.4.orig/fitPlugins/exp_saturation/exp_saturation.pro
-+++ qtiplot-0.9.7.4/fitPlugins/exp_saturation/exp_saturation.pro
-@@ -12,12 +12,12 @@ CONFIG           += dll 

- 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

-Index: qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro
-===================================================================
---- qtiplot-0.9.7.4.orig/fitPlugins/fitRational0/fitRational0.pro
-+++ qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro
-@@ -12,12 +12,13 @@ CONFIG           += dll 

- 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

-Index: qtiplot-0.9.7.4/fitPlugins/fitRational1/fitRational1.pro
-===================================================================
---- qtiplot-0.9.7.4.orig/fitPlugins/fitRational1/fitRational1.pro
-+++ qtiplot-0.9.7.4/fitPlugins/fitRational1/fitRational1.pro
-@@ -12,12 +12,13 @@ CONFIG           += dll 

- 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

-Index: qtiplot-0.9.7.4/qtiplot/qtiplot.pro
-===================================================================
---- qtiplot-0.9.7.4.orig/qtiplot/qtiplot.pro
-+++ qtiplot-0.9.7.4/qtiplot/qtiplot.pro
-@@ -20,7 +20,7 @@ win32:INCLUDEPATH += ../3rdparty/libpng/
- 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

-@@ -30,13 +30,12 @@ CONFIG          += release

- #!!! 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       += ../3rdparty/qwtplot3d/include
-+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

-@@ -45,15 +44,15 @@ INCLUDEPATH       += ../3rdparty/boost_1
- ##################### 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 -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread
- #unix:LIBS         += -lqwt

- #unix:LIBS         += -lgsl -lgslcblas

- 

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-sip.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-sip.patch
deleted file mode 100644
index a55f62dbd886..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.4-sip.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: qtiplot-0.9.7.4/qtiplot/src/scripting/qti.sip
-===================================================================
---- qtiplot-0.9.7.4.orig/qtiplot/src/scripting/qti.sip
-+++ qtiplot-0.9.7.4/qtiplot/src/scripting/qti.sip
-@@ -74,8 +74,6 @@ private:

-   MdiSubWindow(const MdiSubWindow&);

- };

- 

--typedef QList<MdiSubWindow*> MDIWindowList;

--

- class Table: MdiSubWindow

- {

- %TypeHeaderCode

-@@ -1072,7 +1070,7 @@ public:

-     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 @@ class Folder : QObject

- #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();

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-docbuild.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-docbuild.patch
new file mode 100644
index 000000000000..58779fd3fd20
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-docbuild.patch
@@ -0,0 +1,38 @@
+--- manual/docbook-en/index.docbook.orig	2009-04-14 11:03:31.000000000 +0100
++++ manual/docbook-en/index.docbook	2009-04-14 10:58:41.000000000 +0100
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "/usr/share/sgml/docbook/xml-dtd-4.2/docbookx.dtd" [
+ 
+   <!ENTITY appname "QtiPlot">
+   <!ENTITY kappname "&appname;">
+--- manual/Makefile.orig	2009-04-14 11:03:31.000000000 +0100
++++ manual/Makefile	2009-04-14 10:44:59.000000000 +0100
+@@ -1,3 +1,2 @@
+-html-pdf:
+-	docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid
+-	dblatex -o qtiplot-manual-en.pdf -c dblatex.conf -p dblatex-param.xsl docbook-en/index.docbook
++all:
++	docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid -l /usr/share/sgml/xml.dcl
+--- manual/qtiplot.dsl.orig	2009-04-14 11:03:31.000000000 +0100
++++ manual/qtiplot.dsl	2009-04-14 10:50:29.000000000 +0100
+@@ -6,7 +6,7 @@
+ <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+ 
+ <!-- Path to main Docbook->html stylesheet. You have to adapt this to your installation. -->
+-<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL>
++<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/stylesheets/dsssl/docbook/html/docbook.dsl" CDATA DSSSL>
+ 
+ <!-- Stylesheet function library for creating Windows HTML help and Qt Assistant profiles. -->
+ <!ENTITY docbook-help-stylesheet SYSTEM "./help.dsl" CDATA DSSSL>
+diff -Nur manual.orig/qtiplot_html.xsl manual/qtiplot_html.xsl
+--- manual/qtiplot_html.xsl.orig	2009-04-14 11:03:31.000000000 +0100
++++ manual/qtiplot_html.xsl	2009-04-14 10:51:53.000000000 +0100
+@@ -1,5 +1,5 @@
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
+-<xsl:import href="file:////usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
++<xsl:import href="file:////usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
+ 
+ 	<!-- html.stylesheet
+ 	The html.stylesheet parameter is either empty, indicating that no 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch
new file mode 100644
index 000000000000..2ace5f295dac
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch
@@ -0,0 +1,183 @@
+diff -Nur qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pri qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pri
+--- qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pri	2009-04-13 17:42:29.000000000 +0100
++++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pri	2009-04-14 09:25:58.000000000 +0100
+@@ -57,11 +57,11 @@
+            ../3rdparty/qwtplot3d/include/qwt3d_multiplot.h

+ 

+ # gl2ps support

+-HEADERS += ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.h \

+-         ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h

++HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h

+ 

+-SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp \

+-         ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c

++SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp

++

++unix:LIBS+=-lgl2ps

+ 

+ # zlib support for gl2ps

+ zlib {

+diff -Nur qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pro qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pro
+--- qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pro	2009-04-13 17:42:29.000000000 +0100
++++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pro	2009-04-13 19:19:12.000000000 +0100
+@@ -82,11 +82,10 @@
+            include/qwt3d_multiplot.h
+ 
+ # gl2ps support
+-HEADERS+=3rdparty/gl2ps/gl2ps.h \
+-         include/qwt3d_io_gl2ps.h
++HEADERS+=include/qwt3d_io_gl2ps.h
+          
+-SOURCES+=src/qwt3d_io_gl2ps.cpp \
+-         3rdparty/gl2ps/gl2ps.c
++SOURCES+=src/qwt3d_io_gl2ps.cpp
++unix:LIBS+=-lgl2ps
+ 
+ # zlib support for gl2ps
+ zlib {
+diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/explin/explin.pro qtiplot-0.9.7.7/fitPlugins/explin/explin.pro
+--- qtiplot-0.9.7.7.orig/fitPlugins/explin/explin.pro	2009-04-13 17:42:29.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/explin/explin.pro	2009-04-13 19:32:36.000000000 +0100
+@@ -12,9 +12,8 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

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

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

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

++INCLUDEPATH += $$system(pkg-config --cflags gsl)

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

+ 

+ #dynamically link against GSL installed system-wide

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

+diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.7/fitPlugins/exp_saturation/exp_saturation.pro
+--- qtiplot-0.9.7.7.orig/fitPlugins/exp_saturation/exp_saturation.pro	2009-04-13 17:42:29.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/exp_saturation/exp_saturation.pro	2009-04-13 19:33:27.000000000 +0100
+@@ -12,9 +12,9 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

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

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

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

++INCLUDEPATH += $$system(pkg-config --cflags gsl)

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

++

+ 

+ #dynamically link against GSL installed system-wide

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

+diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitPlugins.pro qtiplot-0.9.7.7/fitPlugins/fitPlugins.pro
+--- qtiplot-0.9.7.7.orig/fitPlugins/fitPlugins.pro	2009-04-13 17:42:29.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/fitPlugins.pro	2009-04-13 19:34:21.000000000 +0100
+@@ -4,3 +4,4 @@
+ 	    exp_saturation \

+ 	    fitRational0 \

+           fitRational1 

++

+diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.7/fitPlugins/fitRational0/fitRational0.pro
+--- qtiplot-0.9.7.7.orig/fitPlugins/fitRational0/fitRational0.pro	2009-04-13 17:42:29.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/fitRational0/fitRational0.pro	2009-04-13 19:34:49.000000000 +0100
+@@ -12,9 +12,9 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

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

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

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

++INCLUDEPATH += $$system(pkg-config --cflags gsl)
++LIBS        += $$system(pkg-config --libs gsl)
++
+ 

+ #dynamically link against GSL installed system-wide

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

+diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.7/fitPlugins/fitRational1/fitRational1.pro
+--- qtiplot-0.9.7.7.orig/fitPlugins/fitRational1/fitRational1.pro	2009-04-13 17:42:29.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/fitRational1/fitRational1.pro	2009-04-13 19:35:04.000000000 +0100
+@@ -12,9 +12,8 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

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

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

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

++INCLUDEPATH += $$system(pkg-config --cflags gsl)

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

+ 

+ #dynamically link against GSL installed system-wide

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

+diff -Nur qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro qtiplot-0.9.7.7/qtiplot/qtiplot.pro
+--- qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro	2009-04-13 17:42:30.000000000 +0100
++++ qtiplot-0.9.7.7/qtiplot/qtiplot.pro	2009-04-13 19:05:13.000000000 +0100
+@@ -21,7 +21,7 @@
+ #CONFIG          += HAVE_EMF

+ 

+ # 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

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

+ #############################################################################

+ 

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

++INCLUDEPATH       += $$system(pkg-config --cflags muparser)

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

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

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

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

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

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

++INCLUDEPATH       += /usr/include/qwt5

++INCLUDEPATH       += /usr/include/liborigin2

++INCLUDEPATH       += $$system(pkg-config --cflags gsl)

++INCLUDEPATH       += /usr/include/boost

+ 

+ ##################### 3rd PARTY LIBRARIES SECTION ###########################

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

+@@ -46,12 +45,10 @@
+ ##################### 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         += ../3rdparty/boost_1_36_0/lib/libboost_date_time-gcc43-mt-1_36.a

+-unix:LIBS         += ../3rdparty/boost_1_36_0/lib/libboost_thread-gcc43-mt-1_36.a

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

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

++unix:LIBS         += -lqwt -lz -lorigin2

++unix:LIBS         += -lboost_date_time -lboost_thread

+ 

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

+ #unix:LIBS         += -lmuparser

+@@ -213,8 +209,6 @@
+ 

+ contains(CONFIG, HAVE_LIBPNG){

+ 	DEFINES += GL2PS_HAVE_LIBPNG

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

+-	LIBS        += ../3rdparty/libpng/libpng.a

+ }

+ 

+ ###############################################################

+diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/origin/origin.pri qtiplot-0.9.7.7/qtiplot/src/origin/origin.pri
+--- qtiplot-0.9.7.7.orig/qtiplot/src/origin/origin.pri	2009-04-13 17:42:30.000000000 +0100
++++ qtiplot-0.9.7.7/qtiplot/src/origin/origin.pri	2009-04-13 19:17:43.000000000 +0100
+@@ -4,14 +4,6 @@
+ INCLUDEPATH += src/origin/

+ 

+ HEADERS += src/origin/importOPJ.h

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

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

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

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

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

+ 

+ SOURCES += src/origin/importOPJ.cpp

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

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

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

+-SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
++
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild
index 497317a1721b..96002be00f6b 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.4.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.4.ebuild,v 1.2 2009/04/06 15:20:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild,v 1.1 2009/04/14 11:58:42 bicatali Exp $
 
-EAPI="1"
-inherit eutils multilib qt4 fdo-mime python
+EAPI=2
+inherit eutils qt4 fdo-mime python
 
 DESCRIPTION="Qt based clone of the Origin plotting package"
 HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2
-	doc? ( mirror://gentoo/${PN}-0.9.7-manual-en.tar.bz2 )"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="python doc bindist"
 
 LANGS="de es fr ja ru sv"
@@ -20,19 +19,24 @@ for l in ${LANGS}; do
 	IUSE="${IUSE} linguas_${l}"
 done
 
-CDEPEND=">=x11-libs/qwt-5.1
-	>=x11-libs/qwtplot3d-0.2.7
+# qwtplot3d much modified from original upstream
+CDEPEND=">=x11-libs/qwt-5.2
 	x11-libs/qt-gui:4
 	x11-libs/qt-qt3support:4
 	x11-libs/qt-assistant:4
-	>=dev-cpp/muParser-1.28
+	x11-libs/qt-svg:4
+	x11-libs/gl2ps
+	>=dev-cpp/muParser-1.30
 	>=dev-libs/boost-1.35.0
+	>=sci-libs/liborigin-20090406:2
 	!bindist? ( sci-libs/gsl )
 	bindist? ( <sci-libs/gsl-1.10 )"
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
-	python? ( >=dev-python/sip-4.5.2 )"
+	python? ( >=dev-python/sip-4.5.2 )
+	doc? ( app-text/docbook-sgml-utils
+		   app-text/docbook-xml-dtd:4.2 )"
 
 RDEPEND="${CDEPEND}
 	python? ( >=dev-lang/python-2.5
@@ -40,27 +44,13 @@ RDEPEND="${CDEPEND}
 		dev-python/pygsl
 		sci-libs/scipy )"
 
-QT4_BUILT_WITH_USE_CHECK="qt3support"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-pro.patch
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-	epatch "${FILESDIR}"/${P}-liborigin-gcc4.3.patch
-	epatch "${FILESDIR}"/${P}-no-python.patch
-	epatch "${FILESDIR}"/${P}-sip.patch
-
-	sed -i \
-		-e '/manual/d'\
-		-e '/3rd/d' \
-		qtiplot.pro || die "sed qtiplot.pro failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-syslibs.patch
+	epatch "${FILESDIR}"/${P}-docbuild.patch
 
 	python_version
-
 	sed -i \
-		-e '/manual/d' \
-		-e "s:doc/${PN}:doc/${PF}:" \
+		-e "s:doc/${PN}/manual:doc/${PF}/html:" \
 		-e "s:local/${PN}:$(get_libdir)/python${PYVER}/site-packages:" \
 		qtiplot/qtiplot.pro || die " sed for qtiplot/qtiplot.pro failed"
 
@@ -70,14 +60,16 @@ src_unpack() {
 			-e '/sipcmd/d' \
 			qtiplot/qtiplot.pro || die "sed for python option failed"
 	fi
+	sed -i \
+		-e '/INSTALLS.*.*documentation/d' \
+		-e '/manual/d' \
+		qtiplot.pro qtiplot/qtiplot.pro || die "sed for doc failed"
 
 	# the lib$$suff did not work in the fitRational*.pro files
-	pushd fitPlugins >& /dev/null
 	sed -i \
 		-e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
-		fit*/fitRational*.pro exp_saturation/*.pro explin/*.pro \
+		fitPlugins/*/*.pro \
 		|| die "sed fitRational* failed"
-	popd
 
 	for l in ${LANGS}; do
 		if ! use linguas_${l}; then
@@ -87,38 +79,35 @@ src_unpack() {
 				qtiplot/qtiplot.pro || die
 		fi
 	done
+	chmod -x qtiplot/qti_wordlist.txt
 }
 
-src_compile() {
+src_configure() {
 	eqmake4
+}
+
+src_compile() {
 	emake || die "emake failed"
+	if use doc; then
+		#doxygen Doxyfile || die "api building failed"
+		cd manual
+		emake || die "html docbook building failed"
+	fi
 }
 
+
 src_install() {
 	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
-	rm -f "${D}"/usr/share/${PN}/translations/*.ts
-	use python && chmod -x "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/qti_wordlist.txt
-
 	newicon qtiplot_logo.png qtiplot.png
-	make_desktop_entry qtiplot QtiPlot qtiplot
-
+	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
 	if use doc; then
 		insinto /usr/share/doc/${PF}/html
-		doins -r "${WORKDIR}"/qtiplot-manual/* \
-			|| die "install manual failed"
-		rm -rf "${D}"/usr/share/doc/${PF}/html/*/.svn
+		doins -r manual/html/* || die "install manual failed"
 	fi
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
-
-	if use python; then
-		python_version
-		python_mod_compile \
-			/usr/$(get_libdir)/python${PYVER}/site-packages/qti{plotrc,Util}.py
-	fi
-
 	if use doc; then
 		elog "On the first start, do Help -> Choose Help Folder"
 		elog "and select /usr/share/doc/${PF}/html"
@@ -127,9 +116,4 @@ pkg_postinst() {
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
-
-	if use python; then
-		python_version
-		python_mod_cleanup
-	fi
 }