Fix building against qt-4.8, #399829

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

5 files changed, 49 insertions, 23 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index a62a92148227..95e63c9a8e5b 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.87 2012/01/22 14:20:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.88 2012/01/30 12:12:04 jlec Exp $
+
+  30 Jan 2012; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.9.ebuild,
+  qtiplot-0.9.8.9-r1.ebuild, +files/qtiplot-0.9.8.9-qt48.patch:
+  Fix building against qt-4.8, #399829
 
 *qtiplot-0.9.8.9-r1 (22 Jan 2012)
 
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index de13425ba973..61677d78a03c 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -20,6 +20,7 @@ AUX qtiplot-0.9.8.6-tamuanova.patch 894 RMD160 f71ef91129284035e378e55a60e61448b
 AUX qtiplot-0.9.8.7-kde.patch 454 RMD160 dd38d3a9e4c1034fff061f7bc4e6ef95aa07ee10 SHA1 cc2734760b55a53c1cc7de89dd8de57ee7611565 SHA256 5cfe122907403ed1f766118934aa42eac05db41efabd0c6618df17af16e3aff1
 AUX qtiplot-0.9.8.8-system-gl2ps.patch 2436 RMD160 4ef13f2ff717759a882e91169bc81a167dc08b9e SHA1 cdbb846d85372720021b52c71f86e5230f913e32 SHA256 0787155b465aa6cdf4b2c12a87dd68e6b5aa2197b041b06a550023c1ca96c81c
 AUX qtiplot-0.9.8.9-origin-2.patch 1715 RMD160 15cef2683087f8b4f15dcb9798d7e6d0397ddd0a SHA1 9c0f4ee5c42367f2011826886f775ba1e1b5e5a7 SHA256 31b842536b4bb98e9bbe49cd0a86bae7639f108c09f5d8eecd4e159740b0ce3b
+AUX qtiplot-0.9.8.9-qt48.patch 984 RMD160 79f21b79484d9ef6f2798f406722982bd25e1390 SHA1 a91447800c37f5a302fe5c4c726beeb63451f394 SHA256 e434763efdad1693dadd7c94d5871d4b5d808ceebbaf7b2acd434b9b6166eb29
 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
 DIST qtiplot-0.9.8.3.tar.bz2 8195869 RMD160 864e45bd9e74f3dd7526c84d387ab88438c1ee70 SHA1 e5ffdd25f1f69611f3f39a0b22e8c23959ab51e1 SHA256 9c8b89c4b931db2d51a902cb74c87f14cdef4e0ab33127ae59196429ae3ab4a7
@@ -38,24 +39,14 @@ EBUILD qtiplot-0.9.8.5.ebuild 5331 RMD160 28fd64588c35cb641c64e9100bb0a4e749aa10
 EBUILD qtiplot-0.9.8.6.ebuild 5588 RMD160 c2ecf35156578918fc6bd92628af341e28a5d40f SHA1 dade73496bf579d3c18a1fc5e881cfedd8222432 SHA256 8e49b91599c4334a7a454ad07b30214783ff94dc63acd4892521d61e4e1ff5bd
 EBUILD qtiplot-0.9.8.7.ebuild 5561 RMD160 81e8cac2a30b289a957ff8f8770de9771a9eb858 SHA1 6bcb4900edf5bbe3e5b539e561ac6427aea09eb1 SHA256 bff735cd67a777db17882442cfc461588319b55e2c6244b83a6989e1c0f7ba65
 EBUILD qtiplot-0.9.8.8.ebuild 5605 RMD160 97def6b6c419cf44a9c5854a5c756b0d807a9ab0 SHA1 ef151e1241b4883a767fb644cfde44da20da7341 SHA256 a7568b7bceebd1ccc6a2955258e9eb86dee90a1eca69033cd181d4d852e3359d
-EBUILD qtiplot-0.9.8.9-r1.ebuild 5828 RMD160 7bc9ac6ef8efa970a3308c880c8b476f08e84fe7 SHA1 ef2f64fdf7514859590d373f7b80b4f5811fa10b SHA256 34d01c6de2bc632fe1d047a4650d693e67d1b3d9ca5fd724f3317087158be6c5
-EBUILD qtiplot-0.9.8.9.ebuild 5609 RMD160 e2cd1cbdc865c27ae49edc797e6c0c255be982d8 SHA1 3a1ec5ef3d671d651f869eec0852a1b8a6d87781 SHA256 eb2541d996b2fb1f407a47b16f83152d6022e71808871c23b462901625069c28
-MISC ChangeLog 20981 RMD160 bd388eddedfc1bd0d7b218d417839acfb481f6d2 SHA1 aa64360a534161b05ea4bbfd4a698db250e39a04 SHA256 0f9b9f46861d4747cd0a23c8c220ebc72933a89341ba30a1bd7f111b0f96a675
+EBUILD qtiplot-0.9.8.9-r1.ebuild 5860 RMD160 35b48cad3f26cd198ad0a0973a80dc4077d9ac39 SHA1 d73edf0e4efdad2a54c57e583c11ca85de68ef19 SHA256 5a4a584caad405e369eab610ca57b897d84729156a43e92425beb1c19a783169
+EBUILD qtiplot-0.9.8.9.ebuild 5646 RMD160 53531184a024abde2622cfa5bb747f046a0b27a3 SHA1 96bb10cfee6950300f57994ada42263cc720ef16 SHA256 44ab454d36f6085a26c7c74323d6852b46a1ef722b6754ea845ed45226906dd7
+MISC ChangeLog 21151 RMD160 c83edd90063db9f1beb4e68da88c9e645f026d73 SHA1 61f46f5a6e72da28638e1f76001b536672736a94 SHA256 15f974d8524d5c2cf52c7ed4b8dee90e20a011e7e6b52167722edb3456b10b5c
 MISC metadata.xml 919 RMD160 d5a42a5872798c2f2f3a0c8ca241a15444a6f8b9 SHA1 1117f722c109e074538193ded0c6a5c5c8334dc7 SHA256 379fdffaca2a9a4769a8bfd3d6c38efca329faf1382b9e9013a2b1f4262a42ec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPHBtTAAoJENwGBM22xffeehMP/3Yakyom6vRpdBV+rwxZ+RhJ
