Version bump, #309925 thank Samuli Suominen for report. Drop old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

14 files changed, 27 insertions, 1190 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 4e0b03a65d6f..bc33561bc5ee 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.54 2010/02/14 20:49:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.55 2010/03/17 15:18:42 pva Exp $
+
+*qtiplot-0.9.7.13 (17 Mar 2010)
+
+  17 Mar 2010; Peter Volkov <pva@gentoo.org> -qtiplot-0.9.7.10.ebuild,
+  -files/qtiplot-0.9.7.10-build.conf.patch,
+  -files/qtiplot-0.9.7.10-docbuild.patch,
+  -files/qtiplot-0.9.7.10-gcc44.patch, -files/qtiplot-0.9.7.10-gl2ps.patch,
+  -files/qtiplot-0.9.7.10-qtiplot.pro.patch,
+  -files/qtiplot-0.9.7.10-sip.patch, -files/qtiplot-0.9.7.10-syslibs.patch,
+  -qtiplot-0.9.7.11-r4.ebuild,
+  -files/qtiplot-0.9.7.11-system-QTeXEngine.patch,
+  -files/qtiplot-0.9.7.11-system-gl2ps.patch,
+  -files/qtiplot-0.9.7.11-system-liborigin.patch,
+  -files/qtiplot-0.9.7.11-transparency.patch, +qtiplot-0.9.7.13.ebuild:
+  Version bump, #309925 thank Samuli Suominen for report. Drop old.
 
 *qtiplot-0.9.7.12 (14 Feb 2010)
 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-build.conf.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-build.conf.patch
deleted file mode 100644
index 9d0591c90fa2..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-build.conf.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff --git a/build.conf.example b/build.conf.example
-index 9e0c532..4f8906f 100755
---- a/build.conf.example
-+++ b/build.conf.example
-@@ -7,30 +7,29 @@ isEmpty( QTI_ROOT ) {
- ##########################################################
- 
- # Global include path which is always added at the end of the INCLUDEPATH
--SYS_INCLUDEPATH = /opt/local/include
-+SYS_INCLUDEPATH = /usr/include
- # Global lib path and libs which is ls always added at the end of LIBS
--SYS_LIBS = -L/opt/local/lib
-+SYS_LIBS = -L/usr/GENTOOLIB
- 
- ##########################################################
- ## muParser (http://muparser.sourceforge.net/)
- ##########################################################
- 
- # include path. leave it blank to use SYS_INCLUDE
--MUPARSER_INCLUDEPATH = $$QTI_ROOT/3rdparty/muparser/include
-+MUPARSER_INCLUDEPATH = $$system(pkg-config --cflags muparser)
- # link statically against a copy in 3rdparty/
--MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a
-+#MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a
- # or dynamically against a system-wide installation
--#MUPARSER_LIBS = -lmuparser
-+MUPARSER_LIBS = $$system(pkg-config --libs muparser)
- 
- ##########################################################
- ## GNU Sientific Library (http://www.gnu.org/software/gsl/) 
- ##########################################################
- 
- # include path. leave it blank to use SYS_INCLUDE
--GSL_INCLUDEPATH = $$QTI_ROOT/3rdparty/gsl/include
-+GSL_INCLUDEPATH = $$system(pkg-config --cflags gsl)
- # link statically against a copy in 3rdparty/
--GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \
--           $$QTI_ROOT/3rdparty/gsl/lib/libgslcblas.a
-+GSL_LIBS = $$system(pkg-config --libs gsl)
- # or dynamically against a system-wide installation
- #GSL_LIBS = -lgsl -lgslcblas
- 
-@@ -39,14 +38,14 @@ GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \
- ##########################################################
- 
- # include path. leave it blank to use SYS_INCLUDE
--BOOST_INCLUDEPATH = $$QTI_ROOT/3rdparty/boost
-+BOOST_INCLUDEPATH = /usr/include/boost
- # link statically against a copy in 3rdparty/
--unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \
--				   $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
--win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
--				   $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
-+#unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \
-+#				   $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
-+#win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
-+#				   $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
- # or dynamically against a system-wide installation
--#BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
-+BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
- 
- ##########################################################
- ## QWT - use local copy till upstream catches up
-@@ -55,19 +54,21 @@ win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib
- 
- # include path. 
- QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
-+#QWT_INCLUDEPATH = /usr/include/qwt5
- # link locally against a copy in 3rdparty/
- QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-+#QWT_LIBS = -lqwt
- 
- ##########################################################
- ## libpng - optional. you don't have to set these variables
- ##########################################################
- 
- # include path. leave it blank to use SYS_INCLUDE
--LIBPNG_INCLUDEPATH = $$QTI_ROOT/3rdparty/libpng/
-+LIBPNG_INCLUDEPATH = /usr/libpng/
- # link statically against a copy in 3rdparty/
--LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a
-+#LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a
- # or dynamically against a system-wide installation
--#LIBPNG_LIBS = -lpng
-+LIBPNG_LIBS = $$system(pkg-config --libs libpng)
- 
- ##########################################################
- ## EmfEngine - optional. you don't have to set these variables
-@@ -75,9 +76,17 @@ LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a
- ##########################################################
- 
- # include path. 
--EMF_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/EmfEngine/src
-+EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF
- # link locally against a copy in 3rdparty/
--EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
-+EMF_ENGINE_LIBS = -lEMF
-+
-+############################################################
-+##  liborigin
-+############################################################
-+
-+LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
-+
-+LIB_ORIGIN_LIBS = -lorigin2
- 
- ############################################################
- ##  Target specific configuration: configure Qtiplot itself
-@@ -101,7 +110,7 @@ contains( TARGET, qtiplot ) {
-   #DEFINES         += QTIPLOT_SUPPORT
- 
-   # Uncomment the following line if you want to perform a custom installation using the *.path variables defined in ./qtiplot.pro.
--  #CONFIG          += CustomInstall
-+  CONFIG          += CustomInstall
- 
-   CONFIG          += release
-   #CONFIG          += debug
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-docbuild.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-docbuild.patch
deleted file mode 100644
index 58779fd3fd20..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-docbuild.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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.10-gcc44.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gcc44.patch
deleted file mode 100644
index 92316599ae21..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gcc44.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_function.cpp b/3rdparty/qwtplot3d/src/qwt3d_function.cpp
-index 3271aea..559127b 100755
---- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp
-+++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp
-@@ -1,3 +1,4 @@
-+#include <cstdio>
- #include "qwt3d_surfaceplot.h"
- #include "qwt3d_function.h"
- 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gl2ps.patch
deleted file mode 100644
index 51810b673cf5..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gl2ps.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-index dd1b7e4..8ce3c8c 100755
---- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-+++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-@@ -6,12 +6,12 @@
- #include <locale.h>
- 
- #include "qwt3d_openglhelper.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include <gl2ps.h>
- #include "qwt3d_io_gl2ps.h"
- #include "qwt3d_plot.h"
--

--#include <QFileInfo>

--#include <QMessageBox>

-+
-+#include <QFileInfo>
-+#include <QMessageBox>
- 
- using namespace Qwt3D;
- 
-@@ -32,7 +32,7 @@ VectorWriter::VectorWriter()
-     sortmode_(SIMPLESORT),
-     landscape_(VectorWriter::AUTO),
-     textmode_(VectorWriter::PIXEL),
--    texfname_(""),

-+    texfname_(""),
-     export_size_(QSize())
-   {}
- 
-@@ -132,10 +132,10 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname)
- 
-   char* tmploc = setlocale(LC_ALL, "C");
- 
--  plot->makeCurrent();

--

--	QSize size = plot->size();

--	if (export_size_.isValid())

-+  plot->makeCurrent();
-+
-+	QSize size = plot->size();
-+	if (export_size_.isValid())
- 		plot->resize(export_size_);
- 
- 	GLint bufsize = 0, state = GL2PS_OVERFLOW;
-@@ -220,7 +220,7 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname)
-     return false;
-   }
- 
--   plot->setExportingVector(true, gl2ps_format_);

