Version bump, bug #304533, thank Samuli Suominen for report.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

7 files changed, 238 insertions, 194 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index dd42f4a700c1..4e0b03a65d6f 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,15 @@
 # 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.53 2010/01/12 19:59:17 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.54 2010/02/14 20:49:25 pva Exp $
+
+*qtiplot-0.9.7.12 (14 Feb 2010)
+
+  14 Feb 2010; Peter Volkov <pva@gentoo.org> -qtiplot-0.9.7.11-r2.ebuild,
+  -qtiplot-0.9.7.11-r3.ebuild, +qtiplot-0.9.7.12.ebuild,
+  +files/qtiplot-0.9.7.12-system-QTeXEngine.patch,
+  +files/qtiplot-0.9.7.12-system-gl2ps.patch,
+  +files/qtiplot-0.9.7.12-system-liborigin.patch:
+  Version bump, bug #304533, thank Samuli Suominen for report.
 
 *qtiplot-0.9.7.11-r4 (12 Jan 2010)
 
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index a4f042940c97..4fe8e01b949f 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -10,11 +10,14 @@ AUX qtiplot-0.9.7.11-system-QTeXEngine.patch 1045 RMD160 11193edddf6b01a9203fe00
 AUX qtiplot-0.9.7.11-system-gl2ps.patch 1765 RMD160 92e96447aa0207e4c75ea72c4116563aa404d226 SHA1 8bd2cbedb6ca372fbc547e0ee87089aa9bb0852b SHA256 3c7b08c6d9fbdbff6248da0148e714d433b214d68c558ce7498ad7dd86aa7437
 AUX qtiplot-0.9.7.11-system-liborigin.patch 1527 RMD160 08e401cc3773319a887b4272ead209ebaba30296 SHA1 aee9ad7acd1797173a4a5eea47b492f0ab212621 SHA256 c82997fe4f45c0a4561d7697ac0e5d3348bf48eee254d0aebc0610e63fc90274
 AUX qtiplot-0.9.7.11-transparency.patch 5432 RMD160 532bc8249fe6a946426c66df56f8393c95931c0e SHA1 9ae1ed3839921d0d937c30f7135ab0d350ea3795 SHA256 f084e0e5bcc8793f572388c0d66a962d421912d8e1982f4404a45aa9df02f4d5
+AUX qtiplot-0.9.7.12-system-QTeXEngine.patch 2390 RMD160 4e96caac6fe930b27dfd503354417078bfedfe34 SHA1 25f548a4c6e76a39dc72b44c4e975f13897f1d8f SHA256 9bb277a4bee32037067561ac19a1eb4bd8cf4f7b53edcea896c9f0c036dcccff
+AUX qtiplot-0.9.7.12-system-gl2ps.patch 1594 RMD160 4ed03493199239a9c3b745132b5aeb202214e025 SHA1 548c1edc50fe96e46f6a676ff9f794ffff7dd7f7 SHA256 b1997f61759e647bfa25f3b926bedd88102a8d56595d515edef2c6988dd97a22
+AUX qtiplot-0.9.7.12-system-liborigin.patch 3242 RMD160 03ea38fe2b26034ad1bc08fb296eabdd76823409 SHA1 17085d3a32281dcac5a594a054265ae5c9d80445 SHA256 cf2595152c23c9c67513a115d9981e03d472c0b93e101d6e9e4e778de97df731
 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
+DIST qtiplot-0.9.7.12.tar.bz2 8221079 RMD160 af04944a1a6671e3133d0a8caec0f4c430f452ff SHA1 fe54f737ac857a470f7f00a53a73270d20f203a9 SHA256 29cf8e3dbd5539019b3351893c8b2fafa1e1283333d4b055b711b3a7ea85d935
 EBUILD qtiplot-0.9.7.10.ebuild 3305 RMD160 98cbadff023c23cd5f68dfc73a0f28a4024bd8e3 SHA1 85b8ac3758bcfb48e57f128c6586254648f474ae SHA256 c9228bfda1e2e75f4fff30fc0c9e6a04e38578a01980cd77697768b2c4c64ff4
