Added patch to fix compile problems with python disabled (#246473).

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-SENTINEL-2 i686

4 files changed, 72 insertions, 4 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index b460868c6f1f..19bcc6cce651 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.36 2008/10/24 22:50:43 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.37 2008/11/14 14:04:46 markusle Exp $
+
+  13 Nov 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/qtiplot-0.9.7.3-no-python.patch, qtiplot-0.9.7.3.ebuild:
+  Added patch to fix compile problems with python disabled (#246473).
 
 *qtiplot-0.9.7.3 (24 Oct 2008)
 
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 9ef6f31eef53..4a22151a24b3 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -5,6 +5,7 @@ AUX qtiplot-0.9.6.2-pro.patch 2707 RMD160 ecf6c26ff4aa2269a2e4f698490b4999a1db0a
 AUX qtiplot-0.9.7-gcc4.3.patch 668 RMD160 4c4a4b6da2cb235a5d6af7866ef5526fc77fea72 SHA1 da38423aca779a3cb68ba91f50d036c807b5a0bd SHA256 1c729cddaf606fab563f1c8409fe80d37898f00836ff6498b63ffa6ac954afc5
 AUX qtiplot-0.9.7.2-liborigin-gcc4.3.patch 478 RMD160 aed7f2a772422df874144983261e22b29d9dae5c SHA1 0557981aad551dda9ad79f813acc3f00b54fc278 SHA256 239d40c778f00f55247a450c5fe9b5923d28360930aa4da48686f796f3a48068
 AUX qtiplot-0.9.7.2-pro.patch 2801 RMD160 520d78a8fac28567b8edaf8195c0c34285e77f5c SHA1 377a610c852fa40b322b839325616f4e4101430d SHA256 559d5ce6eacf5df1f08cd835582f8ce22444be5fe756543df0320f765d4a3e70
+AUX qtiplot-0.9.7.3-no-python.patch 1747 RMD160 03f86f741e84e0c2aedde9cc7915c7eaa5ec7608 SHA1 15869d3728c0456e5a2b2c26f606a1117a3e526d SHA256 7f579f499dca8afca404c700255ec2e8f4148ababd0f40dadcc7026f42bcfe25
 AUX qtiplot-0.9.7.3-pro.patch 6899 RMD160 c1e0d832ff580ae0fe6ada3bbb6c12f57e495321 SHA1 badc6ee0613d40ebdbe78a9a74730e253d8824f0 SHA256 a1941673150536446cad5d8b45bb0665be8a3c06a8adb8530960dad9d59af35c
 AUX qtiplot-0.9.7.3-qwt3d.patch 843 RMD160 02273d1f407a7c5901671ad5008860b0ad01d381 SHA1 0824134197bd971bdfd5f978bbfc0ee38a55e07e SHA256 7ff5823103bbd13b99cc5e5de0b34539cc2db24280cf95874303e9f60b686abe
 DIST qtiplot-0.7.7.zip 812738 RMD160 6f62b32059eec57bf931b5bae9f524672d436ee9 SHA1 b201e600ec057ff0f7b4b4572850b0b072a0e0fb SHA256 937849c42cc3047df3975d1cb7a26a2503a499d548066937589340f55bd1ab01
@@ -15,6 +16,6 @@ DIST qtiplot-0.9.7.3.tar.bz2 6714565 RMD160 406bda2fb9c3c3de92e6e871cfece0d4613d
 EBUILD qtiplot-0.7.7.ebuild 1095 RMD160 a5ccfad6cdadadf0f11600f9b8114f9c7fb8ae2b SHA1 e6008083cbd394f979d675035c6c11fb6771fc26 SHA256 b4019c8262709376fc6d2d6fc34150da0d1079db79718d3c50adc06ed3f95c03
 EBUILD qtiplot-0.8.5.ebuild 1215 RMD160 e34d3e44ffcc28647798ef7619dfeaa1e4789adc SHA1 d3dae0497b8b4e2b5b5b889e8dc399a443dad549 SHA256 f98a4f12419637657977c68d340bd826ad6267ed61413e4015690437c693fa9b
 EBUILD qtiplot-0.9.7.2.ebuild 3232 RMD160 8affd1f099b3a3ca9bb9de85ad17c1f82e4b1d1b SHA1 84d520b18a5afaf93c09c134bd3dd1d9d80e5eb3 SHA256 da1521c6a53b37ab4b82fa2a8ccf5a3caff1f9254efd2b20d95066f214dde29c
-EBUILD qtiplot-0.9.7.3.ebuild 3287 RMD160 3b1e9a07c08e56e92500b217bd22e99b3ac6ee54 SHA1 c2b3f8d67c645a8cef023132e6725fc171057993 SHA256 e21b61a8659f887600a3d6eff7d28e2a6be0fb1ea4dc950371b0af2e84c988e8
-MISC ChangeLog 9727 RMD160 7b7cafecd4025a15db67a6a55b027ed616b6d709 SHA1 3c20769f4dbf573ba5f21c2622280f80ece2700a SHA256 11d797bae36a742d576ff826a5a62d5eff9e4d7dac92d3bc1bd815cc0d16a0cd
+EBUILD qtiplot-0.9.7.3.ebuild 3330 RMD160 c0f6a3b4dadd5d08f7aea2c2a5ef3de3ddf1bb7c SHA1 c97ca0d74cbcd293bc716a0fac2caa5288c799ce SHA256 9a176d2373d198291095bd85d715726a09339633fa00128effb4eae73a9bad21
+MISC ChangeLog 9917 RMD160 3df2e04294abf437abd64a65094ecb03b0db2718 SHA1 dbbbb008fc1d4cd71beeb426a89c1723fd3f83f6 SHA256 0ad6e53ad4c6c46aeb8aceebeab02230e972f2bda7541fab2b253b767e7ff37e
 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch
new file mode 100644
index 000000000000..841ac78df38e
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch
@@ -0,0 +1,62 @@
+diff -Naur qtiplot-0.9.7.3/qtiplot/src/scripting/ScriptEdit.cpp qtiplot-0.9.7.3.new/qtiplot/src/scripting/ScriptEdit.cpp
+--- qtiplot-0.9.7.3/qtiplot/src/scripting/ScriptEdit.cpp	2008-10-20 11:59:25.000000000 -0400
++++ qtiplot-0.9.7.3.new/qtiplot/src/scripting/ScriptEdit.cpp	2008-11-13 09:10:48.000000000 -0500
+@@ -28,7 +28,11 @@
+  ***************************************************************************/
+ #include "ScriptEdit.h"
+ #include "Note.h"
++
++#ifdef SCRIPTING_PYTHON
+ #include "PythonSyntaxHighlighter.h"
++#endif
++
+ #include "FindReplaceDialog.h"
+ 
+ #include <QAction>
+@@ -58,9 +62,11 @@
+ 	setTextFormat(Qt::PlainText);
+ 	setAcceptRichText (false);
+ 
++#ifdef SCRIPTING_PYTHON
+ 	if (scriptEnv->name() == QString("Python"))
+ 		d_highlighter = new PythonSyntaxHighlighter(this);
+-	
++#endif
++
+ 	d_fmt_default.setBackground(palette().brush(QPalette::Base));
+ 	d_fmt_failure.setBackground(QBrush(QColor(255,128,128)));
+ 
+@@ -142,6 +148,7 @@
+ 		connect(myScript, SIGNAL(error(const QString&, const QString&, int)), this, SLOT(insertErrorMsg(const QString&)));
+ 		connect(myScript, SIGNAL(print(const QString&)), this, SLOT(scriptPrint(const QString&)));
+ 
++#ifdef SCRIPTING_PYTHON
+ 		if (scriptEnv->name() == QString("Python") && !d_highlighter)
+ 			d_highlighter = new PythonSyntaxHighlighter(this);
+ 		else {
+@@ -149,6 +156,7 @@
+ 				delete d_highlighter;
+ 			d_highlighter = 0;
+ 		}
++#endif
+ 	}
+ }
+ 

+@@ -585,13 +593,16 @@
+ 
+ void ScriptEdit::rehighlight()
+ {
++#ifdef SCRIPTING_PYTHON
+ 	if (scriptEnv->name() != QString("Python"))
+ 		return;
+-
++#endif
+ 	if (d_highlighter)
+ 		delete d_highlighter;
+ 
++#ifdef SCRIPTING_PYTHON
+ 	d_highlighter = new PythonSyntaxHighlighter(this);
++#endif
+ }
+ 
+ void ScriptEdit::showFindDialog(bool replace)
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild
index be9b972f15da..706c7f0890aa 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.3.ebuild,v 1.1 2008/10/24 22:50:43 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild,v 1.2 2008/11/14 14:04:46 markusle Exp $
 
 EAPI="1"
 inherit eutils multilib qt4 fdo-mime python
@@ -49,6 +49,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-qwt3d.patch
 	epatch "${FILESDIR}"/${PN}-0.9.7-gcc4.3.patch
 	epatch "${FILESDIR}"/${PN}-0.9.7.2-liborigin-gcc4.3.patch
+	epatch "${FILESDIR}"/${P}-no-python.patch
 
 	sed -i \
 		-e '/manual/d'\