-+   plot->setExportingVector(true, gl2ps_format_);
- 
-     while( state == GL2PS_OVERFLOW ){
- 		bufsize += 2*1024*1024;
-@@ -236,9 +236,9 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname)
- 
-   // extra TeX file
-   if (textmode_ == TEX)
--  {

--	QFileInfo fi(fname);

--	QString fn = fname;

-+  {
-+	QFileInfo fi(fname);
-+	QString fn = fname;
- 	fn = fn.remove(fi.suffix()) + "tex";
- 
-     fp = fopen(QWT3DLOCAL8BIT(fn), "wb");
-@@ -268,9 +268,9 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname)
- 
-   Label::useDeviceFonts(false);
- 
--  setlocale(LC_ALL, tmploc);

--  if (export_size_.isValid())

--		plot->resize(size);// restore original plot size

-+  setlocale(LC_ALL, tmploc);
-+  if (export_size_.isValid())
-+		plot->resize(size);// restore original plot size
- 
-   return true;
- }
-@@ -324,20 +324,20 @@ GLint Qwt3D::drawDevicePixels(GLsizei width, GLsizei height,
- 
-   if(format != GL_RGBA || type != GL_UNSIGNED_BYTE)
- 		return GL2PS_ERROR;
--

--	GLfloat* convertedpixel = (GLfloat*)malloc(4 * width * height * sizeof(GLfloat));

--	if (!convertedpixel)

--		return GL2PS_ERROR;

--

--	GLubyte* px = (GLubyte*)pixels;

--	for (int i = 0; i != 4*width*height; i += 4){

--		convertedpixel[i] = px[i] / 255.0;

--		convertedpixel[i+1] = px[i+1] / 255.0;

--		convertedpixel[i+2] = px[i+2] / 255.0;

--		convertedpixel[i+3] = px[i+3] / 255.0;

--	}

--	GLint ret = gl2psDrawPixels(width, height, 0, 0, GL_RGBA, GL_FLOAT, convertedpixel);

--	free(convertedpixel);

-+
-+	GLfloat* convertedpixel = (GLfloat*)malloc(4 * width * height * sizeof(GLfloat));
-+	if (!convertedpixel)
-+		return GL2PS_ERROR;
-+
-+	GLubyte* px = (GLubyte*)pixels;
-+	for (int i = 0; i != 4*width*height; i += 4){
-+		convertedpixel[i] = px[i] / 255.0;
-+		convertedpixel[i+1] = px[i+1] / 255.0;
-+		convertedpixel[i+2] = px[i+2] / 255.0;
-+		convertedpixel[i+3] = px[i+3] / 255.0;
-+	}
-+	GLint ret = gl2psDrawPixels(width, height, 0, 0, GL_RGBA, GL_FLOAT, convertedpixel);
-+	free(convertedpixel);
- 	return ret;
- }
- 
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
-index c495a0f..2107cf8 100755
---- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp
-+++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
-@@ -1,7 +1,7 @@
- #include <qbitmap.h>
- #include "qwt3d_label.h"
--#include "qwt3d_plot.h"