-EBUILD qtiplot-0.9.7.11-r2.ebuild 4810 RMD160 158ba1f09025e60913635d7dad8b161f39239ec9 SHA1 1af4f61e28113d6889c18df14e61f5c68f07b66a SHA256 c2537011214b6ce7f42bf38679e08f33afb779da36b40d7a0539365ddfe22654
-EBUILD qtiplot-0.9.7.11-r3.ebuild 4777 RMD160 f60681ccbad46c0b330004cfa7182ca571bafbe0 SHA1 1e1f837f28e7a85c4868d60bde8642b325627b90 SHA256 63de8932257c499c2292e57f0d40cb2db76dc7c7289ecde09939a38e8e4e7fbb
 EBUILD qtiplot-0.9.7.11-r4.ebuild 4912 RMD160 355e81db4221409071de03533a4a3201e5f51722 SHA1 a59061677cbc59686bebd01a38e518725536f87f SHA256 18401f2ca62fde5e9e2ab4ab2bf6f6ae76ed54ce6070c03669c406e126d8e806
-MISC ChangeLog 14714 RMD160 4509c438738c61c79a3b46288402d56bbce5921e SHA1 98e5025fcb16063035dcb10bf9a2c33c1a01d4e8 SHA256 9e818429f5e1bff0563dee67980691b82711c1dadff6e2f8d1df806b8b252f53
+EBUILD qtiplot-0.9.7.12.ebuild 5080 RMD160 713a34a6c3aeef2f2412fe4eaf03306750412193 SHA1 4d9dd1d495e64427d3df1a309e99bfb422de8978 SHA256 201fdd0efde627c07e33adc0da67aff11442f0b725228c50576909b968fa0b9d
+MISC ChangeLog 15089 RMD160 16b3219900e1f681daebed3feb8a4a72ccdcc2b4 SHA1 4d429ea76a254acdcf5feb417f51e706f4dc1ef1 SHA256 7b3e8f35568d3baca46054ab11610c2d57b36e64c82bc69db00540027ea7a4f5
 MISC metadata.xml 857 RMD160 f0b19f02132816e5a98dade3c25c17b578ef5f33 SHA1 1a7a0769a7989384e15a2d098441966630652866 SHA256 d001c7b867a7bbc14047fc029821afe1dde7a65e2e8d146c3f467c57da26d24a
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch
new file mode 100644
index 000000000000..5577ec937c38
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch
@@ -0,0 +1,62 @@
+=== modified file 'build.conf.example'
+--- build.conf.example	2010-01-21 22:49:21 +0000
++++ build.conf.example	2010-02-14 15:04:17 +0000
+@@ -69,6 +69,13 @@
+ win32:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/qwtplot3d.dll
+ unix:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+ 
++##########################################################
++## QTeXEngine - uncomment if you wish to use system copy
++# http://soft.proindependent.com/qtexengine/
++##########################################################
++#
++# QTEXENGINE_LIBS = -lQTeXEngine
++
+ ###########################################################
+ ## libxls - optional. you don't have to set these variables
+ # http://libxls.sourceforge.net/
+
+=== modified file 'qtiplot/qtiplot.pro'
+--- qtiplot/qtiplot.pro	2010-01-21 22:49:21 +0000
++++ qtiplot/qtiplot.pro	2010-02-14 15:00:58 +0000
+@@ -11,7 +11,6 @@
+ # local copy included
+ INCLUDEPATH       += ../3rdparty/liborigin
+ INCLUDEPATH       += ../3rdparty/zlib
+-INCLUDEPATH 	  += ../3rdparty/QTeXEngine/src
+ 
+ # configurable
+ INCLUDEPATH       += $$MUPARSER_INCLUDEPATH
+@@ -24,6 +23,7 @@
+ LIBS         += $$MUPARSER_LIBS
+ LIBS         += $$QWT_LIBS
+ LIBS         += $$QWT3D_LIBS
++LIBS         += $$QTEXENGINE_LIBS
+ LIBS         += $$GSL_LIBS
+ LIBS         += $$BOOST_LIBS
+ 
+@@ -143,14 +143,16 @@
+ include(src/table/table.pri)
+ include(src/scripting/scripting.pri)
+ 
+-###############################################################
+-##################### TeX export: QTeXEngine ##################
+-###############################################################
++isEmpty(QTEXENGINE_LIBS) {
++	###############################################################
++	##################### TeX export: QTeXEngine ##################
++	###############################################################
+ 
+-INCLUDEPATH += ../3rdparty/QTeXEngine/src
+-HEADERS 	+= ../3rdparty/QTeXEngine/src/QTeXEngine.h
+-SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp
+-SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
++	INCLUDEPATH += ../3rdparty/QTeXEngine/src
++	HEADERS 	+= ../3rdparty/QTeXEngine/src/QTeXEngine.h
++	SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp
++	SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
++}
+ 
+ ###############################################################
+ ##################### Scripting: PYTHON + SIP + PyQT ##########
+
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch
new file mode 100644
index 000000000000..b0419c2f390d
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch
@@ -0,0 +1,56 @@
+=== modified file '3rdparty/qwtplot3d/qwtplot3d.pri'
+--- 3rdparty/qwtplot3d/qwtplot3d.pri	2010-01-21 22:49:21 +0000
++++ 3rdparty/qwtplot3d/qwtplot3d.pri	2010-02-14 17:22:07 +0000
+@@ -8,6 +8,8 @@
+     3rdparty\gl2ps
+ INCLUDEPATH += .
+ 
++LIBS+=-lgl2ps
++
+ # Input
+ HEADERS += include/qwt3d_extglwidget.h \
+     include/qwt3d_color.h \
+@@ -37,8 +39,7 @@
+     include/qwt3d_volumeplot.h \
+     include/qwt3d_graphplot.h \
+     include/qwt3d_multiplot.h \
+-    include/qwt3d_io_gl2ps.h \
+-    3rdparty/gl2ps/gl2ps.h
++    include/qwt3d_io_gl2ps.h
+ SOURCES += src/qwt3d_extglwidget.cpp \
+     src/qwt3d_axis.cpp \
+     src/qwt3d_color.cpp \
+@@ -62,5 +63,4 @@
+     src/qwt3d_function.cpp \
+     src/qwt3d_gridplot.cpp \
+     src/qwt3d_meshplot.cpp \
+-    src/qwt3d_io_gl2ps.cpp \
+-    3rdparty/gl2ps/gl2ps.c
++    src/qwt3d_io_gl2ps.cpp
+
+=== modified file '3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp'
+--- 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp	2010-01-21 22:49:21 +0000
++++ 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp	2010-02-14 17:12:09 +0000
+@@ -6,7 +6,7 @@
+ #include <locale.h>
+ 
+ #include "qwt3d_openglhelper.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include "gl2ps.h"
+ #include "qwt3d_io_gl2ps.h"
+ #include "qwt3d_plot.h"
+ 
+
+=== modified file '3rdparty/qwtplot3d/src/qwt3d_label.cpp'
+--- 3rdparty/qwtplot3d/src/qwt3d_label.cpp	2010-01-21 22:49:21 +0000
++++ 3rdparty/qwtplot3d/src/qwt3d_label.cpp	2010-02-14 17:13:01 +0000
+@@ -1,7 +1,7 @@
+ #include <qbitmap.h>
+ #include "qwt3d_label.h"
+ #include "qwt3d_plot.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include "gl2ps.h"
+ 
+ using namespace Qwt3D;
+ 
+
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch
new file mode 100644
index 000000000000..3e89b243e2ec
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch
@@ -0,0 +1,90 @@
+=== modified file 'build.conf.example'
+--- build.conf.example	2010-02-14 15:07:01 +0000
++++ build.conf.example	2010-02-14 15:16:08 +0000
+@@ -118,6 +118,14 @@
+ EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
+ 
+ ##########################################################
++## liborigin - keep commented if you wish to use local copy
++#  http://sourceforge.net/projects/liborigin/
++##########################################################
++
++# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
++# LIB_ORIGIN_LIBS = -lorigin2
++
++##########################################################
+ ## python - only used if python is needed
+ ##########################################################
+ 
+
+=== modified file 'qtiplot/qtiplot.pro'
+--- qtiplot/qtiplot.pro	2010-02-14 15:07:01 +0000
++++ qtiplot/qtiplot.pro	2010-02-14 15:13:58 +0000
+@@ -9,7 +9,6 @@
+ #############################################################################
+ 
+ # local copy included
+-INCLUDEPATH       += ../3rdparty/liborigin
+ INCLUDEPATH       += ../3rdparty/zlib
+ 
+ # configurable
+@@ -18,6 +17,7 @@
+ INCLUDEPATH       += $$QWT3D_INCLUDEPATH
+ INCLUDEPATH       += $$GSL_INCLUDEPATH
+ INCLUDEPATH       += $$BOOST_INCLUDEPATH
++INCLUDEPATH       += $$LIB_ORIGIN_INCLUDEPATH
+ 
+ # configurable libs
+ LIBS         += $$MUPARSER_LIBS
+@@ -26,6 +26,7 @@
+ LIBS         += $$QTEXENGINE_LIBS
+ LIBS         += $$GSL_LIBS
+ LIBS         += $$BOOST_LIBS
++LIBS         += $$LIB_ORIGIN_LIBS
+ 
+ #############################################################################
+ ###################### BASIC PROJECT PROPERTIES #############################
+@@ -154,6 +155,10 @@
+ 	SOURCES     += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
+ }
+ 
++isEmpty(LIB_ORIGIN_LIBS) {
++	INCLUDEPATH       += ../3rdparty/liborigin
++}
++
+ ###############################################################
+ ##################### Scripting: PYTHON + SIP + PyQT ##########
+ ###############################################################
+
+=== modified file 'qtiplot/src/origin/origin.pri'
+--- qtiplot/src/origin/origin.pri	2009-10-18 01:48:15 +0000
++++ qtiplot/src/origin/origin.pri	2010-02-14 15:11:15 +0000
+@@ -4,14 +4,17 @@
+ INCLUDEPATH += src/origin/
+ 
+ HEADERS += src/origin/importOPJ.h
+-HEADERS += ../3rdparty/liborigin/OriginObj.h
+-HEADERS += ../3rdparty/liborigin/OriginFile.h
+-HEADERS += ../3rdparty/liborigin/OriginParser.h
+-HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
+-HEADERS += ../3rdparty/liborigin/Origin750Parser.h
+-
+ SOURCES += src/origin/importOPJ.cpp
+-SOURCES += ../3rdparty/liborigin/OriginFile.cpp
+-SOURCES += ../3rdparty/liborigin/OriginParser.cpp
+-SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
+-SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
++
++isEmpty(LIB_ORIGIN_LIBS) {
++	HEADERS += ../3rdparty/liborigin/OriginObj.h
++	HEADERS += ../3rdparty/liborigin/OriginFile.h
++	HEADERS += ../3rdparty/liborigin/OriginParser.h
++	HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
++	HEADERS += ../3rdparty/liborigin/Origin750Parser.h
++
++	SOURCES += ../3rdparty/liborigin/OriginFile.cpp
++	SOURCES += ../3rdparty/liborigin/OriginParser.cpp
++	SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
++	SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
++}
+
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.11-r3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.11-r3.ebuild
deleted file mode 100644
index 050a27279e1e..000000000000
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.11-r3.ebuild
+++ /dev/null
@@ -1,181 +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-r3.ebuild,v 1.1 2010/01/12 18:07:37 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 )
-
-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"
-	"${FILESDIR}/${P}-transparency.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' \
-			-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() {
-	use amd64 && export QMAKESPEC="linux-g++-64"
-	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-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.12.ebuild
index 004e290ff4bd..157a4ffbf9d2 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.11-r2.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.12.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-r2.ebuild,v 1.2 2010/01/12 17:50:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.12.ebuild,v 1.1 2010/02/14 20:49:25 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
@@ -41,9 +41,6 @@ CDEPEND="
 #	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 )
