Version bump wrt #299769 by Justin Lecher.

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

11 files changed, 517 insertions, 3 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index d853487ad67c..28dfea1c29e8 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,18 @@
 # 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.48 2010/01/05 11:08:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.49 2010/01/09 08:45:38 ssuominen Exp $
+
+*qtiplot-0.9.7.11 (09 Jan 2010)
+
+  09 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +qtiplot-0.9.7.11.ebuild, +files/qtiplot-0.9.7.11-build.conf.patch,
+  +files/qtiplot-0.9.7.11-docbuild.patch,
+  +files/qtiplot-0.9.7.11-dont-install-qwt.patch,
+  +files/qtiplot-0.9.7.11-gl2ps.patch,
+  +files/qtiplot-0.9.7.11-qtiplot.pro.patch,
+  +files/qtiplot-0.9.7.11-sip48.patch,
+  +files/qtiplot-0.9.7.11-syslibs.patch:
+  Version bump wrt #299769 by Justin Lecher.
 
   05 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   qtiplot-0.9.7.10.ebuild:
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 1f9c944c8a46..36233a1ec3f3 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -7,7 +7,16 @@ AUX qtiplot-0.9.7.10-qtiplot.pro.patch 1684 RMD160 d01587b1cb8d8e43c3606f5132cfd
 AUX qtiplot-0.9.7.10-sip.patch 1113 RMD160 afd2089074108bb9ca8c4526bdd0b8c3a5c5d495 SHA1 52745c241f72e6ae2df77d2a54a2a3bd054babe0 SHA256 8195baadb206a13f583ccdb6f63ff457b8eaea0135ae20aea1afa988ef670fa5
 AUX qtiplot-0.9.7.10-sip2.patch 986 RMD160 c952187ddf284818439c52c129843a359f2fec9a SHA1 750b4fc08bdf14f3fa960d21145f34d470f05dc0 SHA256 ef4b63a77fe64fde6c15c89300ac705db690485d733facf63fe19c829ebb2278
 AUX qtiplot-0.9.7.10-syslibs.patch 2111 RMD160 d052c2abbc46745f8cc069a666bf9650cfe368dc SHA1 4e82c2041dd9bd232337da679a8955206afd04c8 SHA256 1585bf2207739e7475e86c19178407addafc2d31ed89a84db67fa6f805f97177
+AUX qtiplot-0.9.7.11-build.conf.patch 6217 RMD160 a376eb00cdd1c4b9c1e4d2a76be5b3c072431309 SHA1 6a1fe5318c74ee3d2e107ded0c254747a3f51d4a SHA256 81664d2d3a46a35f89db7713dc9405f9c2c881b47bec2c346c017db9b4d51a45
+AUX qtiplot-0.9.7.11-docbuild.patch 1775 RMD160 7e04b2ea4ecb913e58f80c91e648c080269e170e SHA1 f0fa01c23a03cfc43472a9f23b66b33473e6213e SHA256 a79ee33251f3a38f11639d29d8263e6dbe1370ab05a2055efa36e746f586a61c
+AUX qtiplot-0.9.7.11-dont-install-qwt.patch 660 RMD160 2fe86c88c2db5f6507e6c2c8b57c011e2dcdb894 SHA1 c4a7e184239592c88aad52274fd112d922ec06fb SHA256 168f45ee77e3b9607d1e2372caeabf41f3fd3cf4da1e964a17c7a67cb1565fc2
+AUX qtiplot-0.9.7.11-gl2ps.patch 799 RMD160 cf6be9c7abad3cbc0ed4d8bca8daeaee9dd72002 SHA1 2f81e1262648866fdfff9120ec659852b1e42aa8 SHA256 450745d9ce234e5279097ccb0905fdb7c49291a0ba591d059c7f11546bd20b2a
+AUX qtiplot-0.9.7.11-qtiplot.pro.patch 1647 RMD160 262391efdcffb84cb0540b0a261be8ff9c7d0871 SHA1 abbb50783e66f34193e1aeca1d9a188f30f9aa80 SHA256 75ce91de8b71ad271a7ff5629ae5a8220c70b7c646dcc48d47cbe8ed8bc1a338
+AUX qtiplot-0.9.7.11-sip48.patch 532 RMD160 738e82fa86fc8b27735c9191180ec9d645f0132b SHA1 9bbc6bd1e0b7201a9184e23fae809980c7abf5fc SHA256 30be701032280ccdd46da4f044230317688de074b913c32d50b76eac1d46b99f
+AUX qtiplot-0.9.7.11-syslibs.patch 2091 RMD160 b45106400e6642c64085da7ac5acc85c3f303a39 SHA1 3182fe154d73d39384b09f311e8b2c0f3a0df1cd SHA256 8b5d648b5d92f9c8dfd384255640538ab1660549ee1baa8dbe7775bf20d58092
 DIST qtiplot-0.9.7.10.tar.bz2 7948018 RMD160 21e4ce18b1eab877fd89e97065daa246c637da67 SHA1 38558d9026113a728834536627efbc1bff9c66e1 SHA256 88f8c45f369fb0427720757983cbe033c6761f507f8efb68c63b8d67bcfbf099
