Fix for qt-*[kde] creating src/plot2D/Graph.cpp:5989:46: error: invalid use of incomplete type 'struct QPaintEngine', #367503; Gold resistance

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

6 files changed, 61 insertions, 19 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 245b9af63425..19646b2f8eb5 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.79 2011/05/11 08:58:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.80 2011/07/05 09:54:28 jlec Exp $
+
+  05 Jul 2011; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.6.ebuild,
+  +files/qtiplot-0.9.8.6-gold.patch, +files/qtiplot-0.9.8.6-kde.patch,
+  metadata.xml:
+  Fix for qt-*[kde] creating src/plot2D/Graph.cpp:5989:46: error: invalid use
+  of incomplete type 'struct QPaintEngine', #367503; Gold resistance
 
   11 May 2011; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.6.ebuild:
   Fixes for Prefixed installation
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 2b0ca4865946..7d963a543924 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 RMD160 e68908d5ca887e64fe99bed21ea7d1d746f5409d SHA1 23089d7955cc15f6e56e3401266421cae24975c3 SHA256 161657d37de71ea58fc0e0af3495dc45082f5c398bd82c70e40968b23d0b898b
 AUX qtiplot-0.9.7.12-system-QTeXEngine.patch 2390 RMD160 4e96caac6fe930b27dfd503354417078bfedfe34 SHA1 25f548a4c6e76a39dc72b44c4e975f13897f1d8f SHA256 9bb277a4bee32037067561ac19a1eb4bd8cf4f7b53edcea896c9f0c036dcccff
@@ -14,6 +14,8 @@ AUX qtiplot-0.9.8.3-origin.patch 430 RMD160 7c3bfbea5d1c42cf01a59452a9b8551b50dd
 AUX qtiplot-0.9.8.3-plot.patch 502 RMD160 e40109ded4a1a9d2b3a95ed71231b8db509f8d3e SHA1 9d1fb8c4ed2717b327e2fe0dcc88ffa0cd9e8255 SHA256 924b973f3f7ab3e7e0a76cb641a7c832401d52f00333c2033ee8980ffc503af5
 AUX qtiplot-0.9.8.3-popup.patch 1892 RMD160 b07794d6b46396ea4df9a7084f01c7c0466dc9e5 SHA1 0bf1d6332e1e2a32880dfd0c753f0ffd8f05e64e SHA256 5c2cebb201408c111494afa7624d0e9d53dcbb2d5dcd2b1f7899af366d73efaf
 AUX qtiplot-0.9.8.5-tamuanova.patch 2057 RMD160 2822b0e410bc819e1bc5d0bea7819ba2122117fc SHA1 d46045ac63cdb7735121120054705be5c37f0649 SHA256 ca67848d04c61253ac776adae439a3f1d68095760278d59668900442595eb739
+AUX qtiplot-0.9.8.6-gold.patch 535 RMD160 9153e4a2f83b2f55585ef2aec44f151eb424f7b7 SHA1 b534a609f317cf3117d6495909854cdacea20124 SHA256 601bdea70053618be63f446c7c35fc991587a5ca439260d75bcb84308d116784
+AUX qtiplot-0.9.8.6-kde.patch 425 RMD160 428d0b2304b02e4e70264c4100be604bca0af1db SHA1 a1d4bec744c9b8fe29bf177851e66c97cdd9d975 SHA256 4e67a67c9467290930d21460cc326ac7b5d89322b7b020d32b46a04a77d14f84
 AUX qtiplot-0.9.8.6-tamuanova.patch 894 RMD160 f71ef91129284035e378e55a60e61448ba914e04 SHA1 830b518e3ef63625df84363a8047417124f243b0 SHA256 8c4deccaf3fa09133ac6ae35327a73637dccff0a4edfaa427894a9c6592e7f4c
 DIST qtiplot-0.9.7.14.tar.bz2 8119824 RMD160 09bf50211c77159dad674fcab4f9772fe4267947 SHA1 3e31b2c3fea827a573da96fb50118e6d9cc33f4b SHA256 10edfe55651d0e82f87b10b53fe068cee54782d1df2cbf482a7bafcc27eb3d18
 DIST qtiplot-0.9.8.2.tar.bz2 8244887 RMD160 0ee5e9f5eb50c44b2666cf904ef7ff23850c4c0b SHA1 dd8d1003cee8767d4ba9e616e5263da1302c290d SHA256 f544a42a1b103c1fb8cf28f00313fc984fac6ed5d7748a511e726410612e2c02
@@ -26,13 +28,13 @@ EBUILD qtiplot-0.9.8.2.ebuild 5375 RMD160 70ab10972c0b90fad943b58b4b4a87c7e8fb3b
 EBUILD qtiplot-0.9.8.3.ebuild 6167 RMD160 f3394e726b85cceed7ac617d523009d132157a66 SHA1 ff47b797ecbd4dfe99160e87abe01da37c988eac SHA256 6d8cb9a6005c99ad5c2011c287331d07dfc66b9d9dd104d4fcf345f1cbcad042
 EBUILD qtiplot-0.9.8.4.ebuild 5071 RMD160 3bd6dcbcaa496e626cd1c44f9efd3a2e5e61cbea SHA1 ca6aee98d6c87bc7696d3b28c4ebd7e04c77769e SHA256 9147a247e17c385d36a6a46fa7b9586503dc0bc0d180b779057200a0e2a5d8ae
 EBUILD qtiplot-0.9.8.5.ebuild 5307 RMD160 72ea71383aad9255d1b91b1a77b6e1af567448a1 SHA1 46624e328366109c8b9ee9a17770b1ca6d36d69d SHA256 0d23912b8757ec12d720753fbd0398407bb8461215a42a115e6a9d4d873f8112