@@ -82,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
@@ -94,6 +94,7 @@ src_prepare() {
 
 	CONFIG          += release
 	CONFIG          += CustomInstall
+	DEFINES         += SCRIPTING_CONSOLE
 
 	EOF
 
@@ -104,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
@@ -112,8 +115,8 @@ src_prepare() {
 
 	python_version
 
-	sed -e "s:doc/${PN}/manual:doc/${PF}/html:" \
-		-e "s:local/${PN}:$(get_libdir)/python${PYVER}/site-packages:" \
+	sed -e "s:doc/${PN}/manual:doc/${PN}/html:" \
+		-e "s:/usr/local/${PN}:$(python_get_sitedir)/qtiplot:" \
 			-i qtiplot/qtiplot.pro || die
 
 	sed -e '/INSTALLS.*documentation/d' \
@@ -159,7 +162,7 @@ src_install() {
 	newicon qtiplot_logo.png qtiplot.png
 	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
 	if use doc; then
-		insinto /usr/share/doc/${PF}/html
+		insinto /usr/share/doc/${PN}/html
 		doins -r manual/html/* || die "install manual failed"
 	fi
 
@@ -176,8 +179,10 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+	python_mod_optimize "$(python_get_sitedir)/qtiplot"
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
+	python_mod_cleanup "$(python_get_sitedir)/qtiplot"
 }