Fixed for more recent versions of sip, and re-introduced minigzip since it is not distributed by zlib. Closing bug #274633

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 96 insertions, 31 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 04f04d60b47a..df1af57b6a7f 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.45 2009/07/29 04:13:59 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.46 2009/09/18 18:40:01 bicatali Exp $
+
+*qtiplot-0.9.7.7-r1 (18 Sep 2009)
+
+  18 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -qtiplot-0.9.7.7.ebuild, +qtiplot-0.9.7.7-r1.ebuild,
+  +files/qtiplot-0.9.7.7-sip.patch, files/qtiplot-0.9.7.7-syslibs.patch:
+  Fixed for more recent versions of sip, and re-introduced minigzip since it
+  is not distributed by zlib. Closing bug #274633
 
   29 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> qtiplot-0.9.7.7.ebuild,
   +files/qtiplot-0.9.7.7-gcc44.patch:
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 0980860bad2f..b89eefbfbe63 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -4,17 +4,18 @@ Hash: SHA1
 AUX qtiplot-0.7.7-qmake.patch 11384 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 SHA1 5cd18e99d39664ef48e0d18069d89cb4b417a175 SHA256 2d89427ab1304b1ec8165d6ceaedf474a48ba59d55dafbb4977b5ddaab8509ca
 AUX qtiplot-0.9.7.7-docbuild.patch 2179 RMD160 011a6f3c71f0c5993ddea8a0b679867f40fe6753 SHA1 aed721371c106d041eeabcac55b627eceaa84ae0 SHA256 f3b043e16d099edd45ad4f41af602627883859f91731efcac077e123189073b0
 AUX qtiplot-0.9.7.7-gcc44.patch 663 RMD160 6ba315028c09767d9bb5f7f31ae8c6a17d4a8a3b SHA1 47cad99fe3fcace29c0b11fd005ce2e75542fc00 SHA256 f282fc735a546eed42ab30c38215ff1d32d413c415a6575a7702f8445f392292
-AUX qtiplot-0.9.7.7-syslibs.patch 8389 RMD160 097c97a0a9dece2eec6489d9a5e3a592eeb97f73 SHA1 d74c06566603ff14a2707e19ade09c69694d1ac4 SHA256 3316d612bba76ad2017f3ed618a7fef517a413403bad5a4a81fb782df34715de
+AUX qtiplot-0.9.7.7-sip.patch 2575 RMD160 68e5dff2be6f15a5518db7a26dfcda4e7e20b6b0 SHA1 cbc797c2b9b033c496bcd1e702862a5f9ce0c829 SHA256 6d1005beb7067d76525191198e19bb18d629bcd894fee6c0912e0a2a75fb16c0
+AUX qtiplot-0.9.7.7-syslibs.patch 8389 RMD160 f8a8535892bca48862353edd72ec6001683bf10e SHA1 168b2af1336a0c81878614b1d9ba0d1f8d5a6877 SHA256 5094f599056f5516dd30e61f7de7807fe4778d49fbf3c63bb8b2df8e265182b6
 DIST qtiplot-0.7.7.zip 812738 RMD160 6f62b32059eec57bf931b5bae9f524672d436ee9 SHA1 b201e600ec057ff0f7b4b4572850b0b072a0e0fb SHA256 937849c42cc3047df3975d1cb7a26a2503a499d548066937589340f55bd1ab01
 DIST qtiplot-0.9.7.7.tar.bz2 6908502 RMD160 2843c6a614d62613bc383f9d7b678f6fb5df0e01 SHA1 52d93c01013925b43d1f8dc2b372b83c7b84f848 SHA256 6c1cf9425de5609eec98b0e29bd0b7a316ca8d513ea44a462cffacf8695f43b1
 EBUILD qtiplot-0.7.7.ebuild 1095 RMD160 a5ccfad6cdadadf0f11600f9b8114f9c7fb8ae2b SHA1 e6008083cbd394f979d675035c6c11fb6771fc26 SHA256 b4019c8262709376fc6d2d6fc34150da0d1079db79718d3c50adc06ed3f95c03