--#include "../3rdparty/gl2ps/gl2ps.h"

-+#include "qwt3d_plot.h"
-+#include <gl2ps.h>
- 
- using namespace Qwt3D;
- 
-@@ -32,9 +32,9 @@ void Label::init()
- 	setColor(0,0,0);
- 	font_ = QFont();
- 	anchor_ = BottomLeft;
--	gap_ = 0;

--	width_ = 0.0;

--	height_ = 0.0;

-+	gap_ = 0;
-+	width_ = 0.0;
-+	height_ = 0.0;
- }
- 
- void Label::useDeviceFonts(bool val)
-@@ -88,66 +88,66 @@ void Label::setRelPosition(Tuple rpos, ANCHOR a)
- 	getMatrices(modelMatrix, projMatrix, viewport);
- 	beg_ = relativePosition(Triple(rpos.x, rpos.y, ot));
- 	setPosition(beg_, a);
--}

--

--QImage Label::createImage(double angle)

--{

--	QRect r = QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_));

--	int textWidth = r.width();

--	int textHeight = r.height();

--

--	double aux_a = angle;

--	if (aux_a > 270)

--		aux_a -= 270;

--    if (aux_a >= 180)

--        aux_a -= 180;

--    if (aux_a > 90)

--        aux_a -= 90;

--

--	double rad = aux_a*M_PI/180.0;

--

--	int w = 0, h = 0;

--	if ((angle >= 0 && angle <= 90) || (angle >= 180 && angle <= 270)){

--		w = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));

--    	h = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));

--	} else {

--		w = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));

--    	h = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));

--	}

--

--	width_ = w;

--	height_ = h;

--

--	QPixmap pm_ = QPixmap(w, h);

--

--	if (plot() && plot()->isExportingVector() && plot()->vectorExportFormat() != GL2PS_PDF){

--		Qwt3D::RGBA rgba = plot()->backgroundRGBAColor();

--		pm_.fill(GL2Qt(rgba.r, rgba.g, rgba.b));

--	} else

--		pm_.fill(Qt::transparent);

--

--	QPainter p(&pm_);

--

--	if (angle >= 270)

--		p.translate(textHeight*cos(rad), 0.0);

--	else if (angle >= 180)

--		p.translate(w, textHeight*cos(rad));

--	else if (angle > 90)

--		p.translate(textWidth*sin(rad), h);

--	else

--		p.translate(0.0, textWidth*sin(rad));

--

--    p.rotate(-angle);

--    p.translate(0.0, textHeight - QFontMetrics(font_).descent());

--

--	p.setFont( font_ );

--	p.setPen(Qt::SolidLine);

--	p.setPen(GL2Qt(color.r, color.g, color.b));

--	p.drawText(0, 0, text_);

--	p.end();

--

--	return QGLWidget::convertToGLFormat(pm_.toImage());

--}

