Version bump wrt #299769 by Justin Lecher.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

7 files changed, 343 insertions, 0 deletions

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