-Gq0VAM7Lp7Fh8cYphXn8nAEmfZCgdW+3nQtEDwZ9xYS0wwEUl2b6Az2yi8cFAJ5R
-g394IOTLAUz7fHNpTVRFlKQ+mvoWtRU9AcSjBWDASwNuRswf1YwPE4gY1fsGDxMU
-qwKFAWWo6wRljqdBeS1TjCtxjXowX9PgAmRBsPGuxRcgJat9x6UZJSCRrsQ7FvRR
-08OZC/pbbmNgpGQ0X40wcAbd/V0fftyccQpvBVocDtV1jlzJMM3DisQggiIRswys
-uHdhRE1bEKcCq66x2jhqJ+cEPLeV/MJJ48cfqNz+XYHnlcQjoKVgGOizEY/WND/B
-5BLQbqot40HstyZ8wq6PqrMGJYeNUYceVlbjUXyiVen/KgviAbxmxly7yNm/1UyU
-tCSc7yF7DR81oHHdnqUKDIGf/SYy1URM5mNSbzWpr7yRUlUa5v0VGFeZlB93xs+J
-QTxtn9fSkOPAopPrTJiT3Y/YqZkVf0bgZcBETGkUfdqRWRsgULHJy+jIcJdSS2or
-CwqvYEThL5roYdSOEVxJfc8jCMP8ghq78shGkteTwwewvmkTg6A6trmRqkaQQa5f
-2DmFuvp5Ya/X7vRf3WM0fw0/keMH2DbJRBioxRnCyc0PHbOyx3hZEflOuoDIlGqM
-Nc3z8ZyYrspk+lladRn7
-=/qWi
+iEYEAREKAAYFAk8miRkACgkQgAnW8HDreRaVggCg0DvK1/mv+e+zR98ZEYu6STqF
+etwAnRIK1R5LgoUv1Kjz8Whf8WHOkKcd
+=C3+0
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch
new file mode 100644
index 000000000000..31c8a5ee7af2
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch
@@ -0,0 +1,29 @@
+ 3rdparty/qwtplot3d/include/qwt3d_openglhelper.h |    2 ++
+ qtiplot/src/plot3D/Cone3D.cpp                   |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+index 0ee80de..3d02e3f 100755
+--- a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
++++ b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+@@ -8,6 +8,8 @@
+ #include <QtOpenGL/qgl.h>
+ #endif
+ 
++#include <GL/glu.h>
++
+ namespace Qwt3D
+ {
+ 
+diff --git a/qtiplot/src/plot3D/Cone3D.cpp b/qtiplot/src/plot3D/Cone3D.cpp
+index 16df12d..169d5c7 100755
+--- a/qtiplot/src/plot3D/Cone3D.cpp
++++ b/qtiplot/src/plot3D/Cone3D.cpp
+@@ -27,6 +27,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ #include <math.h>
++#include <GL/glu.h>
+ #include "qwt3d_color.h"
+ #include "qwt3d_plot.h"
+ #include <qwt3d_curve.h>
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild
index efc576e12a8f..c707e8b34769 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.9-r1.ebuild,v 1.1 2012/01/22 14:20:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild,v 1.2 2012/01/30 12:12:04 jlec Exp $
 
 EAPI=3
 
@@ -58,6 +58,7 @@ RDEPEND="${CDEPEND}
 PATCHES=(
 	"${DISTDIR}/${P}-origin.patch.bz2"
 	"${FILESDIR}/${P}-origin-2.patch"
+	"${FILESDIR}/${P}-qt48.patch"
 	"${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch"
 	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
 	"${FILESDIR}/${PN}-0.9.8.6-gold.patch"
@@ -95,7 +96,7 @@ src_prepare() {
 	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
-	SYS_LIBS = -lgl2ps ${mylibs}
+	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
 
 	PYTHON = python
 	LUPDATE = lupdate
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild
index 2b6d21309452..f101257a1e14 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.9.ebuild,v 1.1 2011/12/22 15:45:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild,v 1.2 2012/01/30 12:12:04 jlec Exp $
 
 EAPI=3
 
@@ -53,6 +53,7 @@ RDEPEND="${CDEPEND}
 	python? ( dev-python/PyQt4[X] )"
 
 PATCHES=(
+	"${FILESDIR}/${P}-qt48.patch"
 	"${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch"
 	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
 	"${FILESDIR}/${PN}-0.9.8.6-gold.patch"
@@ -90,7 +91,7 @@ src_prepare() {
 	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
-	SYS_LIBS = -lgl2ps ${mylibs}
+	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
 
 	PYTHON = python
 	LUPDATE = lupdate