+DIST qtiplot-0.9.7.11.tar.bz2 8015168 RMD160 d04669eed2c444ca390711281ecea1e0ad2b3c43 SHA1 4db101c28c4a8b8c5f11daee3bbf8979f8063914 SHA256 dd6c1c832eed89cd8bab55d73f77549338faf4e10f4dbf534df597b39bb2f52f
 EBUILD qtiplot-0.9.7.10.ebuild 3305 RMD160 98cbadff023c23cd5f68dfc73a0f28a4024bd8e3 SHA1 85b8ac3758bcfb48e57f128c6586254648f474ae SHA256 c9228bfda1e2e75f4fff30fc0c9e6a04e38578a01980cd77697768b2c4c64ff4
-MISC ChangeLog 12734 RMD160 78f64f08ff938c7b56038e346572dd1bb2d13fc8 SHA1 961f5b29b86f45099ac84b5077e09534803ed0be SHA256 94dc7cfad760ac80b88de6d3dcce21c41e48aff4661f7f9557fe30b472ac619f
-MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
+EBUILD qtiplot-0.9.7.11.ebuild 3601 RMD160 2fd79b87d17a7e640b3e060c4489e971265ef7c3 SHA1 90978132bb053b72348182f4f73b11fe75b7ded3 SHA256 41fd216345233ab72fc0d6927ab8d2bb4827ab992f55005c573fedb1bc54e6a8
+MISC ChangeLog 13193 RMD160 73affe12e3565ee7ac038ffc051f97ef18880825 SHA1 10d7c1d2879b2d189f994617b8386afaa15cbb7f SHA256 d8a0ef27ea9cc4803b37b01cf58651c117b13124fa71ce483c99696c6a2e847d
+MISC metadata.xml 768 RMD160 c086c60d35d7cbfd510293b919e33992ec81631e SHA1 96d013db56ea8a6bf4568249e0bb44131df1d17b SHA256 d52c4d4778a4b3c7d1962f4d61c93ae29d0e099e894e59869fa19726eafb0696
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-build.conf.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-build.conf.patch
new file mode 100644
index 000000000000..92495316e88a
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-build.conf.patch
@@ -0,0 +1,141 @@
+diff --git a/build.conf.example b/build.conf.example
+index 2afcee7..2dd7e05 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,8 +54,10 @@ 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
+ 
+ ###########################################################
+ ## libxls - optional. you don't have to set these variables
+@@ -64,9 +65,9 @@ QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+ ###########################################################
+ 
+ # include path.
+-XLS_INCLUDEPATH = $$QTI_ROOT/3rdparty/libxls/include/
++XLS_INCLUDEPATH = /usr/include/libxls/
+ # link locally against a copy in 3rdparty/
+-XLS_LIBS = $$QTI_ROOT/3rdparty/libxls/lib/libxlsreader.a
++#XLS_LIBS = -lxlsreader
+ 
+ ###########################################################
+ ## QuaZIP - optional. you don't have to set these variables
+@@ -74,20 +75,20 @@ XLS_LIBS = $$QTI_ROOT/3rdparty/libxls/lib/libxlsreader.a
+ ###########################################################
+ 
+ # include path.
+-QUAZIP_INCLUDEPATH = $$QTI_ROOT/3rdparty/quazip/quazip/
++QUAZIP_INCLUDEPATH = /usr/include/quazip/
+ # link locally against a copy in 3rdparty/
+-QUAZIP_LIBS = $$QTI_ROOT/3rdparty/quazip/lib/libquazip.a
++#QUAZIP_LIBS = -lquazip
+ 
+ ##########################################################
+ ## 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/include/libpng12
+ # 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
+@@ -95,9 +96,17 @@ LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a
+ ##########################################################
+ 
+ # include path.
+-EMF_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/EmfEngine/src
++EMF_ENGINE_INCLUDEPATH = /usr/include/
+ # link locally against a copy in 3rdparty/
+-EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
++#EMF_ENGINE_LIBS = -lEmfEngine
++
++############################################################
++##  liborigin
++############################################################
++
++LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
++
++LIB_ORIGIN_LIBS = -lorigin2
+ 
+ ##########################################################
+ ## python - only used if python is needed
+@@ -133,7 +142,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
+ 
+   # Uncomment the following line if you want to build QtiPlot as a browser plugin (not working on Internet Explorer).
+   #CONFIG          += BrowserPlugin
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-docbuild.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-docbuild.patch
new file mode 100644
index 000000000000..78690327b2e6
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-docbuild.patch
@@ -0,0 +1,35 @@
+diff --git a/manual/docbook-en/index.docbook b/manual/docbook-en/index.docbook
+index 4dd6c09..452dc86 100755
+--- a/manual/docbook-en/index.docbook
++++ b/manual/docbook-en/index.docbook
+@@ -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.4//EN" "/usr/share/sgml/docbook/dtd/4.4/docbookx.dtd" [
+ 
+   <!ENTITY appname "QtiPlot">
+   <!ENTITY kappname "&appname;">
+diff --git a/manual/qtiplot.dsl b/manual/qtiplot.dsl
+index 16a160f..a596c2e 100755
+--- a/manual/qtiplot.dsl
++++ b/manual/qtiplot.dsl
+@@ -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/stylesheet/dsssl/modular/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 --git a/manual/qtiplot_html.xsl b/manual/qtiplot_html.xsl
+index 593bf6f..3f4d31c 100755
+--- a/manual/qtiplot_html.xsl
++++ b/manual/qtiplot_html.xsl
+@@ -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-stylesheet/nwalsh/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.11-dont-install-qwt.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-dont-install-qwt.patch
new file mode 100644
index 000000000000..1a5dc71244f1
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-dont-install-qwt.patch
@@ -0,0 +1,23 @@
+diff --git a/3rdparty/qwt/qwtconfig.pri b/3rdparty/qwt/qwtconfig.pri
+index ab13f68..95b8d69 100755
+--- a/3rdparty/qwt/qwtconfig.pri
++++ b/3rdparty/qwt/qwtconfig.pri
+@@ -7,18 +7,6 @@ VER_MIN      = 2
+ VER_PAT      = 0
+ VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+ 
+-unix {
+-    INSTALLBASE    = /usr/local/qwt-5.2.0
+-}
+-
+-win32 {
+-    INSTALLBASE    = C:/Qwt-5.2.0
+-}
+-
+-target.path    = $$INSTALLBASE/lib
+-headers.path   = $$INSTALLBASE/include
+-doc.path       = $$INSTALLBASE/doc
+-
+ ######################################################################
+ # qmake internal options
+ ######################################################################
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-gl2ps.patch
new file mode 100644
index 000000000000..e773aa43c7a6
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-gl2ps.patch
@@ -0,0 +1,26 @@
+diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
+index 3fbcf9f..8ce3c8c 100755
+--- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
++++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
+@@ -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"
+ 
+diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
+index 46380a9..8b6aaf0 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 <gl2ps.h>
+ 
+ using namespace Qwt3D;
+ 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-qtiplot.pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-qtiplot.pro.patch
new file mode 100644
index 000000000000..e520fe74c69a
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-qtiplot.pro.patch
@@ -0,0 +1,44 @@
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index 9af5187..add4fdb 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -10,21 +10,23 @@ 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 #############################
+@@ -148,10 +150,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.11-sip48.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-sip48.patch
new file mode 100644
index 000000000000..378a37291038
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-sip48.patch
@@ -0,0 +1,15 @@
+diff --git a/qtiplot/src/scripting/scripting.pri b/qtiplot/src/scripting/scripting.pri
+index 9b7d9a8..30e2d1f 100755
+--- a/qtiplot/src/scripting/scripting.pri
++++ b/qtiplot/src/scripting/scripting.pri
+@@ -105,7 +105,9 @@ contains(SCRIPTING_LANGS, Python) {
+ 			 $${SIP_DIR}/sipqtiConvolution.cpp \
+ 			 $${SIP_DIR}/sipqtiDeconvolution.cpp \
+ 
+-exists(../../$${SIP_DIR}/sipqtiQList.cpp) {
++SIPVERSION = $$system( sip -V | cut -b 1-3 )
++
++equals( SIPVERSION, 4.8 ) {
+   # SIP < 4.9
+   SOURCES += $${SIP_DIR}/sipqtiQList.cpp
+ } else {
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-syslibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-syslibs.patch
new file mode 100644
index 000000000000..066d27dc5b9c
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-syslibs.patch
@@ -0,0 +1,59 @@
+diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri
+index 60a1f9c..65b420e 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..6068858 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 d1a43aa..486ba86 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/metadata.xml b/sci-visualization/qtiplot/metadata.xml
index 118c096c505d..eeaa0ab5c346 100644
--- a/sci-visualization/qtiplot/metadata.xml
+++ b/sci-visualization/qtiplot/metadata.xml
@@ -5,6 +5,10 @@
   <maintainer>
     <email>cryos@gentoo.org</email>
   </maintainer>
+  <use>
+    <flag name="xls">Import support for Microsoft office excel sheets</flag>
+    <flag name="ods">Import support for OpenOffice .ods sheets</flag>
+  </use>
   <longdescription>
     Data analysis and scientific plotting package. This is a clone of the
 	popular Origin software available on another well known platform implemented
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.11.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.11.ebuild
new file mode 100644
index 000000000000..6e44c1c9636b
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.11.ebuild
@@ -0,0 +1,146 @@
+# 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.ebuild,v 1.1 2010/01/09 08:45:38 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 ods xls"
+
+LANGS="de es fr ja ru sv"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+# x11-libs/qwtplot3d is modified from upstream version
+# >=x11-libs/qwt-5.3 (or trunk) isn't released yet
+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
+	ods? ( dev-libs/quazip )
+	xls? ( dev-libs/libxls )"
+#	emf? ( media-libs/emfengine )
+#	foo? ( ?/qtpluginbrowser )" #300222
+
+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}-build.conf.patch"
+	"${FILESDIR}/${P}-gl2ps.patch"
+	"${FILESDIR}/${P}-dont-install-qwt.patch"
+	"${FILESDIR}/${P}-qtiplot.pro.patch"
+	"${FILESDIR}/${P}-sip48.patch"
+	)
+
+src_prepare() {
+	edos2unix \
+		3rdparty/qwtplot3d/qwtplot3d.pri \
+		3rdparty/qwtplot3d/qwtplot3d.pro \
+		qtiplot/src/origin/origin.pri \
+		qtiplot/src/scripting/scripting.pri \
+		3rdparty/qwt/qwtconfig.pri
+
+	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 -i \
+		-e '/INSTALLS.*.*documentation/d' \
+		-e '/manual/d' \
+		qtiplot.pro qtiplot/qtiplot.pro || die
+
+	# 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
+
+	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
+
+#	use emf && sed -i "/EMF_ENGINE_LIBS/s:^#::g" build.conf.example
+	use ods && sed -i "/QUAZIP_LIBS/s:^#::g" build.conf.example
+	use xls && sed -i "/XLS_LIBS/s:^#::g" build.conf.example
+#	use && sed -i "/BrowserPlugin/s:#CONFIG:CONFIG:g" build.conf.example
+
+	sed \
+		-e "s:GENTOOLIB:$(get_libdir):g" \
+		build.conf.example > build.conf
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+#		doxygen Doxyfile || die
+		cd manual
+		emake || die "html docbook building failed"
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die
+	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
+	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
+}