-EBUILD qtiplot-0.9.8.6.ebuild 5463 RMD160 3098a96b5b47ef4cf6e17cf84af7dcdbc4077709 SHA1 331a40b69026e0226d3501ffa91171c11ca894e8 SHA256 1ce88a68b329d080a3e70e60e83b8c0b085b70ac624f9053b113b55495b5a69e
-MISC ChangeLog 19286 RMD160 be8da2ccec7de9c7f493d8551b88601d591dc170 SHA1 194b4a64e572a7edc30d9a6014a693105d01810f SHA256 43111aa16436eb3a1d8b8441d225ea2681ffdb2eeb52d90880ba49d26576392a
-MISC metadata.xml 989 RMD160 cf1449138cf801f3fc3979c4fe40e3302023d447 SHA1 f0641601108c83fe92a01d46289690f96ecc13c5 SHA256 8bf244a880004c274083ba6ececebe326da0eab799dfee41910044c4ede564ab
+EBUILD qtiplot-0.9.8.6.ebuild 5564 RMD160 c50de7e832160b5897e585fa7be3d8f5292d69ab SHA1 9b3f79263c8be7b4843c07663d5b5d11149a1032 SHA256 c511e60f461f0af22be79227ab9f29fc22e78dbb7b52767dbcac0a95f25ea719
+MISC ChangeLog 19592 RMD160 3e8240258d3e9e71d7707492734d6e7fcf9b4f01 SHA1 475570ce810669bbece2fbb156bc90fc214f23f0 SHA256 c7d3a37622801a2c3634d8edd2c0aa70b37f39f51942267ab3b19c8932b34b7e
+MISC metadata.xml 982 RMD160 8977a9274843e67ae55c28badde9d582555c57bb SHA1 f08f7cea17b8dc6f0f44e5b68428b1425c466080 SHA256 370ad836239b97d4aec94403479dee0931a58c1d68269de3723c91c75a00052f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3KT8QACgkQgAnW8HDreRbxewCgtfT8bBpScbWaTDa6q8uy2RwT
-m2UAnAzixTeloyiCO1I2EklHLLN+fkgS
-=2B2z
+iEYEAREKAAYFAk4S32AACgkQgAnW8HDreRaUYwCgoMDPLpqmGe4EBueggA0merAI
+fdYAoI4KiqWUY+k2VNBSeTqZjbt6FHSe
+=3nq8
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch
new file mode 100644
index 000000000000..3b6757533a52
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch
@@ -0,0 +1,15 @@
+ qtiplot/qtiplot.pro |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index 99e0e36..b7cf373 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -20,6 +20,7 @@ LIBS         += $$MUPARSER_LIBS
+ LIBS         += $$QWT_LIBS
+ LIBS         += $$QWT3D_LIBS
+ LIBS         += $$GSL_LIBS
++LIBS         += -lz
+ 
+ #############################################################################
+ ###################### BASIC PROJECT PROPERTIES #############################
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch
new file mode 100644
index 000000000000..919ec6cc251e
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch
@@ -0,0 +1,15 @@
+ qtiplot/src/plot2D/Graph.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
+index 626172a..d4eab1b 100755
+--- a/qtiplot/src/plot2D/Graph.cpp
++++ b/qtiplot/src/plot2D/Graph.cpp
+@@ -73,6 +73,7 @@
+ #include <PatternBox.h>
+ #include <SymbolBox.h>
+ 
++#include <QPaintEngine>
+ #include <QApplication>
+ #include <QBitmap>
+ #include <QClipboard>
diff --git a/sci-visualization/qtiplot/metadata.xml b/sci-visualization/qtiplot/metadata.xml
index f9a349ca3c04..82527ea4f4ce 100644
--- a/sci-visualization/qtiplot/metadata.xml
+++ b/sci-visualization/qtiplot/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>cryos@gentoo.org</email>
-  </maintainer>
-  <maintainer>
-  	<email>pva@gentoo.org</email>
-	<name>Peter Volkov</name>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>cryos@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
 	<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>
+	</use>
+	<longdescription>
 	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
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.6.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.6.ebuild
index db8835aa0f53..ffb5fc5b1e7e 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.6.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6.ebuild,v 1.2 2011/05/11 08:58:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.6.ebuild,v 1.3 2011/07/05 09:54:28 jlec Exp $
 
 EAPI=3
 
@@ -27,6 +27,8 @@ done
 # qwtplot3d much modified from original upstream
 # >=x11-libs/qwt-5.3 they are using trunk checkouts
 CDEPEND="
+	x11-libs/qt-assistant
+	x11-libs/qt-gui
 	x11-libs/qt-opengl:4
 	x11-libs/qt-qt3support:4
 	|| ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
@@ -54,6 +56,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.9.7.12-system-gl2ps.patch"
 	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
 	"${FILESDIR}/${P}-tamuanova.patch"
+	"${FILESDIR}/${P}-gold.patch"
+	"${FILESDIR}/${P}-kde.patch"
 	)
 
 pkg_setup() {