-EBUILD qtiplot-0.9.7.7.ebuild 2982 RMD160 0f3a53fa90c32b94fb006411a69a031bc49ed032 SHA1 6aaef5c7a8019d54d1708c2d4655c48465d7551f SHA256 c622f4f4b63e3b4a5fd42766fa8ce8c143eefcb6c25d8ec752ea4e0c46f6540c
-MISC ChangeLog 11627 RMD160 85d526b940e47ccf01150dfad10affd84d55bbef SHA1 92ec4236137f8ab984242ffab92f856f076a92f1 SHA256 6a5f5e27aab87beeade73a8070e8b630885c7915d8c36a6dd39b3f4f9a9b25c1
+EBUILD qtiplot-0.9.7.7-r1.ebuild 3051 RMD160 1e26e9d0d2722b388f1e1b1fea1dd9f058b8f34d SHA1 cd6337ded02ba4fbf1c6317d4b9649d358bbba51 SHA256 74c24604e35e4444c964239e00d797a304c7db0099add48ac491094cb8dea4cc
+MISC ChangeLog 11972 RMD160 a63e508d2111a6f0054019ad446bb7eae240feb9 SHA1 c90579ecf861488ef6e15ea076910b93253bed55 SHA256 58f2ea40e8ee97e2c6878dd8ca3ebc020933a43e0b1fdc434527ee22138d7195
 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpvzK4ACgkQiqiDRvmkBmKs6wCgt+81hmhOA0Bf4nxH+jxEfbuS
-1VcAoMEv5F1SUTPf72jpAajU9olSv3Hh
-=GkX2
+iEYEARECAAYFAkqz1AsACgkQ1ycZbhPLE2D2hQCaAuioSnTNHzDcCeCtnqdcrBJz
+Jg8An2bMFxdKRdVXsX4O9WBObXTB3C1I
+=pSBf
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-sip.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-sip.patch
new file mode 100644
index 000000000000..bef7966972f9
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-sip.patch
@@ -0,0 +1,55 @@
+diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/matrix/Matrix.h qtiplot-0.9.7.7/qtiplot/src/matrix/Matrix.h
+--- qtiplot-0.9.7.7.orig/qtiplot/src/matrix/Matrix.h	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/qtiplot/src/matrix/Matrix.h	2009-09-18 18:39:50.000000000 +0100
+@@ -137,6 +137,7 @@
+ 	void setColorMapType(ColorMapType mapType);
+ 
+ 	QwtLinearColorMap colorMap(){return d_color_map;};
++	QwtLinearColorMap *colorMapPointer(){return &d_color_map;};
+ 	void setColorMap(const QwtLinearColorMap& map);
+ 	//! Used when restoring from project files
+ 	void setColorMap(const QStringList& lst);
+diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/plot2D/Spectrogram.h qtiplot-0.9.7.7/qtiplot/src/plot2D/Spectrogram.h
+--- qtiplot-0.9.7.7.orig/qtiplot/src/plot2D/Spectrogram.h	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/qtiplot/src/plot2D/Spectrogram.h	2009-09-18 18:40:14.000000000 +0100
+@@ -62,6 +62,7 @@
+ 	void setDefaultColorMap();
+ 
+ 	QwtLinearColorMap colorMap(){return color_map;};
++	QwtLinearColorMap *colorMapPointer(){return &color_map;};
+ 	void setCustomColorMap(const QwtLinearColorMap& map);
+ 	void updateData(Matrix *m);
+ 
+diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/plot3D/Graph3D.h qtiplot-0.9.7.7/qtiplot/src/plot3D/Graph3D.h
+--- qtiplot-0.9.7.7.orig/qtiplot/src/plot3D/Graph3D.h	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/qtiplot/src/plot3D/Graph3D.h	2009-09-18 18:40:37.000000000 +0100
+@@ -274,6 +274,8 @@
+ 
+ 	QString colorMapFile(){return d_color_map_file;};
+ 	QwtLinearColorMap colorMap(){return d_color_map;};
++	QwtLinearColorMap *colorMapPointer(){return &d_color_map;};
++
+ 
+ 	static bool openColorMapFile(ColorVector& cv, QString fname);
+ 
+diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/scripting/qti.sip qtiplot-0.9.7.7/qtiplot/src/scripting/qti.sip
+--- qtiplot-0.9.7.7.orig/qtiplot/src/scripting/qti.sip	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/qtiplot/src/scripting/qti.sip	2009-09-18 18:19:15.000000000 +0100
+@@ -505,7 +505,7 @@
+ 	void setDefaultColorMap();
+ 	void setGrayScale();
+ 	void setRainbowColorMap();
+-	QwtLinearColorMap colorMap();
++	QwtLinearColorMap *colorMapPointer()/PyName=colorMap/;
+ 	void setColorMap(const QwtLinearColorMap&);
+ 
+ 	void resetView();
+@@ -993,7 +993,7 @@
+     void setDataColors(const QColor&, const QColor&);
+ 	QString colorMapFile();
+     void setDataColorMap(const QString& fileName);
+-	QwtLinearColorMap colorMap();
++	QwtLinearColorMap *colorMapPointer()/PyName=colorMap/;
+ 	void setDataColorMap(const QwtLinearColorMap&);
+ 
+     void changeTransparency(double) /PyName=setOpacity/;
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch
index 2ace5f295dac..e6162192ed5f 100644
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch
@@ -1,6 +1,6 @@
 diff -Nur qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pri qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pri
---- qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pri	2009-04-13 17:42:29.000000000 +0100
-+++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pri	2009-04-14 09:25:58.000000000 +0100
+--- qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pri	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pri	2009-09-18 19:29:12.000000000 +0100
 @@ -57,11 +57,11 @@
             ../3rdparty/qwtplot3d/include/qwt3d_multiplot.h

  

@@ -18,8 +18,8 @@ diff -Nur qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pri qtiplot-0.9.7.7/
  # zlib support for gl2ps

  zlib {

 diff -Nur qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pro qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pro
---- qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pro	2009-04-13 17:42:29.000000000 +0100
-+++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pro	2009-04-13 19:19:12.000000000 +0100
+--- qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pro	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pro	2009-09-18 19:29:12.000000000 +0100
 @@ -82,11 +82,10 @@
             include/qwt3d_multiplot.h
  
@@ -36,8 +36,8 @@ diff -Nur qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pro qtiplot-0.9.7.7/
  # zlib support for gl2ps
  zlib {
 diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/explin/explin.pro qtiplot-0.9.7.7/fitPlugins/explin/explin.pro
---- qtiplot-0.9.7.7.orig/fitPlugins/explin/explin.pro	2009-04-13 17:42:29.000000000 +0100
-+++ qtiplot-0.9.7.7/fitPlugins/explin/explin.pro	2009-04-13 19:32:36.000000000 +0100
+--- qtiplot-0.9.7.7.orig/fitPlugins/explin/explin.pro	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/explin/explin.pro	2009-09-18 19:29:12.000000000 +0100
 @@ -12,9 +12,8 @@
  DESTDIR           = ../

   

@@ -51,8 +51,8 @@ diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/explin/explin.pro qtiplot-0.9.7.7/fitP
  #dynamically link against GSL installed system-wide

  #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

 diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.7/fitPlugins/exp_saturation/exp_saturation.pro
---- qtiplot-0.9.7.7.orig/fitPlugins/exp_saturation/exp_saturation.pro	2009-04-13 17:42:29.000000000 +0100
-+++ qtiplot-0.9.7.7/fitPlugins/exp_saturation/exp_saturation.pro	2009-04-13 19:33:27.000000000 +0100
+--- qtiplot-0.9.7.7.orig/fitPlugins/exp_saturation/exp_saturation.pro	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/exp_saturation/exp_saturation.pro	2009-09-18 19:29:12.000000000 +0100
 @@ -12,9 +12,9 @@
  DESTDIR           = ../

   

@@ -67,16 +67,16 @@ diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/exp_saturation/exp_saturation.pro qtip
  #dynamically link against GSL installed system-wide

  #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

 diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitPlugins.pro qtiplot-0.9.7.7/fitPlugins/fitPlugins.pro
---- qtiplot-0.9.7.7.orig/fitPlugins/fitPlugins.pro	2009-04-13 17:42:29.000000000 +0100
-+++ qtiplot-0.9.7.7/fitPlugins/fitPlugins.pro	2009-04-13 19:34:21.000000000 +0100
+--- qtiplot-0.9.7.7.orig/fitPlugins/fitPlugins.pro	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/fitPlugins.pro	2009-09-18 19:29:12.000000000 +0100
 @@ -4,3 +4,4 @@
  	    exp_saturation \

  	    fitRational0 \

            fitRational1 

 +

 diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.7/fitPlugins/fitRational0/fitRational0.pro
---- qtiplot-0.9.7.7.orig/fitPlugins/fitRational0/fitRational0.pro	2009-04-13 17:42:29.000000000 +0100
-+++ qtiplot-0.9.7.7/fitPlugins/fitRational0/fitRational0.pro	2009-04-13 19:34:49.000000000 +0100
+--- qtiplot-0.9.7.7.orig/fitPlugins/fitRational0/fitRational0.pro	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/fitRational0/fitRational0.pro	2009-09-18 19:29:12.000000000 +0100
 @@ -12,9 +12,9 @@
  DESTDIR           = ../

   

@@ -91,8 +91,8 @@ diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-
  #dynamically link against GSL installed system-wide

  #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

 diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.7/fitPlugins/fitRational1/fitRational1.pro
---- qtiplot-0.9.7.7.orig/fitPlugins/fitRational1/fitRational1.pro	2009-04-13 17:42:29.000000000 +0100
-+++ qtiplot-0.9.7.7/fitPlugins/fitRational1/fitRational1.pro	2009-04-13 19:35:04.000000000 +0100
+--- qtiplot-0.9.7.7.orig/fitPlugins/fitRational1/fitRational1.pro	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/fitPlugins/fitRational1/fitRational1.pro	2009-09-18 19:29:12.000000000 +0100
 @@ -12,9 +12,8 @@
  DESTDIR           = ../

   

@@ -106,8 +106,8 @@ diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-
  #dynamically link against GSL installed system-wide

  #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

 diff -Nur qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro qtiplot-0.9.7.7/qtiplot/qtiplot.pro
---- qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro	2009-04-13 17:42:30.000000000 +0100
-+++ qtiplot-0.9.7.7/qtiplot/qtiplot.pro	2009-04-13 19:05:13.000000000 +0100
+--- qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/qtiplot/qtiplot.pro	2009-09-18 19:31:47.000000000 +0100
 @@ -21,7 +21,7 @@
  #CONFIG          += HAVE_EMF

  

@@ -117,7 +117,7 @@ diff -Nur qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro qtiplot-0.9.7.7/qtiplot/qtipl
  

  CONFIG          += release

  #CONFIG          += debug

-@@ -31,13 +31,12 @@
+@@ -31,13 +31,13 @@
  #!!! Warning: You must modify these paths according to your computer settings

  #############################################################################

  

@@ -127,7 +127,7 @@ diff -Nur qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro qtiplot-0.9.7.7/qtiplot/qtipl
 -INCLUDEPATH       += ../3rdparty/qwt/src

 -INCLUDEPATH       += ../3rdparty/liborigin

 -INCLUDEPATH       += ../3rdparty/gsl/include

--INCLUDEPATH       += ../3rdparty/zlib

+ INCLUDEPATH       += ../3rdparty/zlib

 -INCLUDEPATH       += ../3rdparty/boost_1_36_0

 +INCLUDEPATH       += /usr/include/qwt5

 +INCLUDEPATH       += /usr/include/liborigin2

@@ -136,7 +136,7 @@ diff -Nur qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro qtiplot-0.9.7.7/qtiplot/qtipl
  

  ##################### 3rd PARTY LIBRARIES SECTION ###########################

  #!!! Warning: You must modify these paths according to your computer settings

-@@ -46,12 +45,10 @@
+@@ -46,12 +46,10 @@
  ##################### Linux (Mac OS X) ######################################

  

  # statically link against libraries in 3rdparty

@@ -153,7 +153,7 @@ diff -Nur qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro qtiplot-0.9.7.7/qtiplot/qtipl
  

  # dynamically link against dependencies if they are installed system-wide

  #unix:LIBS         += -lmuparser

-@@ -213,8 +209,6 @@
+@@ -213,8 +211,6 @@
  

  contains(CONFIG, HAVE_LIBPNG){

  	DEFINES += GL2PS_HAVE_LIBPNG

@@ -163,8 +163,8 @@ diff -Nur qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro qtiplot-0.9.7.7/qtiplot/qtipl
  

  ###############################################################

 diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/origin/origin.pri qtiplot-0.9.7.7/qtiplot/src/origin/origin.pri
---- qtiplot-0.9.7.7.orig/qtiplot/src/origin/origin.pri	2009-04-13 17:42:30.000000000 +0100
-+++ qtiplot-0.9.7.7/qtiplot/src/origin/origin.pri	2009-04-13 19:17:43.000000000 +0100
+--- qtiplot-0.9.7.7.orig/qtiplot/src/origin/origin.pri	2009-09-18 18:16:33.000000000 +0100
++++ qtiplot-0.9.7.7/qtiplot/src/origin/origin.pri	2009-09-18 19:29:12.000000000 +0100
 @@ -4,14 +4,6 @@
  INCLUDEPATH += src/origin/

  

diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.7-r1.ebuild
index 43d6cbfc5243..ef02e7d1f3b5 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.7.ebuild,v 1.5 2009/07/29 04:13:59 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.7-r1.ebuild,v 1.1 2009/09/18 18:40:01 bicatali Exp $
 
 EAPI=2
 inherit eutils qt4 fdo-mime python
@@ -34,7 +34,7 @@ CDEPEND=">=x11-libs/qwt-5.2
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
-	python? ( >=dev-python/sip-4.5.2 )
+	python? ( dev-python/sip )
 	doc? ( app-text/docbook-sgml-utils
 		   app-text/docbook-xml-dtd:4.2 )"
 
@@ -48,6 +48,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-syslibs.patch
 	epatch "${FILESDIR}"/${P}-docbuild.patch
 	epatch "${FILESDIR}"/${P}-gcc44.patch
+	has_version ">=dev-python/sip-4.8" && epatch "${FILESDIR}"/${P}-sip.patch
 
 	python_version
 	sed -i \