-+}
-+
-+QImage Label::createImage(double angle)
-+{
-+	QRect r = QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_));
-+	int textWidth = r.width();
-+	int textHeight = r.height();
-+
-+	double aux_a = angle;
-+	if (aux_a > 270)
-+		aux_a -= 270;
-+    if (aux_a >= 180)
-+        aux_a -= 180;
-+    if (aux_a > 90)
-+        aux_a -= 90;
-+
-+	double rad = aux_a*M_PI/180.0;
-+
-+	int w = 0, h = 0;
-+	if ((angle >= 0 && angle <= 90) || (angle >= 180 && angle <= 270)){
-+		w = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));
-+    	h = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));
-+	} else {
-+		w = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));
-+    	h = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));
-+	}
-+
-+	width_ = w;
-+	height_ = h;
-+
-+	QPixmap pm_ = QPixmap(w, h);
-+
-+	if (plot() && plot()->isExportingVector() && plot()->vectorExportFormat() != GL2PS_PDF){
-+		Qwt3D::RGBA rgba = plot()->backgroundRGBAColor();
-+		pm_.fill(GL2Qt(rgba.r, rgba.g, rgba.b));
-+	} else
-+		pm_.fill(Qt::transparent);
-+
-+	QPainter p(&pm_);
-+
-+	if (angle >= 270)
-+		p.translate(textHeight*cos(rad), 0.0);
-+	else if (angle >= 180)
-+		p.translate(w, textHeight*cos(rad));
-+	else if (angle > 90)
-+		p.translate(textWidth*sin(rad), h);
-+	else
-+		p.translate(0.0, textWidth*sin(rad));
-+
-+    p.rotate(-angle);
-+    p.translate(0.0, textHeight - QFontMetrics(font_).descent());
-+
-+	p.setFont( font_ );
-+	p.setPen(Qt::SolidLine);
-+	p.setPen(GL2Qt(color.r, color.g, color.b));
-+	p.drawText(0, 0, text_);
-+	p.end();
-+
-+	return QGLWidget::convertToGLFormat(pm_.toImage());
-+}
- 
- /**
- Adds an additional shift to the anchor point. This happens in a more or less intelligent manner
-@@ -205,100 +205,100 @@ void Label::convert2screen()
- 	}
- 	start = World2ViewPort(beg_);
- 	end_ = ViewPort2World(start + Triple(width(), height(), 0));
--}

--

--const char * Label::fontname()

--{

--	char *name = "Helvetica";

--	if (font_.family() == "Times New Roman"){

--		name = "Times";

--		if (font_.bold() && font_.italic ())

--			name = "Times-BoldItalic";

--		else if (font_.italic())

--			name = "Times-Italic";

--		else if (font_.bold())

--			name = "Times-Bold";

--	} else if (font_.family() == "Courier" || font_.family() == "Courier New"){

--		name = "Courier";

--		if (font_.bold() && font_.italic ())

--			name = "Courier-BoldOblique";

--		else if (font_.italic())

--			name = "Courier-Oblique";

--		else if (font_.bold())

--			name = "Courier-Bold";

--	} else {

--		if (font_.bold() && font_.italic ())

--			name = "Helvetica-BoldOblique";

--		else if (font_.italic())

--			name = "Helvetica-Oblique";

--		else if (font_.bold())

--			name = "Helvetica-Bold";

--	}

--

--	return (const char*) name;

--}

--

--void Label::draw(double angle)

--{

--	if (!plot() || !plot()->isVisible())

--		return;

--

--	if (text_.isEmpty())

--		return;

--

--	GLboolean b;

--	GLint func;

--	GLdouble v;

--	glGetBooleanv(GL_ALPHA_TEST, &b);

--	glGetIntegerv(GL_ALPHA_TEST_FUNC, &func);

--	glGetDoublev(GL_ALPHA_TEST_REF, &v);

--

--	glEnable (GL_ALPHA_TEST);

--	glAlphaFunc (GL_NOTEQUAL, 0.0);

--

--	convert2screen();

--	glRasterPos3d(beg_.x, beg_.y, beg_.z);

--

--	if (plot()->isExportingVector()){

--		if (devicefonts_)

--			drawDeviceText(QWT3DLOCAL8BIT(text_), fontname(), font_.pointSize(), pos_, color, anchor_, gap_, angle);

--		else {

--			QImage tex_ = createImage(angle);

--			drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());

--		}

--	} else {

--		if (!angle){

--			Triple start = World2ViewPort(beg_);

--			start = ViewPort2World(start + Triple(0, QFontMetrics(font_).descent(), 0));

--			plot()->qglColor(GL2Qt(color.r, color.g, color.b));

--			plot()->renderText(start.x, start.y, start.z, text_, font_);

--		} else {

--			QImage tex_ = createImage(angle);

--			drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());

--		}

--	}

--

--	glAlphaFunc(func,v);

--	Enable(GL_ALPHA_TEST, b);

--}

-+}
-+
-+const char * Label::fontname()
-+{
-+	char *name = "Helvetica";
-+	if (font_.family() == "Times New Roman"){
-+		name = "Times";
-+		if (font_.bold() && font_.italic ())
-+			name = "Times-BoldItalic";
-+		else if (font_.italic())
-+			name = "Times-Italic";
-+		else if (font_.bold())
-+			name = "Times-Bold";
-+	} else if (font_.family() == "Courier" || font_.family() == "Courier New"){
-+		name = "Courier";
-+		if (font_.bold() && font_.italic ())
-+			name = "Courier-BoldOblique";
-+		else if (font_.italic())
-+			name = "Courier-Oblique";
-+		else if (font_.bold())
-+			name = "Courier-Bold";
-+	} else {
-+		if (font_.bold() && font_.italic ())
-+			name = "Helvetica-BoldOblique";
-+		else if (font_.italic())
-+			name = "Helvetica-Oblique";
-+		else if (font_.bold())
-+			name = "Helvetica-Bold";
-+	}
-+
-+	return (const char*) name;
-+}
-+
-+void Label::draw(double angle)
-+{
-+	if (!plot() || !plot()->isVisible())
-+		return;
-+
-+	if (text_.isEmpty())
-+		return;
-+
-+	GLboolean b;
-+	GLint func;
-+	GLdouble v;
-+	glGetBooleanv(GL_ALPHA_TEST, &b);
-+	glGetIntegerv(GL_ALPHA_TEST_FUNC, &func);
-+	glGetDoublev(GL_ALPHA_TEST_REF, &v);
-+
-+	glEnable (GL_ALPHA_TEST);
-+	glAlphaFunc (GL_NOTEQUAL, 0.0);
-+
-+	convert2screen();
-+	glRasterPos3d(beg_.x, beg_.y, beg_.z);
-+
-+	if (plot()->isExportingVector()){
-+		if (devicefonts_)
-+			drawDeviceText(QWT3DLOCAL8BIT(text_), fontname(), font_.pointSize(), pos_, color, anchor_, gap_, angle);
-+		else {
-+			QImage tex_ = createImage(angle);
-+			drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());
-+		}
-+	} else {
-+		if (!angle){
-+			Triple start = World2ViewPort(beg_);
-+			start = ViewPort2World(start + Triple(0, QFontMetrics(font_).descent(), 0));
-+			plot()->qglColor(GL2Qt(color.r, color.g, color.b));
-+			plot()->renderText(start.x, start.y, start.z, text_, font_);
-+		} else {
-+			QImage tex_ = createImage(angle);
-+			drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());
-+		}
-+	}
-+
-+	glAlphaFunc(func,v);
-+	Enable(GL_ALPHA_TEST, b);
-+}
- 
- double Label::width() const
--{

--	if (width_ > 0.0 && height_ > 0.0)

--		return width_;

--

-+{
-+	if (width_ > 0.0 && height_ > 0.0)
-+		return width_;
-+
- 	return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).width();
- }
- 
- double Label::height() const
--{

-+{
- 	if (width_ > 0.0 && height_ > 0.0)
--		return height_;

--

-+		return height_;
-+
-+	return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).height();
-+}
-+
-+double Label::textHeight() const
-+{
- 	return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).height();
- }
--

--double Label::textHeight() const

--{

--	return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).height();

--}

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-qtiplot.pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-qtiplot.pro.patch
deleted file mode 100644
index a61b7296d464..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-qtiplot.pro.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 1021776..37ed5de 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -10,21 +10,24 @@ QTI_ROOT = ..
- 

- # local copy included

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

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

- INCLUDEPATH       += ../3rdparty/zlib

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

-+INCLUDEPATH 	   += /usr/include

- 

- # configurable

- INCLUDEPATH       += $$MUPARSER_INCLUDEPATH

- INCLUDEPATH       += $$QWT_INCLUDEPATH

- INCLUDEPATH       += $$GSL_INCLUDEPATH

- INCLUDEPATH       += $$BOOST_INCLUDEPATH

-+INCLUDEPATH       += $$LIB_ORIGIN_INCLUDEPATH

- 

- # configurable libs

- LIBS         += $$MUPARSER_LIBS

- LIBS         += $$QWT_LIBS

- LIBS         += $$GSL_LIBS

- LIBS         += $$BOOST_LIBS

-+LIBS         += $$LIB_ORIGIN_LIBS

-+LIBS         += -lQTeXEngine

-+LIBS         += -lgl2ps

- 

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

- ###################### BASIC PROJECT PROPERTIES #############################

-@@ -140,10 +143,8 @@ include(src/scripting/scripting.pri)
- ##################### 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 += /usr/include

-+HEADERS 	+= /usr/include/QTeXEngine.h

- 

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

- ##################### Scripting: PYTHON + SIP + PyQT ##########

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch
deleted file mode 100644
index fd8a124ce1b0..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/qtiplot/src/scripting/scripting.pri b/qtiplot/src/scripting/scripting.pri
-index b8667e3..e4027da 100755
---- a/qtiplot/src/scripting/scripting.pri
-+++ b/qtiplot/src/scripting/scripting.pri
-@@ -80,7 +80,6 @@ contains(SCRIPTING_LANGS, Python) {
-              $${SIP_DIR}/sipqtiPythonScript.cpp\

-              $${SIP_DIR}/sipqtiPythonScripting.cpp\

-              $${SIP_DIR}/sipqtiFolder.cpp\

--             $${SIP_DIR}/sipqtiQList.cpp\

-              $${SIP_DIR}/sipqtiFit.cpp \

-              $${SIP_DIR}/sipqtiExponentialFit.cpp \

-              $${SIP_DIR}/sipqtiTwoExpFit.cpp \

-@@ -105,4 +104,16 @@ contains(SCRIPTING_LANGS, Python) {
- 			 $${SIP_DIR}/sipqtiCorrelation.cpp \

- 			 $${SIP_DIR}/sipqtiConvolution.cpp \

- 			 $${SIP_DIR}/sipqtiDeconvolution.cpp \

-+

-+SIPVERSION = $$system( sip -V | cut -b 1-3 )

-+

-+equals( SIPVERSION, 4.8 ) {

-+  # SIP < 4.9

-+  SOURCES += $${SIP_DIR}/sipqtiQList.cpp

-+} else {

-+  SOURCES += \

-+         $${SIP_DIR}/sipqtiQList0101Folder.cpp\

-+         $${SIP_DIR}/sipqtiQList0101Graph.cpp\

-+         $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp\

-+}

- }

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-syslibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-syslibs.patch
deleted file mode 100644
index 7c65f304e30a..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-syslibs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri
-index 1b41edd..0f04abc 100755
---- a/3rdparty/qwtplot3d/qwtplot3d.pri
-+++ b/3rdparty/qwtplot3d/qwtplot3d.pri
-@@ -57,11 +57,11 @@ HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_color.h \
-            ../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

-+

-+LIBS+=-lgl2ps

- 

- # zlib support for gl2ps

- zlib {

-diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro
-index 7153400..f3e2fa2 100755
---- a/3rdparty/qwtplot3d/qwtplot3d.pro
-+++ b/3rdparty/qwtplot3d/qwtplot3d.pro
-@@ -82,11 +82,11 @@ HEADERS += include/qwt3d_surfaceplot.h \
-            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
-+
-+LIBS+=-lgl2ps
- 
- # zlib support for gl2ps
- zlib {
-diff --git a/qtiplot/src/origin/origin.pri b/qtiplot/src/origin/origin.pri
-index 0747c29..2d9c822 100755
---- a/qtiplot/src/origin/origin.pri
-+++ b/qtiplot/src/origin/origin.pri
-@@ -4,14 +4,5 @@
- 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/files/qtiplot-0.9.7.11-system-QTeXEngine.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-QTeXEngine.patch
deleted file mode 100644
index 0e52186db425..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-QTeXEngine.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-=== modified file 'qtiplot/qtiplot.pro'
---- qtiplot/qtiplot.pro	2010-01-06 10:51:53 +0000
-+++ qtiplot/qtiplot.pro	2010-01-06 18:37:25 +0000
-@@ -12,7 +12,6 @@
- INCLUDEPATH       += ../3rdparty/qwtplot3d/include
- INCLUDEPATH       += ../3rdparty/liborigin
- INCLUDEPATH       += ../3rdparty/zlib
--INCLUDEPATH 	  += ../3rdparty/QTeXEngine/src
- 
- # configurable
- INCLUDEPATH       += $$MUPARSER_INCLUDEPATH
-@@ -144,14 +143,6 @@
- include(src/table/table.pri)
- include(src/scripting/scripting.pri)
- 
--###############################################################
--##################### 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
- 
- ###############################################################
- ##################### Scripting: PYTHON + SIP + PyQT ##########
-
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-gl2ps.patch
deleted file mode 100644
index a4f1a95e1551..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-gl2ps.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 3rdparty/qwtplot3d/qwtplot3d.pri	2010-01-06 10:51:53 +0000
-+++ 3rdparty/qwtplot3d/qwtplot3d.pri	2010-01-06 18:18:19 +0000
-@@ -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

--

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

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

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

-+

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

-+

-+LIBS+=-lgl2ps

- 

- # zlib support for gl2ps

- zlib {

-
---- 3rdparty/qwtplot3d/qwtplot3d.pro	2010-01-06 10:51:53 +0000
-+++ 3rdparty/qwtplot3d/qwtplot3d.pro	2010-01-06 18:18:19 +0000
-@@ -82,11 +82,11 @@
-            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
-+
-+LIBS+=-lgl2ps
- 
- # zlib support for gl2ps
- zlib {
-
---- 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp	2010-01-06 10:51:53 +0000
-+++ 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp	2010-01-06 18:32:28 +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"
- 

-
---- 3rdparty/qwtplot3d/src/qwt3d_label.cpp	2010-01-06 10:51:53 +0000
-+++ 3rdparty/qwtplot3d/src/qwt3d_label.cpp	2010-01-06 18:33:52 +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.11-system-liborigin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-liborigin.patch
deleted file mode 100644
index 0b0bffc20e22..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-liborigin.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- qtiplot/qtiplot.pro	2010-01-06 18:38:38 +0000
-+++ qtiplot/qtiplot.pro	2010-01-06 18:40:20 +0000
-@@ -10,7 +10,6 @@
- 
- # local copy included
- INCLUDEPATH       += ../3rdparty/qwtplot3d/include
--INCLUDEPATH       += ../3rdparty/liborigin
- INCLUDEPATH       += ../3rdparty/zlib
- 
- # configurable
-@@ -18,12 +17,14 @@
- INCLUDEPATH       += $$QWT_INCLUDEPATH
- INCLUDEPATH       += $$GSL_INCLUDEPATH
- INCLUDEPATH       += $$BOOST_INCLUDEPATH
-+INCLUDEPATH       += $$LIB_ORIGIN_INCLUDEPATH
- 
- # configurable libs
- LIBS         += $$MUPARSER_LIBS
- LIBS         += $$QWT_LIBS
- LIBS         += $$GSL_LIBS
- LIBS         += $$BOOST_LIBS
-+LIBS         += $$LIB_ORIGIN_LIBS
- 
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
-
---- qtiplot/src/origin/origin.pri	2010-01-06 10:51:53 +0000
-+++ qtiplot/src/origin/origin.pri	2010-01-06 18:18:58 +0000
-@@ -4,14 +4,5 @@
- 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/files/qtiplot-0.9.7.11-transparency.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-transparency.patch
deleted file mode 100644
index 502eacf37a7c..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-transparency.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-commit 7d83056ab798836dcc18de7fd0922288f40cc85e
-Author: ion_vasilief <ion_vasilief@5a6a7de5-fb12-0410-b871-c33778c25c60>
-Date:   Tue Jan 12 12:27:02 2010 +0000
-
-    Fixed bug #016656: No transparency for exported .png files.
-
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
-index 846392b..c5938f1 100755
---- a/qtiplot/src/plot2D/Graph.cpp
-+++ b/qtiplot/src/plot2D/Graph.cpp
-@@ -1266,11 +1266,14 @@ void Graph::copyImage()
- #endif
- }
- 
--QPixmap Graph::graphPixmap(const QSize& size, double scaleFontsFactor)
-+QPixmap Graph::graphPixmap(const QSize& size, double scaleFontsFactor, bool transparent)
- {
- 	if (!size.isValid()){
- 		QPixmap pixmap(boundingRect().size());
--		pixmap.fill(Qt::white);
-+		if (transparent)
-+			pixmap.fill(Qt::transparent);
-+		else
-+			pixmap.fill();
- 		QPainter p(&pixmap);
- 		print(&p, rect());
- 		p.end();
-@@ -1292,7 +1295,10 @@ QPixmap Graph::graphPixmap(const QSize& size, double scaleFontsFactor)
- 	scaleFonts(scaleFontsFactor);
- 
- 	QPixmap pixmap(size);
--	pixmap.fill(Qt::white);
-+	if (transparent)
-+		pixmap.fill(Qt::transparent);
-+	else
-+		pixmap.fill();
- 	QPainter p(&pixmap);
- 	print(&p, r);
- 	p.end();
-@@ -1346,28 +1352,8 @@ void Graph::exportImage(const QString& fileName, int quality, bool transparent,
- 	if (customSize.isValid())
- 		size = customPrintSize(customSize, unit, dpi);
- 
--	QPixmap pic = graphPixmap(size, fontsFactor);
-+	QPixmap pic = graphPixmap(size, fontsFactor, transparent);
- 	QImage image = pic.toImage();
--
--	if (transparent){
--		QBitmap mask(size);
--		mask.fill(Qt::color1);
--		QPainter p(&mask);
--		p.setPen(Qt::color0);
--
--		QRgb backgroundPixel = QColor(Qt::white).rgb ();
--		for (int y = 0; y < image.height(); y++){
--			for (int x = 0; x < image.width(); x++){
--				QRgb rgb = image.pixel(x, y);
--				if (rgb == backgroundPixel) // we want the frame transparent
--					p.drawPoint(x, y);
--			}
--		}
--		p.end();
--		pic.setMask(mask);
--		image = pic.toImage();
--	}
--
- 	int dpm = (int)ceil(100.0/2.54*dpi);
- 	image.setDotsPerMeterX(dpm);
- 	image.setDotsPerMeterY(dpm);
-diff --git a/qtiplot/src/plot2D/Graph.h b/qtiplot/src/plot2D/Graph.h
-index 7dd10fa..9646232 100755
---- a/qtiplot/src/plot2D/Graph.h
-+++ b/qtiplot/src/plot2D/Graph.h
-@@ -313,7 +313,7 @@ class Graph: public QwtPlot
- 		void printCropmarks(bool on){d_print_cropmarks = on;};
- 
- 		void copyImage();
--		QPixmap graphPixmap(const QSize& size = QSize(), double scaleFontsFactor = 1.0);
-+		QPixmap graphPixmap(const QSize& size = QSize(), double scaleFontsFactor = 1.0, bool transparent = false);
- 		//! Provided for convenience in scripts
- 		void exportToFile(const QString& fileName);
- 		void exportSVG(const QString& fname, const QSizeF& customSize = QSizeF(), int unit = FrameWidget::Pixel, double fontsFactor = 1.0);
-diff --git a/qtiplot/src/plot2D/MultiLayer.cpp b/qtiplot/src/plot2D/MultiLayer.cpp
-index 4e3dc4a..e0f3111 100755
---- a/qtiplot/src/plot2D/MultiLayer.cpp
-+++ b/qtiplot/src/plot2D/MultiLayer.cpp
-@@ -679,11 +679,14 @@ void MultiLayer::setRows(int r)
- 		d_rows = r;
- }
- 
--QPixmap MultiLayer::canvasPixmap(const QSize& size, double scaleFontsFactor)
-+QPixmap MultiLayer::canvasPixmap(const QSize& size, double scaleFontsFactor, bool transparent)
- {
- 	if (!size.isValid()){
- 		QPixmap pic(d_canvas->size());
--		pic.fill();
-+		if (transparent)
-+			pic.fill(Qt::transparent);
-+		else
-+			pic.fill();
- 		QPainter p(&pic);
- 		QObjectList lst = d_canvas->children();//! this list is sorted according to the stack order
- 		foreach (QObject *o, lst){
-@@ -702,7 +705,10 @@ QPixmap MultiLayer::canvasPixmap(const QSize& size, double scaleFontsFactor)
- 		scaleFontsFactor = scaleFactorY;
- 
- 	QPixmap pic(size);
--	pic.fill();
-+	if (transparent)
-+		pic.fill(Qt::transparent);
-+	else
-+		pic.fill();
- 	QPainter p(&pic);
- 	QObjectList lst = d_canvas->children();
- 	foreach (QObject *o, lst){
-@@ -769,28 +775,8 @@ void MultiLayer::exportImage(const QString& fileName, int quality, bool transpar
- 	if (customSize.isValid())
- 		size = Graph::customPrintSize(customSize, unit, dpi);
- 
--	QPixmap pic = canvasPixmap(size, fontsFactor);
-+	QPixmap pic = canvasPixmap(size, fontsFactor, transparent);
- 	QImage image = pic.toImage();
--
--	if (transparent){
--		QBitmap mask(size);
--		mask.fill(Qt::color1);
--		QPainter p(&mask);
--		p.setPen(Qt::color0);
--
--		QRgb backgroundPixel = QColor(Qt::white).rgb ();
--		for (int y = 0; y < image.height(); y++){
--			for (int x = 0; x < image.width(); x++){
--				QRgb rgb = image.pixel(x, y);
--				if (rgb == backgroundPixel) // we want the frame transparent
--					p.drawPoint(x, y);
--			}
--		}
--		p.end();
--		pic.setMask(mask);
--		image = pic.toImage();
--	}
--
- 	int dpm = (int)ceil(100.0/2.54*dpi);
- 	image.setDotsPerMeterX(dpm);
- 	image.setDotsPerMeterY(dpm);
-diff --git a/qtiplot/src/plot2D/MultiLayer.h b/qtiplot/src/plot2D/MultiLayer.h
-index d677403..47569a4 100755
---- a/qtiplot/src/plot2D/MultiLayer.h
-+++ b/qtiplot/src/plot2D/MultiLayer.h
-@@ -157,7 +157,7 @@ public slots:
- 
- 	//! \name Print and Export
- 	//@{
--	QPixmap canvasPixmap(const QSize& size = QSize(), double scaleFontsFactor = 1.0);
-+	QPixmap canvasPixmap(const QSize& size = QSize(), double scaleFontsFactor = 1.0, bool transparent = false);
- 	void exportToFile(const QString& fileName);
- 	void exportImage(QTextDocument *document, int quality = 100, bool transparent = false,
- 		int dpi = 0, const QSizeF& customSize = QSizeF (), int unit = FrameWidget::Pixel, double fontsFactor = 1.0);
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.10.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.10.ebuild
deleted file mode 100644
index 3eb99c4404a2..000000000000
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.10.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2010 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.10.ebuild,v 1.2 2010/01/05 11:08:39 ssuominen Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bindist doc"
-
-LANGS="de es fr ja ru sv"
-for l in ${LANGS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
-# qwtplot3d much modified from original upstream
-# >=x11-libs/qwt-5.3 they are using trunk checkouts
-CDEPEND="
-	x11-libs/qt-opengl:4
-	x11-libs/qt-qt3support:4
-	x11-libs/qt-assistant:4
-	x11-libs/qt-svg:4
-	>=x11-libs/gl2ps-1.3.5
-	>=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 )
-	dev-libs/boost
-	dev-tex/qtexengine"
-# Still not working
-#	media-libs/libemf
-#	media-libs/emfengine"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	dev-python/sip
-	doc? ( app-text/docbook-sgml-utils
-		   app-text/docbook-xml-dtd:4.2 )"
-
-RDEPEND="${CDEPEND}
-	>=dev-lang/python-2.5
-	dev-python/PyQt4[X]
-	dev-python/pygsl
-	sci-libs/scipy"
-
-PATCHES=(
-	"${FILESDIR}/${P}-syslibs.patch"
-	"${FILESDIR}/${P}-docbuild.patch"
-	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-build.conf.patch"
-	"${FILESDIR}/${P}-sip.patch"
-	"${FILESDIR}/${P}-gl2ps.patch"
-	"${FILESDIR}/${P}-dont-install-qwt.patch"
-	"${FILESDIR}/${P}-qtiplot.pro.patch"
-	)
-
-src_prepare() {
-	qt4_src_prepare
-
-	rm -rf 3rdparty/{liborigin,QTeXEngine} 3rdparty/qwtplot3d/3rdparty/gl2ps/
-
-	python_version
-
-	sed -i \
-		-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"
-
-	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
-	sed -i \
-		-e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
-		fitPlugins/*/*.pro \
-		|| die "sed fitRational* failed"
-
-	for l in ${LANGS}; do
-		if ! use linguas_${l}; then
-			sed -i \
-				-e "s:translations/qtiplot_${l}.ts::" \
-				-e "s:translations/qtiplot_${l}.qm::" \
-				qtiplot/qtiplot.pro || die
-		fi
-	done
-	chmod -x qtiplot/qti_wordlist.txt
-
-	sed \
-		-e "s:GENTOOLIB:$(get_libdir):g" \
-		-e "/^EMF_ENGINE_LIBS/s:^:#:g" \
-		build.conf.example > build.conf
-}
-
-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'
-	newicon qtiplot_logo.png qtiplot.png
-	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
-	if use doc; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r manual/html/* || die "install manual failed"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	if use doc; then
-		elog "On the first start, do Help -> Choose Help Folder"
-		elog "and select /usr/share/doc/${PF}/html"
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.11-r4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.13.ebuild
index 2f0dc459a3dd..cbcbde3897bc 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.11-r4.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.11-r4.ebuild,v 1.1 2010/01/12 19:59:17 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.13.ebuild,v 1.1 2010/03/17 15:18:42 pva Exp $
 
 EAPI=2
 inherit eutils qt4 fdo-mime python
@@ -29,7 +29,7 @@ CDEPEND="
 	x11-libs/qt-assistant:4
 	x11-libs/qt-svg:4
 	>=x11-libs/gl2ps-1.3.5
-	>=dev-cpp/muParser-1.30
+	>=dev-cpp/muParser-1.32
 	>=dev-libs/boost-1.35.0
 	>=sci-libs/liborigin-20090406:2
 	sci-libs/gsl
@@ -55,11 +55,10 @@ RDEPEND="${CDEPEND}
 		sci-libs/scipy )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-system-QTeXEngine.patch"
-	"${FILESDIR}/${P}-system-liborigin.patch"
-	"${FILESDIR}/${P}-system-gl2ps.patch"
+	"${FILESDIR}/${PN}-0.9.7.12-system-QTeXEngine.patch"
+	"${FILESDIR}/${PN}-0.9.7.12-system-liborigin.patch"
+	"${FILESDIR}/${PN}-0.9.7.12-system-gl2ps.patch"
 	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
-	"${FILESDIR}/${P}-transparency.patch"
 	)
 
 src_prepare() {
@@ -80,9 +79,12 @@ src_prepare() {
 	BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
 	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
 	LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
 	LIB_ORIGIN_LIBS = -lorigin2
-	SYS_LIBS = -lQTeXEngine -lgl2ps
+	QTEXENGINE_LIBS = -lQTeXEngine
+	SYS_LIBS = -lgl2ps
 
 	PYTHON = python
 	LUPDATE = lupdate
@@ -103,6 +105,8 @@ src_prepare() {
 		echo "QUAZIP_LIBS = -lquazip" >> build.conf
 	fi
 
+	sed '/^INSTALLS/d;' -i 3rdparty/qwtplot3d/qwtplot3d.pro || die
+
 	# Fails to build...
 	#if use emf; then
 	#	echo "EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF" >> build.conf