Revision bump: dropped USE bindist, see bug #199451; python USE flag back; Fixed path to manual (no need for elog), fixed installation of languages.

(Portage version: 2.1.7.16/cvs/Linux x86_64)

14 files changed, 335 insertions, 517 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 28dfea1c29e8..07c4caebb1db 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,23 @@
 # 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.49 2010/01/09 08:45:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.50 2010/01/10 07:46:14 pva Exp $
+
+*qtiplot-0.9.7.11-r1 (10 Jan 2010)
+
+  10 Jan 2010; Peter Volkov <pva@gentoo.org>
+  -files/qtiplot-0.9.7.10-sip2.patch, -qtiplot-0.9.7.11.ebuild,
+  +qtiplot-0.9.7.11-r1.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,
+  +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:
+  Revision bump: dropped USE bindist, see bug #199451; python USE flag back;
+  Fixed path to manual (no need for elog), fixed installation of languages.
 
 *qtiplot-0.9.7.11 (09 Jan 2010)
 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch
deleted file mode 100644
index 6e5e1bda5883..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- trunk/qtiplot/src/scripting/scripting.pri	2009/10/21 21:30:09	1434
-+++ trunk/qtiplot/src/scripting/scripting.pri	2009/10/22 13:39:34	1435
-@@ -80,7 +80,6 @@
-              $${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 \
-@@ -104,5 +103,15 @@
- 			 $${SIP_DIR}/sipqtiFFT.cpp \
- 			 $${SIP_DIR}/sipqtiCorrelation.cpp \
- 			 $${SIP_DIR}/sipqtiConvolution.cpp \
--			 $${SIP_DIR}/sipqtiDeconvolution.cpp
-+			 $${SIP_DIR}/sipqtiDeconvolution.cpp \
-+
-+exists(../../$${SIP_DIR}/sipqtiQList.cpp) {
-+  # 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.11-build.conf.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-build.conf.patch
deleted file mode 100644
index 92495316e88a..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-build.conf.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-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
deleted file mode 100644
index 78690327b2e6..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-docbuild.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index 1a5dc71244f1..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-dont-install-qwt.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index e773aa43c7a6..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-gl2ps.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index e520fe74c69a..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-qtiplot.pro.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index 378a37291038..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-sip48.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 066d27dc5b9c..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-syslibs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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/files/qtiplot-0.9.7.11-system-QTeXEngine.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-QTeXEngine.patch
new file mode 100644
index 000000000000..0e52186db425
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-QTeXEngine.patch
@@ -0,0 +1,27 @@
+=== 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
new file mode 100644
index 000000000000..a4f1a95e1551
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-gl2ps.patch
@@ -0,0 +1,63 @@
+--- 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
new file mode 100644
index 000000000000..0b0bffc20e22
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-system-liborigin.patch
@@ -0,0 +1,44 @@
+--- 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/qtiplot-0.9.7.11-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.11-r1.ebuild
new file mode 100644
index 000000000000..699887c1dcc4
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.11-r1.ebuild
@@ -0,0 +1,183 @@
+# 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-r1.ebuild,v 1.1 2010/01/10 07:46:14 pva 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 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc python ods xls"
+
+LANGS="cn cz de es fr ro ru ja sv"
+for l in ${LANGS}; do
+	lu=${l/cz/cs}
+	lu=${lu/cn/zh_CN}
+	IUSE="${IUSE} linguas_${lu}"
+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
+	sci-libs/gsl
+	dev-libs/boost
+	dev-tex/qtexengine
+	xls? ( dev-libs/libxls )
+	ods? ( dev-libs/quazip )"
+# Still unable to build
+#	emf? ( media-libs/libemf
+#		media-libs/emfengine )
+
+# TODO: check GL2PS_HAVE_ZLIB
+# CONFIG          += BrowserPlugin
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	python? ( >=dev-python/sip-4.9 )
+	doc? ( app-text/docbook-sgml-utils
+		   >=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
+
+RDEPEND="${CDEPEND}
+	python? ( >=dev-lang/python-2.5
+		dev-python/PyQt4[X]
+		dev-python/pygsl
+		dev-python/rpy
+		sci-libs/scipy )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-system-QTeXEngine.patch"
+	"${FILESDIR}/${P}-system-liborigin.patch"
+	"${FILESDIR}/${P}-system-gl2ps.patch"
+	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
+	)
+
+src_prepare() {
+	qt4_src_prepare
+
+	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/}
+
+	# 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 = \$\$system(pkg-config --libs muparser)
+	GSL_LIBS = \$\$system(pkg-config --libs gsl)
+	BOOST_INCLUDEPATH = /usr/include/boost
+	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
+	LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
+	LIB_ORIGIN_LIBS = -lorigin2
+	SYS_LIBS = -lQTeXEngine -lgl2ps
+
+	PYTHON = python
+	LUPDATE = lupdate
+	LRELEASE = lrelease
+
+	SCRIPTING_LANGS += muParser
+
+	CONFIG          += release
+	CONFIG          += CustomInstall
+
+	EOF
+
+	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use xls && echo "XLS_LIBS = -lxlsreader" >> build.conf
+	if use ods; then
+		echo "QUAZIP_INCLUDEPATH = /usr/include/quazip" >> build.conf
+		echo "QUAZIP_LIBS = -lquazip" >> build.conf
+	fi
+
+	# Fails to build... 
+	#if use emf; then
+	#	echo "EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF" >> build.conf
+	#	echo "EMF_ENGINE_LIBS = -lEMF" >> build.conf
+	#fi
+
+	python_version
+
+	sed -e "s:doc/${PN}/manual:doc/${PF}/html:" \
+		-e "s:local/${PN}:$(get_libdir)/python${PYVER}/site-packages:" \
+			-i qtiplot/qtiplot.pro || die
+
+	sed -e '/INSTALLS.*documentation/d' \
+		-e '/INSTALLS.*manual/d' \
+		-e 's:\(^RESOURCES.*manual/html/icons.*\):#\1:' \
+			-i qtiplot/qtiplot.pro || die
+	sed -e '/manual/d' -i qtiplot.pro || 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
+	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
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_compile() {
+	emake || die "emake failed"
+	lrelease qtiplot/qtiplot.pro || die
+	if use doc; then
+		cd manual
+		emake web || 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
+
+	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() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.11.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.11.ebuild
deleted file mode 100644
index 6e44c1c9636b..000000000000
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.11.ebuild
+++ /dev/null
@@ -1,146 +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.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
-}