sci-visualization/qtiplot: Import various fixes from debian

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

20 files changed, 409 insertions, 708 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 4a6389573f45..3ac67a071798 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.98 2013/03/02 23:28:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.99 2013/07/04 12:52:57 jlec Exp $
+
+*qtiplot-0.9.8.9-r2 (04 Jul 2013)
+
+  04 Jul 2013; Justin Lecher <jlec@gentoo.org> +qtiplot-0.9.8.9-r2.ebuild,
+  -files/qtiplot-0.9.7.12-system-QTeXEngine.patch,
+  -files/qtiplot-0.9.7.12-system-gl2ps.patch,
+  -files/qtiplot-0.9.7.12-system-liborigin.patch,
+  -files/qtiplot-0.9.7.14-system-2dplot.patch,
+  -files/qtiplot-0.9.7.14-system-liborigin.patch,
+  -files/qtiplot-0.9.8.2-origin-build-failure.patch,
+  -files/qtiplot-0.9.8.2-syslibs.patch, -files/qtiplot-0.9.8.3-odf.patch,
+  -files/qtiplot-0.9.8.3-origin.patch, -files/qtiplot-0.9.8.3-plot.patch,
+  -files/qtiplot-0.9.8.3-popup.patch, -files/qtiplot-0.9.8.5-tamuanova.patch,
+  -files/qtiplot-0.9.8.6-kde.patch, -files/qtiplot-0.9.8.6-tamuanova.patch,
+  +files/qtiplot-0.9.8.9-adopt_to_alglib3.patch,
+  +files/qtiplot-0.9.8.9-crasher_without_internet.patch,
+  +files/qtiplot-0.9.8.9-set_col_values.patch, metadata.xml:
+  Import various fixes from debian
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> qtiplot-0.9.8.9-r1.ebuild:
   Move Qt dependencies to the new category
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch
deleted file mode 100644
index 5577ec937c38..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-=== modified file 'build.conf.example'
---- build.conf.example	2010-01-21 22:49:21 +0000
-+++ build.conf.example	2010-02-14 15:04:17 +0000
-@@ -69,6 +69,13 @@
- win32:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/qwtplot3d.dll
- unix:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
- 
-+##########################################################
-+## QTeXEngine - uncomment if you wish to use system copy
-+# http://soft.proindependent.com/qtexengine/
-+##########################################################
-+#
-+# QTEXENGINE_LIBS = -lQTeXEngine
-+
- ###########################################################
- ## libxls - optional. you don't have to set these variables
- # http://libxls.sourceforge.net/
-
-=== modified file 'qtiplot/qtiplot.pro'
---- qtiplot/qtiplot.pro	2010-01-21 22:49:21 +0000
-+++ qtiplot/qtiplot.pro	2010-02-14 15:00:58 +0000
-@@ -11,7 +11,6 @@
- # local copy included
- INCLUDEPATH       += ../3rdparty/liborigin
- INCLUDEPATH       += ../3rdparty/zlib
--INCLUDEPATH 	  += ../3rdparty/QTeXEngine/src
- 
- # configurable
- INCLUDEPATH       += $$MUPARSER_INCLUDEPATH
-@@ -24,6 +23,7 @@
- LIBS         += $$MUPARSER_LIBS
- LIBS         += $$QWT_LIBS
- LIBS         += $$QWT3D_LIBS
-+LIBS         += $$QTEXENGINE_LIBS
- LIBS         += $$GSL_LIBS
- LIBS         += $$BOOST_LIBS
- 
-@@ -143,14 +143,16 @@
- include(src/table/table.pri)
- include(src/scripting/scripting.pri)
- 
--###############################################################
--##################### TeX export: QTeXEngine ##################
--###############################################################
-+isEmpty(QTEXENGINE_LIBS) {
-+	###############################################################
-+	##################### TeX export: QTeXEngine ##################
-+	###############################################################
- 
--INCLUDEPATH += ../3rdparty/QTeXEngine/src
--HEADERS 	+= ../3rdparty/QTeXEngine/src/QTeXEngine.h
--SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp
--SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
-+	INCLUDEPATH += ../3rdparty/QTeXEngine/src
-+	HEADERS 	+= ../3rdparty/QTeXEngine/src/QTeXEngine.h
-+	SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp
-+	SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
-+}
- 
- ###############################################################
- ##################### Scripting: PYTHON + SIP + PyQT ##########
-
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch
deleted file mode 100644
index b0419c2f390d..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-=== modified file '3rdparty/qwtplot3d/qwtplot3d.pri'
---- 3rdparty/qwtplot3d/qwtplot3d.pri	2010-01-21 22:49:21 +0000
-+++ 3rdparty/qwtplot3d/qwtplot3d.pri	2010-02-14 17:22:07 +0000
-@@ -8,6 +8,8 @@
-     3rdparty\gl2ps
- INCLUDEPATH += .
- 
-+LIBS+=-lgl2ps
-+
- # Input
- HEADERS += include/qwt3d_extglwidget.h \
-     include/qwt3d_color.h \
-@@ -37,8 +39,7 @@
-     include/qwt3d_volumeplot.h \
-     include/qwt3d_graphplot.h \
-     include/qwt3d_multiplot.h \
--    include/qwt3d_io_gl2ps.h \
--    3rdparty/gl2ps/gl2ps.h
-+    include/qwt3d_io_gl2ps.h
- SOURCES += src/qwt3d_extglwidget.cpp \
-     src/qwt3d_axis.cpp \
-     src/qwt3d_color.cpp \
-@@ -62,5 +63,4 @@
-     src/qwt3d_function.cpp \
-     src/qwt3d_gridplot.cpp \
-     src/qwt3d_meshplot.cpp \
--    src/qwt3d_io_gl2ps.cpp \
--    3rdparty/gl2ps/gl2ps.c
-+    src/qwt3d_io_gl2ps.cpp
-
-=== modified file '3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp'
---- 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp	2010-01-21 22:49:21 +0000
-+++ 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp	2010-02-14 17:12:09 +0000
-@@ -6,7 +6,7 @@
- #include <locale.h>
- 
- #include "qwt3d_openglhelper.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include "gl2ps.h"
- #include "qwt3d_io_gl2ps.h"
- #include "qwt3d_plot.h"
- 
-
-=== modified file '3rdparty/qwtplot3d/src/qwt3d_label.cpp'
---- 3rdparty/qwtplot3d/src/qwt3d_label.cpp	2010-01-21 22:49:21 +0000
-+++ 3rdparty/qwtplot3d/src/qwt3d_label.cpp	2010-02-14 17:13:01 +0000
-@@ -1,7 +1,7 @@
- #include <qbitmap.h>
- #include "qwt3d_label.h"
- #include "qwt3d_plot.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include "gl2ps.h"
- 
- using namespace Qwt3D;
- 
-
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch
deleted file mode 100644
index 3e89b243e2ec..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-=== modified file 'build.conf.example'
---- build.conf.example	2010-02-14 15:07:01 +0000
-+++ build.conf.example	2010-02-14 15:16:08 +0000
-@@ -118,6 +118,14 @@
- EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
- 
- ##########################################################
-+## liborigin - keep commented if you wish to use local copy
-+#  http://sourceforge.net/projects/liborigin/
-+##########################################################
-+
-+# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
-+# LIB_ORIGIN_LIBS = -lorigin2
-+
-+##########################################################
- ## python - only used if python is needed
- ##########################################################
- 
-
-=== modified file 'qtiplot/qtiplot.pro'
---- qtiplot/qtiplot.pro	2010-02-14 15:07:01 +0000
-+++ qtiplot/qtiplot.pro	2010-02-14 15:13:58 +0000
-@@ -9,7 +9,6 @@
- #############################################################################
- 
- # local copy included
--INCLUDEPATH       += ../3rdparty/liborigin
- INCLUDEPATH       += ../3rdparty/zlib
- 
- # configurable
-@@ -18,6 +17,7 @@
- INCLUDEPATH       += $$QWT3D_INCLUDEPATH
- INCLUDEPATH       += $$GSL_INCLUDEPATH
- INCLUDEPATH       += $$BOOST_INCLUDEPATH
-+INCLUDEPATH       += $$LIB_ORIGIN_INCLUDEPATH
- 
- # configurable libs
- LIBS         += $$MUPARSER_LIBS
-@@ -26,6 +26,7 @@
- LIBS         += $$QTEXENGINE_LIBS
- LIBS         += $$GSL_LIBS
- LIBS         += $$BOOST_LIBS
-+LIBS         += $$LIB_ORIGIN_LIBS
- 
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
-@@ -154,6 +155,10 @@
- 	SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
- }
- 
-+isEmpty(LIB_ORIGIN_LIBS) {
-+	INCLUDEPATH       += ../3rdparty/liborigin
-+}
-+
- ###############################################################
- ##################### Scripting: PYTHON + SIP + PyQT ##########
- ###############################################################
-
-=== modified file 'qtiplot/src/origin/origin.pri'
---- qtiplot/src/origin/origin.pri	2009-10-18 01:48:15 +0000
-+++ qtiplot/src/origin/origin.pri	2010-02-14 15:11:15 +0000
-@@ -4,14 +4,17 @@
- 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
-+
-+isEmpty(LIB_ORIGIN_LIBS) {
-+	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 += ../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/files/qtiplot-0.9.7.14-system-2dplot.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch
deleted file mode 100644
index 88664a1d58b1..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Index: qtiplot/src/plot2D/dialogs/PlotDialog.cpp
-===================================================================
---- qtiplot/src/plot2D/dialogs/PlotDialog.cpp	(revision 1728)
-+++ qtiplot/src/plot2D/dialogs/PlotDialog.cpp	(revision 1729)
-@@ -503,15 +503,19 @@
- 	gl2->addWidget(new QLabel( tr("width= ")), 0, 0);
- 	gl2->addWidget(boxPlotWidth, 0, 1);
- 
--	gl2->addWidget(new QLabel(tr("height= ")), 2, 0);
--	gl2->addWidget(boxPlotHeight, 2, 1);
-+	gl2->addWidget(new QLabel(tr("height= ")), 1, 0);
-+	gl2->addWidget(boxPlotHeight, 1, 1);
- 
- 	keepPlotRatioBox = new QCheckBox(tr("Keep aspect ratio"));
- 	keepPlotRatioBox->setChecked(app->d_keep_aspect_ration);
--	gl2->addWidget(keepRatioBox, 3, 1);
- 
--	gl2->setRowStretch(4, 1);
-+	connect(keepPlotRatioBox, SIGNAL(clicked (bool)), keepRatioBox, SLOT(setChecked(bool)));
-+	connect(keepRatioBox, SIGNAL(clicked (bool)), keepPlotRatioBox, SLOT(setChecked(bool)));
- 
-+	gl2->addWidget(keepPlotRatioBox, 2, 1);
-+
-+	gl2->setRowStretch(3, 1);
-+
- 	QHBoxLayout *bl2 = new QHBoxLayout();
- 	bl2->addWidget(gb1);
- 	bl2->addWidget(gb2);
-@@ -582,25 +586,25 @@
- 	gl2->addWidget(new QLabel( tr("width= ")), 0, 0);
- 	gl2->addWidget(boxLayerWidth, 0, 1);
- 
--	gl2->addWidget(new QLabel(tr("height= ")), 2, 0);
--	gl2->addWidget(boxLayerHeight, 2, 1);
-+	gl2->addWidget(new QLabel(tr("height= ")), 1, 0);
-+	gl2->addWidget(boxLayerHeight, 1, 1);
- 
- 	keepRatioBox = new QCheckBox(tr("Keep aspect ratio"));
- 	keepRatioBox->setChecked(app->d_keep_aspect_ration);
--	gl2->addWidget(keepRatioBox, 3, 1);
-+	gl2->addWidget(keepRatioBox, 2, 1);
- 
- 	QLabel *l = new QLabel(tr("Apply &to..."));
--	gl2->addWidget(l, 4, 0);
-+	gl2->addWidget(l, 3, 0);
- 
- 	sizeApplyToBox = new QComboBox();
- 	sizeApplyToBox->insertItem(tr("Layer"));
- 	sizeApplyToBox->insertItem(tr("Window"));
- 	sizeApplyToBox->insertItem(tr("All Windows"));
--	gl2->addWidget(sizeApplyToBox, 4, 1);
-+	gl2->addWidget(sizeApplyToBox, 3, 1);
- 
- 	l->setBuddy(sizeApplyToBox);
- 
--	gl2->setRowStretch(5, 1);
-+	gl2->setRowStretch(4, 1);
- 
- 	QBoxLayout *bl2 = new QBoxLayout (QBoxLayout::LeftToRight);
- 	bl2->addWidget(gb1);
-Index: qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp
-===================================================================
---- qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp	(revision 1728)
-+++ qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp	(revision 1729)
-@@ -240,7 +240,7 @@
- 	size_layout->addWidget(scaleFontsBox, 3, 1);
- 
- 	keepRatioBox = new QCheckBox(tr("&Keep aspect ratio"));
--	keepRatioBox->setChecked(true);
-+	keepRatioBox->setChecked(app->d_keep_aspect_ration);
-     size_layout->addWidget(keepRatioBox, 4, 1);
- 
- 	vert_layout->addWidget(d_custom_size_box);
-@@ -340,6 +340,7 @@
- 
- 		app->d_3D_export_text_mode = d_3D_text_export_mode->currentIndex();
- 		app->d_3D_export_sort = d_3D_export_sort->currentIndex();
-+		app->d_keep_aspect_ration = keepRatioBox->isChecked();
- 	}
- 
- 	e->accept();
-Index: qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp
-===================================================================
---- qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp	(revision 1728)
-+++ qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp	(revision 1729)
-@@ -460,6 +460,7 @@
-     gl2->addWidget(heightBox, 1, 1);
- 
- 	keepAspectBox = new QCheckBox(tr("&Keep aspect ratio"));
-+	keepAspectBox->setChecked(app->d_keep_aspect_ration);
- 	gl2->addWidget(keepAspectBox, 2, 1);
- 
- 	bestSizeButton = new QPushButton(tr("&Best size"));
-@@ -646,6 +647,10 @@
- 		FrameWidget *fw = qobject_cast<FrameWidget *>(d_widget);
-         if (fw)
-             fw->setAttachPolicy((FrameWidget::AttachPolicy)attachToBox->currentIndex());
-+
-+		ApplicationWindow *app = (ApplicationWindow *)this->parent();
-+		if (app)
-+			app->d_keep_aspect_ration = keepAspectBox->isChecked();
- 	} else if (patternPage && tabWidget->currentPage() == patternPage)
- 		patternApplyTo();
- 	else if (textPage && tabWidget->currentPage() == textPage){
-Index: qtiplot/src/core/ConfigDialog.cpp
-===================================================================
---- qtiplot/src/core/ConfigDialog.cpp	(revision 1728)
-+++ qtiplot/src/core/ConfigDialog.cpp	(revision 1729)
-@@ -1023,7 +1023,7 @@
- 	gl->addWidget(boxCanvasHeight, 2, 1);
- 
- 	keepRatioBox = new QCheckBox(tr("&Keep aspect ratio"));
--	keepRatioBox->setChecked(true);
-+	keepRatioBox->setChecked(app->d_keep_aspect_ration);
- 	gl->addWidget(keepRatioBox, 3, 1);
- 
- 	gl->setRowStretch(4, 1);
-@@ -2097,6 +2097,7 @@
- 		FrameWidget::Unit unit = (FrameWidget::Unit)unitBox->currentIndex();
- 		app->d_layer_canvas_width = convertToPixels(boxCanvasWidth->value(), unit, 0);
- 		app->d_layer_canvas_height = convertToPixels(boxCanvasHeight->value(), unit, 1);
-+		app->d_keep_aspect_ration = keepRatioBox->isChecked();
- 	}
- 
- 	// 2D plots page: ticks tab
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch
deleted file mode 100644
index e8fa4a3d714a..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-=== modified file 'build.conf.example'
---- build.conf.example	2010-04-22 18:57:40 +0000
-+++ build.conf.example	2010-04-22 18:58:06 +0000
-@@ -118,6 +118,14 @@
- EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
- 
- ##########################################################
-+## liborigin - keep commented if you wish to use local copy
-+#  http://sourceforge.net/projects/liborigin/
-+##########################################################
-+
-+# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
-+# LIB_ORIGIN_LIBS = -lorigin2
-+
-+##########################################################
- ## python - only used if python is needed
- ##########################################################
- 
-
-=== modified file 'qtiplot/qtiplot.pro'
---- qtiplot/qtiplot.pro	2010-04-22 18:57:40 +0000
-+++ qtiplot/qtiplot.pro	2010-04-22 19:08:57 +0000
-@@ -16,6 +16,7 @@
- INCLUDEPATH       += $$QWT_INCLUDEPATH
- INCLUDEPATH       += $$QWT3D_INCLUDEPATH
- INCLUDEPATH       += $$GSL_INCLUDEPATH
-+INCLUDEPATH       += $$LIB_ORIGIN_INCLUDEPATH
- 
- # configurable libs
- LIBS         += $$MUPARSER_LIBS
-@@ -23,6 +24,7 @@
- LIBS         += $$QWT3D_LIBS
- LIBS         += $$QTEXENGINE_LIBS
- LIBS         += $$GSL_LIBS
-+LIBS         += $$LIB_ORIGIN_LIBS
- 
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
-@@ -150,6 +152,10 @@
- 	SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
- }
- 
-+isEmpty(LIB_ORIGIN_LIBS) {
-+	INCLUDEPATH       += ../3rdparty/liborigin
-+}
-+
- ###############################################################
- ##################### Scripting: PYTHON + SIP + PyQT ##########
- ###############################################################
-
-=== modified file 'qtiplot/src/origin/origin.pri'
---- qtiplot/src/origin/origin.pri	2010-04-22 17:58:49 +0000
-+++ qtiplot/src/origin/origin.pri	2010-04-22 19:08:15 +0000
-@@ -4,24 +4,28 @@
- 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/Origin600Parser.h
--HEADERS += ../3rdparty/liborigin/Origin610Parser.h
--HEADERS += ../3rdparty/liborigin/Origin700Parser.h
--HEADERS += ../3rdparty/liborigin/Origin750Parser.h
--HEADERS += ../3rdparty/liborigin/Origin800Parser.h
--HEADERS += ../3rdparty/liborigin/Origin810Parser.h
- 
- SOURCES += src/origin/importOPJ.cpp
--SOURCES += ../3rdparty/liborigin/OriginFile.cpp
--SOURCES += ../3rdparty/liborigin/OriginParser.cpp
--SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
--SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp
-+
-+isEmpty(LIB_ORIGIN_LIBS) {
-+	HEADERS += ../3rdparty/liborigin/OriginObj.h
-+	HEADERS += ../3rdparty/liborigin/OriginFile.h
-+	HEADERS += ../3rdparty/liborigin/OriginParser.h
-+	HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
-+	HEADERS += ../3rdparty/liborigin/Origin600Parser.h
-+	HEADERS += ../3rdparty/liborigin/Origin610Parser.h
-+	HEADERS += ../3rdparty/liborigin/Origin700Parser.h
-+	HEADERS += ../3rdparty/liborigin/Origin750Parser.h
-+	HEADERS += ../3rdparty/liborigin/Origin800Parser.h
-+	HEADERS += ../3rdparty/liborigin/Origin810Parser.h
-+
-+	SOURCES += ../3rdparty/liborigin/OriginFile.cpp
-+	SOURCES += ../3rdparty/liborigin/OriginParser.cpp
-+	SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
-+	SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp
-+	SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp
-+	SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp
-+	SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
-+	SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp
-+	SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp
-+}
-
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-origin-build-failure.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-origin-build-failure.patch
deleted file mode 100644
index 22e4fbe15d65..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-origin-build-failure.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Without this upstream patch qtiplot fails to build with the following error:
-
-src/origin/importOPJ.cpp: In member function ‘QString ImportOPJ::parseOriginTags(const QString&)’:
-src/origin/importOPJ.cpp:2162: ошибка: unknown escape sequence '\p'
-
---- qtiplot/src/origin/importOPJ.cpp	2010-09-01 11:07:38 +0000
-+++ qtiplot/src/origin/importOPJ.cpp	2010-09-07 10:12:30 +0000
-@@ -473,6 +473,8 @@
- 				}
- 				table->setDayFormat(format, j);
- 				break;
-+			default:
-+				break;
- 			}
-             table->freeMemory();
- 		}
-@@ -720,7 +722,6 @@
- 				bkg.setAlpha(0);
- 			graph->setCanvasBackground(bkg);
- 
--			int auto_color = -1;
- 			int style = 0;
- 			bool matrixImage = false;
- 			for(unsigned int c = 0; c < layer.curves.size(); ++c){
-@@ -1461,7 +1462,7 @@
- 
- 			if (boxWhiskersPlot){
- 				QStringList curveNames;
--				for (unsigned int i = 0; i < graph->curveCount(); i++){
-+				for (int i = 0; i < graph->curveCount(); i++){
- 					BoxCurve *box = (BoxCurve *)graph->curve(i);
- 					if (!box || box->type() != Graph::Box)
- 						continue;
-@@ -1659,7 +1660,6 @@
- 	for(unsigned int c = 0; c < layer.curves.size(); ++c){
- 		Origin::GraphCurve& _curve = layer.curves[c];
- 		QString data(_curve.dataName.c_str());
--		int color = 0;
- 		double fFontScaleFactor = 2.0;
- 		switch(_curve.type){
- 			case Origin::GraphCurve::Line3D:
-@@ -1809,7 +1809,6 @@
- 		}
- 
- 		QStringList formulas;
--		double start, end;
- 
- 		plot->showColorLegend(false);
- 		plot->setFramed();
-@@ -1951,8 +1950,8 @@
- 
- 	QList <PieLabel *> pieTexts = p->labelsList();
- 	QFont font(mw->plotLegendFont);
--	unsigned int lsize = layer.pieTexts.size();
--	for(unsigned int i = 0; i < lsize && i < pieTexts.size(); ++i){
-+	int lsize = layer.pieTexts.size();
-+	for(int i = 0; i < lsize && i < pieTexts.size(); ++i){
- 		Origin::TextBox text = layer.pieTexts[lsize - i - 1];
- 		font.setPointSizeF(text.fontSize*fFontScaleFactor);
- 		QFontMetrics fm(font, graph);
-@@ -2159,12 +2158,12 @@
- 	line.replace("&lbracket;", "(");
- 	line.replace("&rbracket;", ")");
- 
--	QRegExp fontModifier("\p(\\d)+\\(.*\\)");//remove \p163(...) like tags
-+	QRegExp fontModifier("\\\\p(\\d)+\\(.*\\)");//remove \p163(...) like tags
- 	int index = line.indexOf(fontModifier);
- 	while (index >= 0){
- 		int pos1 = line.indexOf("(", index + 2) + 1;
- 		int length = fontModifier.matchedLength();
--		line = line.mid(pos1, length - pos1);
-+		line = line.mid(pos1, length - pos1 - 1);
- 		index = line.indexOf(fontModifier, index + length);
- 	}
- 
-
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-syslibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-syslibs.patch
deleted file mode 100644
index d677277d9184..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-syslibs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 657ad0b..3655d66 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -235,8 +235,8 @@ win32: contains(CONFIG, Excel) {
- ###############################################################
- 
- # At the very end: add global include- and lib path
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
--#unix:LIBS += $$SYS_LIBS
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH
-+unix:LIBS += $$SYS_LIBS
- 
- ###############################################################
- ############### Building QtiPlot as a browser plugin ##########
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch
deleted file mode 100644
index 0ba7cc96a605..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/qtiplot/src/core/ApplicationWindow.cpp b/qtiplot/src/core/ApplicationWindow.cpp
-index 56c52a7..b643e50 100755
---- a/qtiplot/src/core/ApplicationWindow.cpp
-+++ b/qtiplot/src/core/ApplicationWindow.cpp
-@@ -4326,7 +4326,7 @@ Table * ApplicationWindow::importExcelCrossplatform(const QString& fn, int sheet
- 
- 		int rows = sh->GetTotalRows();
- 		int cols = sh->GetTotalCols();
--		if (rows == 1 && !cols){
-+		if (!rows && !cols){
- 			if (sheet > 0 && sheet == currentSheet){
- 				QMessageBox::critical(this, tr("QtiPlot"), tr("Sheet %1 is empty, operation aborted!").arg(sheet));
- 				return NULL;
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch
deleted file mode 100644
index ebd7ca7342de..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index bf133ca..f3d0994 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -226,7 +226,7 @@ contains(SCRIPTING_LANGS, Python) {
- 	DEFINES += OPJ_IMPORT
- 	INCLUDEPATH += $$LIBORIGIN_INCLUDEPATH
- 	INCLUDEPATH += $$BOOST_INCLUDEPATH
--	#LIBS        += $$LIBORIGIN_LIBS
-+	LIBS        += $$LIBORIGIN_LIBS
- 	LIBS        += $$BOOST_LIBS
- 	include(src/origin/origin.pri)
- }
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch
deleted file mode 100644
index 4e49da837bf0..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/qtiplot/src/origin/importOPJ.cpp b/qtiplot/src/origin/importOPJ.cpp
-index 5abb0be..b9c1408 100755
---- a/qtiplot/src/origin/importOPJ.cpp
-+++ b/qtiplot/src/origin/importOPJ.cpp
-@@ -790,7 +790,6 @@ bool ImportOPJ::importGraphs(const OriginFile& opj)
- 					case Origin::GraphCurve::TextPlot:
- 						style = Origin::GraphCurve::TextPlot;
- 						break;
--					case Origin::GraphCurve::XYZContour:
- 					case Origin::GraphCurve::Contour:
- 						style = Origin::GraphCurve::Contour;
- 						break;
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch
deleted file mode 100644
index ff01934c302c..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/qtiplot/src/core/ApplicationWindow.cpp b/qtiplot/src/core/ApplicationWindow.cpp
-index 56c52a7..5422c0a 100755
---- a/qtiplot/src/core/ApplicationWindow.cpp
-+++ b/qtiplot/src/core/ApplicationWindow.cpp
-@@ -15912,6 +15912,7 @@ void ApplicationWindow::showBugTracker()
- 	QDesktopServices::openUrl(QUrl("https://developer.berlios.de/bugs/?group_id=6626"));
- }
- 
-+#ifdef QTIPLOT_SUPPORT
- void ApplicationWindow::showDonationDialog()
- {
- 	QString s = tr("<font size=+2, color = darkBlue><b>QtiPlot is open-source software and its development required hundreds of hours of work.<br><br>\
-@@ -15927,6 +15928,7 @@ void ApplicationWindow::showDonationDialog()
- 	if (msg->clickedButton() == btn)
- 		showDonationsPage();
- }
-+#endif
- 
- void ApplicationWindow::parseCommandLineArguments(const QStringList& args)
- {
-diff --git a/qtiplot/src/core/ApplicationWindow.h b/qtiplot/src/core/ApplicationWindow.h
-index 5c479f9..f973557 100755
---- a/qtiplot/src/core/ApplicationWindow.h
-+++ b/qtiplot/src/core/ApplicationWindow.h
-@@ -908,7 +908,9 @@ public slots:
- 	void receivedVersionFile(bool error);
- 	//!  called when the user presses the actionCheckUpdates
- 	void searchForUpdates();
-+#ifdef QTIPLOT_SUPPORT
- 	void showDonationDialog();
-+#endif
- 	//! Open support page in external browser
- 	void showSupportPage();
- 	//! Open donation page in external browser
-diff --git a/qtiplot/src/core/QtiPlotApplication.cpp b/qtiplot/src/core/QtiPlotApplication.cpp
-index 69a5b0f..8c3637a 100755
---- a/qtiplot/src/core/QtiPlotApplication.cpp
-+++ b/qtiplot/src/core/QtiPlotApplication.cpp
-@@ -57,7 +57,7 @@ QtiPlotApplication::QtiPlotApplication( int & argc, char ** argv) : QApplication
- 
- 		ApplicationWindow *mw = new ApplicationWindow(factorySettings);
- 		mw->restoreApplicationGeometry();
--	#ifndef QTIPLOT_PRO
-+	#ifdef QTIPLOT_SUPPORT
- 		mw->showDonationDialog();
- 	#endif
- 		if (mw->autoSearchUpdates){
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.5-tamuanova.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.5-tamuanova.patch
deleted file mode 100644
index 61647be3870e..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.5-tamuanova.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 95a5f0c..72e99ab 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) {
- !isEmpty(TAMUANOVA_LIBS) {
- 	DEFINES += HAVE_TAMUANOVA
- 	INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH
--	#LIBS        += $$TAMUANOVA_LIBS
--
--	HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c
-+	LIBS        += $$TAMUANOVA_LIBS
- }
- 
- ###############################################################
- 
- # At the very end: add global include- and lib path
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
--#unix:LIBS += $$SYS_LIBS
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH
-+unix:LIBS += $$SYS_LIBS
- 
- ###############################################################
- ############### Building QtiPlot as a browser plugin ##########
-@@ -230,14 +226,15 @@ contains(CONFIG, BrowserPlugin){
- }
- 
- QT          += sql
--LIBS        += src/plugins/libQtiPlotdBasePlugin.a
--LIBS        += src/plugins/libQtiPlotDatabasePlugin.a
--LIBS        += src/plugins/libQtiPlotCsvPlugin.a
--LIBS        += src/plugins/libQtiPlotTexPlugin.a
--LIBS        += src/plugins/libQtiPlotOdsPlugin.a
--LIBS        += src/plugins/libQtiPlotExcelPlugin.a
--LIBS        += src/plugins/libQtiPlotOriginPlugin.a
--LIBS        += src/plugins/libQtiPlotEmfExportPlugin.a
--LIBS        += ../3rdparty/quazip/lib/libquazip.a
--LIBS        += ../3rdparty/EmfEngine/libEmfEngine.a
--LIBS        += -lgdiplus
-+#LIBS        += src/plugins/libQtiPlotdBasePlugin.a
-+#LIBS        += src/plugins/libQtiPlotDatabasePlugin.a
-+#LIBS        += src/plugins/libQtiPlotCsvPlugin.a
-+#LIBS        += src/plugins/libQtiPlotTexPlugin.a
-+#LIBS        += src/plugins/libQtiPlotOdsPlugin.a
-+#LIBS        += src/plugins/libQtiPlotExcelPlugin.a
-+#LIBS        += src/plugins/libQtiPlotOriginPlugin.a
-+#LIBS        += src/plugins/libQtiPlotEmfExportPlugin.a
-+#LIBS        += -lquazip
-+#LIBS        += ../3rdparty/EmfEngine/libEmfEngine.a
-+#LIBS        += -lgdiplus
-+
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch
deleted file mode 100644
index 919ec6cc251e..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/src/plot2D/Graph.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
-index 626172a..d4eab1b 100755
---- a/qtiplot/src/plot2D/Graph.cpp
-+++ b/qtiplot/src/plot2D/Graph.cpp
-@@ -73,6 +73,7 @@
- #include <PatternBox.h>
- #include <SymbolBox.h>
- 
-+#include <QPaintEngine>
- #include <QApplication>
- #include <QBitmap>
- #include <QClipboard>
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-tamuanova.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-tamuanova.patch
deleted file mode 100644
index 1644266d1f24..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-tamuanova.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 95a5f0c..72e99ab 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) {
- !isEmpty(TAMUANOVA_LIBS) {
- 	DEFINES += HAVE_TAMUANOVA
- 	INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH
--	#LIBS        += $$TAMUANOVA_LIBS
--
--	HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c
-+	LIBS        += $$TAMUANOVA_LIBS
- }
- 
- ###############################################################
- 
- # At the very end: add global include- and lib path
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
--#unix:LIBS += $$SYS_LIBS
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH
-+unix:LIBS += $$SYS_LIBS
- 
- ###############################################################
- ############### Building QtiPlot as a browser plugin ##########
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch
new file mode 100644
index 000000000000..8f1bde25a038
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch
@@ -0,0 +1,115 @@
+Description: adoptation to alglib3.
+Author: Anton Gladky <gladk@debian.org>
+Last-Update: 2013-05-16
+
+--- a/qtiplot/src/analysis/dialogs/GriddingDialog.cpp
++++ b/qtiplot/src/analysis/dialogs/GriddingDialog.cpp
+@@ -41,7 +41,7 @@
+ #include <QComboBox>
+ #include <QLayout>
+ 
+-#include <idwint.h>
++#include <interpolation.h>
+ 
+ GriddingDialog::GriddingDialog(Table* t, const QString& colName, int nodes, QWidget* parent, Qt::WFlags fl )
+ 	: QDialog( parent, fl ),
+@@ -365,26 +365,27 @@
+ 	Matrix* m = app->newMatrix(rows, cols);
+ 	m->setCoordinates(xmin, xmax, ymin, ymax);
+ 
+-	idwinterpolant z;
++	alglib::idwinterpolant z;
++  
+ 	switch (boxMethod->currentIndex()){
+ 		case 0:
+-			idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
++			alglib::idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
+ 		break;
+ 		case 1:
+-			idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
++			alglib::idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
+ 		break;
+ 		case 2:
+-			idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
++			alglib::idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
+ 		break;
+ 	}
+ 
+-	ap::real_1d_array p;
++	alglib::real_1d_array p;
+ 	p.setlength(2);
+ 	for (int i = 0; i < rows; i++){
+ 		p(1) = ymin + i*ystep;
+ 		for (int j = 0; j < cols; j++){
+ 			p(0) = xmin + j*xstep;
+-			m->setCell(i, j, idwcalc(z, p));
++			m->setCell(i, j, alglib::idwcalc(z, p));
+ 		}
+ 	}
+ 
+@@ -435,20 +436,20 @@
+ 	double xstep = fabs(xmax - xmin)/(cols - 1);
+ 	double ystep = fabs(ymax - ymin)/(rows - 1);
+ 
+-	idwinterpolant z;
++	alglib::idwinterpolant z;
+ 	switch (boxMethod->currentIndex()){
+ 		case 0:
+-			idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
++			alglib::idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
+ 		break;
+ 		case 1:
+-			idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
++			alglib::idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
+ 		break;
+ 		case 2:
+-			idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
++			alglib::idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
+ 		break;
+ 	}
+ 
+-	ap::real_1d_array p;
++	alglib::real_1d_array p;
+ 	p.setlength(2);
+ 
+ 	double **data_matrix = Matrix::allocateMatrixData(cols, rows);
+@@ -456,7 +457,7 @@
+ 		p(1) = ymin + i*ystep;
+ 		for (int j = 0; j < cols; j++){
+ 			p(0) = xmin + j*xstep;
+-			data_matrix[j][i] = idwcalc(z, p);
++			data_matrix[j][i] = alglib::idwcalc(z, p);
+ 		}
+ 	}
+ 
+--- a/qtiplot/src/analysis/dialogs/GriddingDialog.h
++++ b/qtiplot/src/analysis/dialogs/GriddingDialog.h
+@@ -71,7 +71,7 @@
+ 
+ 	QString d_col_name;
+ 	int d_nodes;
+-	ap::real_2d_array xy;
++	alglib::real_2d_array xy;
+ 
+ 	QPushButton* buttonFit;
+ 	QPushButton* buttonCancel;
+--- a/qtiplot/src/matrix/MatrixModel.cpp
++++ b/qtiplot/src/matrix/MatrixModel.cpp
+@@ -45,7 +45,7 @@
+ #include <stdlib.h>
+ 
+ #ifdef HAVE_ALGLIB
+-	#include <spline2d.h>
++	#include <interpolation.h>
+ #endif
+ 
+ MatrixModel::MatrixModel(int rows, int cols, QObject *parent)
+@@ -1026,7 +1026,7 @@
+ #ifdef HAVE_ALGLIB
+ 	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ 
+-	ap::real_2d_array oldValues, newValues;
++	alglib::real_2d_array oldValues, newValues;
+ 	oldValues.setlength(d_rows, d_cols);
+ 	newValues.setlength(rows, cols);
+ 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch
new file mode 100644
index 000000000000..fe542341e99d
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch
@@ -0,0 +1,25 @@
+Description: Crashes if not connected to the internet.
+Author: Scott Howard <showard@debian.org>
+Bug-Debian: http://bugs.debian.org/626915
+
+Index: qtiplot/qtiplot/src/core/ApplicationWindow.cpp
+===================================================================
+--- qtiplot.orig/qtiplot/src/core/ApplicationWindow.cpp	2012-11-07 11:14:15.021706679 -0500
++++ qtiplot/qtiplot/src/core/ApplicationWindow.cpp	2012-11-07 11:14:22.853706641 -0500
+@@ -16228,11 +16228,12 @@
+ 	if (hostInfo.error() != QHostInfo::NoError){
+ 		QApplication::restoreOverrideCursor();
+ 		QMessageBox::critical(this, tr("QtiPlot - Error"), qtiplotWeb + ": " + hostInfo.errorString());
+-		exit(0);
++		QApplication::restoreOverrideCursor();
++	}
++	else {
++		QApplication::restoreOverrideCursor();
++		showDonationsPage();
+ 	}
+-
+-	QApplication::restoreOverrideCursor();
+-	showDonationsPage();
+ }
+ 
+ void ApplicationWindow::parseCommandLineArguments(const QStringList& args)
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch
new file mode 100644
index 000000000000..5afe43eb3daf
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch
@@ -0,0 +1,18 @@
+Description: if you don't initialize the "i" variable, or initialize it to 0.0
+ qtiplot won't let you set the column values using muparser.
+Author: Scott Howard <showard@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707736
+
+Index: qtiplot/qtiplot/src/table/Table.cpp
+===================================================================
+--- qtiplot.orig/qtiplot/src/table/Table.cpp	2013-06-08 02:06:35.550201324 -0400
++++ qtiplot/qtiplot/src/table/Table.cpp	2013-06-08 02:08:30.026204044 -0400
+@@ -564,7 +564,7 @@
+ 	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ 
+     muParserScript *mup = new muParserScript(scriptEnv, cmd, this,  QString("<%1>").arg(colName(col)));
+-    double *r = mup->defineVariable("i");
++    double *r = mup->defineVariable("i",startRow + 1.0);
+     mup->defineVariable("j", (double)col);
+     mup->defineVariable("sr", startRow + 1.0);
+     mup->defineVariable("er", endRow + 1.0);
diff --git a/sci-visualization/qtiplot/metadata.xml b/sci-visualization/qtiplot/metadata.xml
index dada56ea87c9..51a10f76451c 100644
--- a/sci-visualization/qtiplot/metadata.xml
+++ b/sci-visualization/qtiplot/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription>
+  <herd>sci</herd>
+  <longdescription>
 	Data analysis and scientific plotting package. This is a clone of the
 	popular Origin software available on another well known platform implemented
 	in Qt with powerful 2D and 3D data plotting, ASCII import and powerful
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
new file mode 100644
index 000000000000..7ccd5cdeba11
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild,v 1.1 2013/07/04 12:52:57 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils qt4-r2 fdo-mime python-single-r1 toolchain-funcs
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html
+	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
+SRC_URI="
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bindist doc mono latex python"
+
+LANGS="cn cz de es fr ja ro ru sv"
+for l in ${LANGS}; do
+	lu=${l/cz/cs}
+	lu=${lu/cn/zh_CN}
+	IUSE="${IUSE} linguas_${lu}"
+done
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# qwtplot3d much modified from original upstream
+# >=x11-libs/qwt-5.3 they are using trunk checkouts
+CDEPEND="
+	media-libs/libemf
+	dev-qt/qthelp:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qt3support:4
+	|| ( >=dev-qt/qthelp-4.7.0:4[compat] <dev-qt/qthelp-4.7.0:4 )
+	dev-qt/qtsvg:4
+	>=x11-libs/gl2ps-1.3.5[png]
+	>=dev-cpp/muParser-1.32
+	>=dev-libs/boost-1.35.0
+	dev-libs/quazip
+	media-libs/libpng
+	sci-libs/alglib
+	sci-libs/gsl
+	sci-libs/tamu_anova
+	latex? ( dev-tex/qtexengine )
+	mono? ( dev-dotnet/libgdiplus )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/sip-4.9[${PYTHON_USEDEP}] )
+	doc? (
+		>=app-text/docbook-sgml-utils-0.6.14-r1
+		>=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
+
+RDEPEND="${CDEPEND}
+	python? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${DISTDIR}"/${P}-origin.patch.bz2
+	"${FILESDIR}"/${P}-origin-2.patch
+	"${FILESDIR}"/${P}-qt48.patch
+	"${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch
+	"${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch
+	"${FILESDIR}"/${PN}-0.9.8.6-gold.patch
+	"${FILESDIR}"/${PN}-0.9.8.7-kde.patch
+	"${FILESDIR}"/${P}-set_col_values.patch
+	"${FILESDIR}"/${P}-adopt_to_alglib3.patch
+	"${FILESDIR}"/${P}-crasher_without_internet.patch
+	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local mylibs
+
+	qt4-r2_src_prepare
+
+	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} || die
+	sed \
+		-e "s:dll:static:g" \
+		-e "/INSTALLS/d" \
+		-i 3rdparty/qwtplot3d/*.pro
+
+	mylibs="${mylibs} -lquazip"
+	use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)"
+
+	# Check build.conf for changes on bump.
+	cat > build.conf <<-EOF
+	# Automatically generated by Gentoo ebuild
+	isEmpty( QTI_ROOT ) {
+	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+	}
+
+	MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser)
+	GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl)
+	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
+	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
+	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+	EMF_INCLUDEPATH = "${EPREFIX}/usr/include/libEMF
+	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
+
+	PYTHON = ${PYTHON}
+	LUPDATE = lupdate
+	LRELEASE = lrelease
+
+	SCRIPTING_LANGS += muParser
+
+	CONFIG          += release
+	CONFIG          += CustomInstall
+	DEFINES         += SCRIPTING_CONSOLE
+
+	LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng)
+	TAMUANOVA_LIBS = -ltamuanova
+	TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova"
+	ALGLIB_LIBS = -lalglib
+
+	EOF
+
+	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
+	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
+	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
+
+	sed \
+		-e "s:doc/${PN}/manual:doc/${PN}/html:" \
+		-e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
+		-e '/INSTALLS.*documentation/d' \
+		-e '/INSTALLS.*manual/d' \
+		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
+		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
+		-i qtiplot/qtiplot.pro || die
+
+	sed \
+		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
+		-i fitPlugins/*/*.pro || die
+
+	sed -e '/manual/d' -i qtiplot.pro || die
+
+	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die
+
+	# Drop langs only if LINGUAS is not empty
+	if [[ -n ${LINGUAS} ]]; then
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} || \
+				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
+						-i qtiplot/qtiplot.pro || die
+		done
+	fi
+
+	sed \
+		-e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \
+		-i qtiplot/src/core/ApplicationWindow.cpp || die
+
+	chmod -x qtiplot/qti_wordlist.txt
+
+	# sed out debian paths
+	sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
+		-i manual/qtiplot.dsl || die
+	sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
+		-i manual/qtiplot_html.xsl || die
+
+	sed \
+		-e '1i#define OF(x) x' \
+		-i 3rdparty/zlib/minigzip.c || die
+}
+
+src_configure() {
+	use amd64 && export QMAKESPEC="linux-g++-64"
+	eqmake4
+}
+
+src_compile() {
+	emake
+	lrelease qtiplot/qtiplot.pro || die
+	if use doc; then
+		cd manual
+		emake web
+	fi
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	insinto /usr/share/qtiplot
+	doins qtiplot/qti_wordlist.txt
+
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
+
+	use doc && dohtml -r manual/html/*
+
+	use python && python_optimize
+
+	if [[ -n ${LINGUAS} ]]; then
+		insinto /usr/share/${PN}/translations
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} && \
+				doins qtiplot/translations/qtiplot_${l}.qm
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		elog "You might want to emerge"
+		elog "\t dev-python/pygsl"
+		elog "\t dev-python/rpy"
+		elog "\t sci-libs/scipy and"
+		elog "\t dev-python/sympy"
+		elog "to gain full python support."
+	fi
+
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}