summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-10-27 16:49:07 +0000
committerJustin Lecher <jlec@gentoo.org>2014-10-27 16:49:07 +0000
commitfd7eb66e475b7600ec4fe22e68b3c8ffb9897770 (patch)
tree31b5c7626a683b9b58f9be4e6ec0483e038e7a78 /sci-visualization
parentsci-visualization/qtiplot: Add fix for >PyQt4-4.10 (diff)
downloadgentoo-2-fd7eb66e475b7600ec4fe22e68b3c8ffb9897770.tar.gz
gentoo-2-fd7eb66e475b7600ec4fe22e68b3c8ffb9897770.tar.bz2
gentoo-2-fd7eb66e475b7600ec4fe22e68b3c8ffb9897770.zip
sci-visualization/qtiplot: Cleaned patch
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/qtiplot/ChangeLog6
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch15
2 files changed, 10 insertions, 11 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index dca08a1a02b5..2cba4b7d2c67 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-visualization/qtiplot
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.106 2014/10/27 16:48:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.107 2014/10/27 16:49:07 jlec Exp $
+
+ 27 Oct 2014; Justin Lecher <jlec@gentoo.org>
+ files/qtiplot-0.9.8.9-PyQt4-4.10.patch:
+ Cleaned patch
27 Oct 2014; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.9-r2.ebuild,
+files/qtiplot-0.9.8.9-PyQt4-4.10.patch:
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
index db6b459180ba..a011782550d6 100644
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
@@ -1,25 +1,20 @@
- qtiplot/python-sipcmd.py | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
+ qtiplot/python-sipcmd.py | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py
-index f643194..00edb6f 100755
+index f643194..d8d1ef2 100755
--- a/qtiplot/python-sipcmd.py
+++ b/qtiplot/python-sipcmd.py
-@@ -27,6 +27,26 @@
+@@ -27,6 +27,21 @@
# #
############################################################################
-from PyQt4 import pyqtconfig
-config = pyqtconfig.Configuration()
-print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
-+#from PyQt4 import pyqtconfig
-+#config = pyqtconfig.Configuration()
-+#print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
+from __future__ import print_function
-+#import sipconfig
++
+import os
-+#config = sipconfig.Configuration()
-+#print("sip -I %s -t WS_X11 -t Q_WS_X11" % (os.path.join(config.default_sip_dir, "PyQt4")))
+import sipconfig
+import PyQt4.QtCore
+