Version Bump, new USE for emf png latex xls added, prefix ready

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

8 files changed, 134 insertions, 29 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 163e456b5f0b..b566acf65bf2 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,12 +1,12 @@
 # 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.70 2010/10/16 10:23:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.71 2010/10/18 06:53:04 jlec Exp $
 
-*qtiplot-0.9.8.3 (16 Oct 2010)
-
-  16 Oct 2010; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.2.ebuild,
-  +qtiplot-0.9.8.3.ebuild:
-  Version Bump, prefix ready
+  18 Oct 2010; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.2.ebuild,
+  qtiplot-0.9.8.3.ebuild, +files/qtiplot-0.9.8.3-odf.patch,
+  +files/qtiplot-0.9.8.3-origin.patch, +files/qtiplot-0.9.8.3-plot.patch,
+  +files/qtiplot-0.9.8.3-popup.patch, metadata.xml:
+  Version Bump, new USE for emf png latex xls added, prefix ready
 
   10 Oct 2010; Justin Lecher <jlec@gentoo.org> -qtiplot-0.9.7.12.ebuild,
   qtiplot-0.9.7.14-r1.ebuild, -qtiplot-0.9.8.ebuild, qtiplot-0.9.8.2.ebuild:
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch
new file mode 100644
index 000000000000..0ba7cc96a605
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch
@@ -0,0 +1,13 @@
+diff --git a/qtiplot/src/core/ApplicationWindow.cpp b/qtiplot/src/core/ApplicationWindow.cpp
+index 56c52a7..b643e50 100755
+--- a/qtiplot/src/core/ApplicationWindow.cpp
++++ b/qtiplot/src/core/ApplicationWindow.cpp
+@@ -4326,7 +4326,7 @@ Table * ApplicationWindow::importExcelCrossplatform(const QString& fn, int sheet
+ 
+ 		int rows = sh->GetTotalRows();
+ 		int cols = sh->GetTotalCols();
+-		if (rows == 1 && !cols){
++		if (!rows && !cols){
+ 			if (sheet > 0 && sheet == currentSheet){
+ 				QMessageBox::critical(this, tr("QtiPlot"), tr("Sheet %1 is empty, operation aborted!").arg(sheet));
+ 				return NULL;
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch
new file mode 100644
index 000000000000..ebd7ca7342de
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch
@@ -0,0 +1,13 @@
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index bf133ca..f3d0994 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -226,7 +226,7 @@ contains(SCRIPTING_LANGS, Python) {
+ 	DEFINES += OPJ_IMPORT
+ 	INCLUDEPATH += $$LIBORIGIN_INCLUDEPATH
+ 	INCLUDEPATH += $$BOOST_INCLUDEPATH
+-	#LIBS        += $$LIBORIGIN_LIBS
++	LIBS        += $$LIBORIGIN_LIBS
+ 	LIBS        += $$BOOST_LIBS
+ 	include(src/origin/origin.pri)
+ }
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch
new file mode 100644
index 000000000000..4e49da837bf0
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch
@@ -0,0 +1,12 @@
+diff --git a/qtiplot/src/origin/importOPJ.cpp b/qtiplot/src/origin/importOPJ.cpp
+index 5abb0be..b9c1408 100755
+--- a/qtiplot/src/origin/importOPJ.cpp
++++ b/qtiplot/src/origin/importOPJ.cpp
+@@ -790,7 +790,6 @@ bool ImportOPJ::importGraphs(const OriginFile& opj)
+ 					case Origin::GraphCurve::TextPlot:
+ 						style = Origin::GraphCurve::TextPlot;
+ 						break;
+-					case Origin::GraphCurve::XYZContour:
+ 					case Origin::GraphCurve::Contour:
+ 						style = Origin::GraphCurve::Contour;
+ 						break;
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch
new file mode 100644
index 000000000000..ff01934c302c
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch
@@ -0,0 +1,47 @@
+diff --git a/qtiplot/src/core/ApplicationWindow.cpp b/qtiplot/src/core/ApplicationWindow.cpp
+index 56c52a7..5422c0a 100755
+--- a/qtiplot/src/core/ApplicationWindow.cpp
++++ b/qtiplot/src/core/ApplicationWindow.cpp
+@@ -15912,6 +15912,7 @@ void ApplicationWindow::showBugTracker()
+ 	QDesktopServices::openUrl(QUrl("https://developer.berlios.de/bugs/?group_id=6626"));
+ }
+ 
++#ifdef QTIPLOT_SUPPORT
+ void ApplicationWindow::showDonationDialog()
+ {
+ 	QString s = tr("<font size=+2, color = darkBlue><b>QtiPlot is open-source software and its development required hundreds of hours of work.<br><br>\
+@@ -15927,6 +15928,7 @@ void ApplicationWindow::showDonationDialog()
+ 	if (msg->clickedButton() == btn)
+ 		showDonationsPage();
+ }
++#endif
+ 
+ void ApplicationWindow::parseCommandLineArguments(const QStringList& args)
+ {
+diff --git a/qtiplot/src/core/ApplicationWindow.h b/qtiplot/src/core/ApplicationWindow.h
+index 5c479f9..f973557 100755
+--- a/qtiplot/src/core/ApplicationWindow.h
++++ b/qtiplot/src/core/ApplicationWindow.h
+@@ -908,7 +908,9 @@ public slots:
+ 	void receivedVersionFile(bool error);
+ 	//!  called when the user presses the actionCheckUpdates
+ 	void searchForUpdates();
++#ifdef QTIPLOT_SUPPORT
+ 	void showDonationDialog();
++#endif
+ 	//! Open support page in external browser
+ 	void showSupportPage();
+ 	//! Open donation page in external browser
+diff --git a/qtiplot/src/core/QtiPlotApplication.cpp b/qtiplot/src/core/QtiPlotApplication.cpp
+index 69a5b0f..8c3637a 100755
+--- a/qtiplot/src/core/QtiPlotApplication.cpp
++++ b/qtiplot/src/core/QtiPlotApplication.cpp
+@@ -57,7 +57,7 @@ QtiPlotApplication::QtiPlotApplication( int & argc, char ** argv) : QApplication
+ 
+ 		ApplicationWindow *mw = new ApplicationWindow(factorySettings);
+ 		mw->restoreApplicationGeometry();
+-	#ifndef QTIPLOT_PRO
++	#ifdef QTIPLOT_SUPPORT
+ 		mw->showDonationDialog();
+ 	#endif
+ 		if (mw->autoSearchUpdates){
diff --git a/sci-visualization/qtiplot/metadata.xml b/sci-visualization/qtiplot/metadata.xml
index b46f12f838d1..f9a349ca3c04 100644
--- a/sci-visualization/qtiplot/metadata.xml
+++ b/sci-visualization/qtiplot/metadata.xml
@@ -9,12 +9,14 @@
   	<email>pva@gentoo.org</email>
 	<name>Peter Volkov</name>
 </maintainer>
-  <use>
-    <flag name="xls">Import support for Microsoft office excel sheets</flag>
-    <flag name="ods">Import support for OpenOffice .ods sheets</flag>
+	<use>
+		<flag name="emf">Export support for Windows Enhanced Metafile</flag>
+		<flag name="ods">Import support for OpenOffice .ods sheets</flag>
+		<flag name="origin">Import support for Origin project files</flag>
+		<flag name="xls">Import support for Microsoft office excel sheets</flag>
   </use>
   <longdescription>
-    Data analysis and scientific plotting package. This is a clone of the
+	Data analysis and scientific plotting package. This is a clone of the
 	popular Origin software available on another well known platform implemented
 	in Qt with powerful 2D and 3D data plotting, ASCII import and powerful
 	spreadsheet data manipulation using column logic. Curve fitting and other
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild
index c7324c149e27..23a5e1fb15f8 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.2.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.8.2.ebuild,v 1.5 2010/10/16 10:23:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild,v 1.6 2010/10/18 06:53:04 jlec Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc python ods"
+IUSE="doc ods python"
 
 LANGS="cn cz de es fr ja ro ru sv"
 for l in ${LANGS}; do
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.3.ebuild
index 82904190b1b5..be8dfe3140c9 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.3.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.3.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.8.3.ebuild,v 1.1 2010/10/16 10:23:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.3.ebuild,v 1.2 2010/10/18 06:53:04 jlec Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc python ods"
+IUSE="bindist doc emf latex ods origin png python xls"
 
 LANGS="cn cz de es fr ja ro ru sv"
 for l in ${LANGS}; do
@@ -31,14 +31,16 @@ CDEPEND="
 	x11-libs/qt-qt3support:4
 	|| ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
 	x11-libs/qt-svg:4
-	>=x11-libs/gl2ps-1.3.5
+	>=x11-libs/gl2ps-1.3.5[png?]
 	>=dev-cpp/muParser-1.32
 	>=dev-libs/boost-1.35.0
-	>=sci-libs/liborigin-20100903:2
 	sci-libs/gsl
-	dev-libs/boost
-	dev-tex/qtexengine
-	ods? ( dev-libs/quazip )"
+	emf? ( media-libs/emfengine media-libs/libemf )
+	latex? ( dev-tex/qtexengine )
+	ods? ( dev-libs/quazip )
+	origin? ( >=sci-libs/liborigin-20100913:2 dev-libs/boost )
+	png? ( media-libs/libpng )
+	xls? ( sci-libs/libexcelformat )"
 # Still unable to build
 #	emf? ( media-libs/libemf
 #		media-libs/emfengine )
@@ -53,12 +55,14 @@ RDEPEND="${CDEPEND}
 	python? ( dev-python/PyQt4[X] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.9.7.12-system-QTeXEngine.patch"
 	"${FILESDIR}/${PN}-0.9.7.14-system-liborigin.patch"
 	"${FILESDIR}/${PN}-0.9.7.12-system-gl2ps.patch"
 	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
 	"${FILESDIR}/${PN}-0.9.8.2-syslibs.patch"
-	"${FILESDIR}/${PN}-0.9.8.2-origin-build-failure.patch"
+	"${FILESDIR}/${P}-plot.patch"
+	"${FILESDIR}/${P}-origin.patch"
+	"${FILESDIR}/${P}-popup.patch"
+	"${FILESDIR}/${P}-odf.patch"
 	)
 
 pkg_setup() {
@@ -68,10 +72,10 @@ pkg_setup() {
 src_prepare() {
 	qt4-r2_src_prepare
 
-	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/}
-
+	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost}
+	sed "/3rdparty/d" -i qtiplot/src/origin/origin.pri
 	# Check build.conf for changes on bump.
-	cat >build.conf <<-EOF
+	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!" )
@@ -79,15 +83,10 @@ src_prepare() {
 
 	MUPARSER_LIBS = \$\$system(pkg-config --libs muparser)
 	GSL_LIBS = \$\$system(pkg-config --libs gsl)
-	BOOST_INCLUDEPATH = "${EPREFIX}/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
 	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
 	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-	LIB_ORIGIN_INCLUDEPATH = "${EPREFIX}/usr/include/liborigin2"
-	LIB_ORIGIN_LIBS = -lorigin2
-	QTEXENGINE_LIBS = -lQTeXEngine
 	SYS_LIBS = -lgl2ps
 
 	PYTHON = python
@@ -102,7 +101,26 @@ src_prepare() {
 
 	EOF
 
+	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
 	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use xls && echo "XLS_LIBS = -lExcelFormat" >> build.conf
+	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
+	use png && echo "LIBPNG_LIBS = -lpng" >> build.conf
+
+	if	use emf; then
+		echo "EMF_ENGINE_LIBS = -lEmfEngine -lEMF" >> build.conf
+		echo "EMF_ENGINE_INCLUDEPATH = \"${EPREFIX}/usr/include\"" >> build.conf
+		sed 's:/usr/local/lib/libEMF.a:-lEMF:g' -i qtiplot/qtiplot.pro || die
+	fi
+
+	if use origin; then
+		cat >> build.conf <<- EOF
+		BOOST_INCLUDEPATH = "${EPREFIX}/usr/include/boost"
+		BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
+		LIBORIGIN_INCLUDEPATH = "${EPREFIX}/usr/include/liborigin2"
+		LIBORIGIN_LIBS = -lorigin2
+		EOF
+	fi
 	if use ods; then
 		echo "QUAZIP_INCLUDEPATH = ${EPREFIX}/usr/include/quazip" >> build.conf
 		echo "QUAZIP_LIBS = -lquazip" >> build.conf