Bump qwt to 6.0.2. Add mathml USE flag.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

5 files changed, 364 insertions, 8 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index aeb9484b9108..6f3d1392d2ed 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qwt
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.102 2012/08/31 06:51:31 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.103 2013/01/31 11:40:58 gienah Exp $
+
+*qwt-6.0.2 (31 Jan 2013)
+
+  31 Jan 2013; Mark Wright <gienah@gentoo.org>
+  +files/qwt-6.0.2-invalid-read.patch, +qwt-6.0.2.ebuild, metadata.xml:
+  Bump qwt to 6.0.2. Add mathml USE flag.
 
 *qwt-6.0.1-r1 (31 Aug 2012)
 
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index b86f8d1c4ad6..f753a9693d01 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qwt-6.0.2-invalid-read.patch 9447 SHA256 d063b36170af2c2ca12c44fa283cc1b387b97ce6c53f02f101db45ebed975b43 SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201 WHIRLPOOL 0a71af42f61e605f03c648dd21b74a3b3e6864ca956c9adf84eafe7d98ca6aec49ec23316137ea60a9d0c078f06ec39ac6ae3e02fc217b56b0d3f3f4608564f2
 DIST qwt-5.2.1.tar.bz2 1926453 SHA256 e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f
 DIST qwt-6.0.0.tar.bz2 2723203 SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e
 DIST qwt-6.0.1.tar.bz2 2437570 SHA256 3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2 SHA512 36fdd5344203586daa8b8283b6ae743fedd3f0685bc3405295868288de66827695b5e31e9a54231a3fe8aa0f3b008f1d0961ff9d89a201a4f5b14f7376b17610 WHIRLPOOL 2c6cf1bf0431cae719860414bcd17d3e682fdee785980a435f0d7a1a1b45584d200be1e6dcc352f4f56d3aa17262eea59953bbdeb27f2b5c84d72fa6af6b8bcf
+DIST qwt-6.0.2.tar.bz2 2688469 SHA256 2e699ac426d96aa14c86e4b7199d6b849c7f65010927ac9cf58f16761ee3281f SHA512 ddf5d50196cf8f3f33a2c935de891474d73b26e529bd4a8873d8c71d7d183242f9289f6ef4a0847c7ca067d30b593d0efc27944f77bb50027df932ea40e19c67 WHIRLPOOL 26e1de7bf7d56ebd72d82ba355a8b74bec289397d3ab70415f69974d7733756635564062a00a93df9763f1f9c14eff19de0aa0b6aec1dd4c098470ecd1381eea
 EBUILD qwt-5.2.1.ebuild 1735 SHA256 c767c7da79819341328ab2dca585185e451a0e67eb08b04f381320c71385c8cb SHA512 700de24ecf0291e2510aeeefb97cc96d450ff3751882955e0a9782cd52332fe613ef406ff4536b7297e4a9add22f955b7406d8f2aeb74de3e9be3282e286b225 WHIRLPOOL 02839bfafaabca03a3c290c5a7a00aead768c775d454e45000d9aa0c21b400d0437f6971849835f0519abba929e3eee000c05934ddf18203443f478ad2adc752
 EBUILD qwt-6.0.0.ebuild 2243 SHA256 d557ecd8f682501018f3c59bc5c0223857758b32684425ff229ccbf57f5192e0 SHA512 c971f35346703cda90ef675fdcfcccee0aba88543b7331ec530e2d4aa8b4498e558fc2fb931c2012982d3b5676d9a8d9a38b0bdd794cba1847407bed1881008c WHIRLPOOL 4711d3f98eabf71ff7bcf57839cae7ce591d060c26d882e22dea06962f79c34a17e13478f6e974d333445b22efb1391a55cf6388f8819ddf55692a54c0b4792e
 EBUILD qwt-6.0.1-r1.ebuild 2252 SHA256 ad1f4f550ccce7fef9ccb540a0842d86642d8e7ec3747de54a4a0f489c4f0968 SHA512 92a71a531e7678bb8ba825a47a2967de989c4809470579775a6c2ec7bee5b0c380cd4c5c22840e1971ec61ba64a4c12ca48c8d22bb104063d176d49e6b579d62 WHIRLPOOL d52506c60d0db5173551f68c4b5a718767918ee79dc537f234c5e906bf91993743838943eba10f1455381666fa603fef55abd130fcd180637a3b8d5968b912bf
 EBUILD qwt-6.0.1.ebuild 2249 SHA256 5492d1d8366916f154343f92ae3b98e03fb90acea50c21431e7e531b605bc893 SHA512 c31ae578dc4cf8d0cf11d0b96d146dd91f5b1b6e3ca93b6f7b3a12e75c623ff7a6324c5a1b29d4d30fda72f83789e8f2bfa94ba98ce99bff181b81cd82696e67 WHIRLPOOL e8772123f2757528d3ddd0705e9f10733d1f10f073ec176e4f27a00391463e8e277e670e3ad1533134361d8f22ab4498647e4f9af6a6e86d43ef95a82b49f92c
-MISC ChangeLog 13378 SHA256 4a278e64cd0dd64ae2bad27d9e9277d7c10621e8c59efb75d3ad353bf2a29ac1 SHA512 576cbc3b5247c15d7423b351d6b9330fc9f57c73d1c1dd1717b9953647c5c6c4b5eb6f928d641549a0820063affde31e320f6db6446ff9c564f9718f6a123ba0 WHIRLPOOL c1c9c103de002e766e1a73bac852c20c2c67847ac2f3a1889d59c5a11a5a223fdb462769ac76f86cd4b0fe7f41f4d171961b14df06b773be68e9301ca3b3e101
-MISC metadata.xml 512 SHA256 dde17ba1b9edc59f317425c2e33ec3177512cc066524e5ef5eeb55fe25439296 SHA512 18c9bfa02a98dde2f7c673944381269037ddf327b72d70731af8dc5cfa5ca65a2fa331548647dd39f683cccecab585d2de3628dc935a71fe08f1c44025bc36c5 WHIRLPOOL ec62670b68c3fb9db56c7211f7fc67c3b4e364b075978563c4e6344544802625bdb3bd18fdbf761cb8e3def55faf3c7b5594e87f0bd7ae7a149b5a4aacd7d85f
+EBUILD qwt-6.0.2.ebuild 2539 SHA256 ce2254fa01b6bcf15010a6f3784df20c37ec5475c418d1558d8cc2885dc5fdec SHA512 b05e0ba8b337ab6e7459200a72fcfc53cc58e13d11f6915db202f46c97744fd395652826d88b358d8c76045f56c49b56aa2078e145134cd587ffe3dc7149a26b WHIRLPOOL 9ccfbd965621c4a9a433bbd8abfdc62ac474beb752e221809f91e8ae51ad92df55f1d3de35286e9e04c89c833d82856d79224263b8f661cc2549c1146b1acdbb
+MISC ChangeLog 13568 SHA256 79a530d2f08b34b853c467289af304754104145c6a8cff25d1e9a4bf5da61f8a SHA512 b74e21fab6b41cb2df1c7a9b70acc1a68e73b0fb64ee5aa9aa4f60d1e2ae7da2dba38f53920eb54f7718e3f70ca0052c7cda470c1cd0bb7c533266dc5356f5dc WHIRLPOOL 93182e1ea69b6902f64cf72443fcfe527003d4042b0b9d0dba291e6323091c4c2dd7370c5e3bd6bfa8a46ae2ef9a12d601d5c5bc0473018252f3625b548328d7
+MISC metadata.xml 607 SHA256 d32b815a1c1ecf695e6e21eb333211b47dc1f90f2085a79f20c84f269866b90f SHA512 7fd11fb9c4cbd4b7352b05d6236f5d1ea9366482c1a8dab7e362b700b8ae6118fd5015202bd644b6700814266017d13e8211ff50e11456131382d40dffcc5afe WHIRLPOOL 6ca2131cac55ecda4af629061fbae655383ffc7b4fb83b38b10ef1cdecd9f64adf4ecce6b3f9e500280490825b842dee012f6f5abada88befcf98563d46c9252
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBAXvkACgkQgAnW8HDreRYtRwCdHp9m5cG6YIehgmowFQZD6r/t
-KFUAoLh+bI++1K0QadLuiOKz2hQUTS7m
-=9pHy
+iF4EAREIAAYFAlEKWFkACgkQoBEVQmGOlx/edgD/Q0vd6kBS/dh8Cx4zHXREX+nc
+rEOvi793JCnxCVVIvcwBANMFWq995LqdelsyEhAVqEtiuSg/Q8f9M7Mk2anNFo9o
+=JPYx
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
new file mode 100644
index 000000000000..a225350990a0
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
@@ -0,0 +1,250 @@
+--- qwt-6.0.2-orig/textengines/mathml/qwt_mml_document.cpp	2012-12-01 00:22:46.752106265 +1100
++++ qwt-6.0.2/textengines/mathml/qwt_mml_document.cpp	2013-01-31 14:29:30.590197611 +1100
+@@ -4421,7 +4421,10 @@
+         if ( ok )
+             return value;
+         else
+-            qWarning( "Could not convert %s to form", value_str.toLatin1().data() );
++        {
++            QByteArray value_str_ba = value_str.toLatin1();
++            qWarning( "Could not convert %s to form", value_str_ba.data() );
++        }
+ 
+     }
+ 
+@@ -4658,7 +4661,10 @@
+                 continue;
+             }
+             else
+-                qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value.toLatin1().data() );
++            {
++                QByteArray value_ba = value.toLatin1();
++                qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value_ba.data() );
++            }
+         }
+ 
+         // Relatively sized column, but we failed to parse the factor. Treat is like an auto
+@@ -5167,7 +5173,8 @@
+     double factor = factor_str.toFloat( &float_ok );
+     if ( !float_ok || factor < 0 )
+     {
+-        qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
++        QByteArray value_ba = value.toLatin1();
++        qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
+         return 0;
+     }
+ 
+@@ -5196,7 +5203,8 @@
+         unit_size = QwtMmlNode::interpretSpacing( "1" + pseudo_unit, &unit_ok );
+         if ( !unit_ok )
+         {
+-            qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
+             return 0;
+         }
+     }
+@@ -5368,7 +5376,8 @@
+             return ( int )( em * factor );
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%sem\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%sem\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5384,7 +5393,8 @@
+             return ( int )( ex * factor );
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%sex\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%sex\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5406,7 +5416,8 @@
+         }
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%scm\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%scm\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5428,7 +5439,8 @@
+         }
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%smm\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%smm\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5450,7 +5462,8 @@
+         }
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%sin\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%sin\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5466,7 +5479,8 @@
+             return i;
+         else
+         {
+-            qWarning( "interpretSpacing(): could not parse \"%spx\"", value.toLatin1().data() );
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretSpacing(): could not parse \"%spx\"", value_ba.data() );
+             if ( ok != 0 )
+                 *ok = false;
+             return 0;
+@@ -5478,7 +5492,8 @@
+     if ( float_ok && i >= 0 )
+         return i;
+ 
+-    qWarning( "interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretSpacing(): could not parse \"%s\"", value_ba.data() );
+     if ( ok != 0 )
+         *ok = false;
+     return 0;
+@@ -5503,7 +5518,8 @@
+         return ( int )( base * factor / 100.0 );
+     }
+ 
+-    qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value_ba.data() );
+     if ( ok != 0 )
+         *ok = false;
+     return 0;
+@@ -5528,7 +5544,8 @@
+         return pt_size;
+     }
+ 
+-    qWarning( "interpretPointSize(): could not parse \"%spt\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretPointSize(): could not parse \"%spt\"", value_ba.data() );
+     if ( ok != 0 )
+         *ok = false;
+     return 0;
+@@ -5737,7 +5754,8 @@
+ */
+ static const QwtMmlOperSpec *searchOperSpecData( const QString &name )
+ {
+-    const char *name_latin1 = name.toLatin1().data();
++    QByteArray name_latin1_ba = name.toLatin1();
++    const char *name_latin1 = name_latin1_ba.data();
+ 
+     // binary search
+     // establish invariant g_oper_spec_data[begin].name < name < g_oper_spec_data[end].name
+@@ -5789,7 +5807,8 @@
+         if ( spec == 0 )
+             continue;
+ 
+-        const char *name_latin1 = name.toLatin1().data();
++        QByteArray name_ba = name.toLatin1();
++        const char *name_latin1 = name_ba.data();
+ 
+         // backtrack to the first instance of name
+         while ( spec > g_oper_spec_data && qstrcmp( ( spec - 1 )->name, name_latin1 ) == 0 )
+@@ -5918,7 +5937,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value_ba.data() );
+ 
+     return QwtMml::NormalMV;
+ }
+@@ -5938,7 +5958,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretForm(): could not parse value \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretForm(): could not parse value \"%s\"", value_ba.data() );
+     return QwtMml::InfixForm;
+ }
+ 
+@@ -5959,7 +5980,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretColAlign(): could not parse value \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretColAlign(): could not parse value \"%s\"", value_ba.data() );
+     return QwtMml::ColAlignCenter;
+ }
+ 
+@@ -5984,7 +6006,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretRowAlign(): could not parse value \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretRowAlign(): could not parse value \"%s\"", value_ba.data() );
+     return QwtMml::RowAlignAxis;
+ }
+ 
+@@ -6018,7 +6041,8 @@
+     if ( ok != 0 )
+         *ok = false;
+ 
+-    qWarning( "interpretFrameType(): could not parse value \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretFrameType(): could not parse value \"%s\"", value_ba.data() );
+     return QwtMml::FrameNone;
+ }
+ 
+@@ -6030,7 +6054,8 @@
+     QStringList l = value_list.split( ' ' );
+     if ( l.count() != 2 )
+     {
+-        qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list.toLatin1().data() );
++        QByteArray value_list_ba = value_list.toLatin1();
++        qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list_ba.data() );
+         if ( ok != 0 )
+             *ok = false;
+         return QwtMml::FrameSpacing( ( int )( 0.4 * em ), ( int )( 0.5 * ex ) );
+@@ -6089,7 +6114,10 @@
+         else if ( value == "bold" )
+             fn.setBold( true );
+         else
+-            qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value.toLatin1().data() );
++        {
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value_ba.data() );
++        }
+     }
+ 
+     if ( font_attr.contains( "fontstyle" ) )
+@@ -6100,7 +6128,10 @@
+         else if ( value == "italic" )
+             fn.setItalic( true );
+         else
+-            qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value.toLatin1().data() );
++        {
++            QByteArray value_ba = value.toLatin1();
++            qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value_ba.data() );
++        }
+     }
+ 
+     if ( font_attr.contains( "fontfamily" ) )
+@@ -6150,7 +6181,8 @@
+ 
+     if ( ok != 0 )
+         *ok = false;
+-    qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value.toLatin1().data() );
++    QByteArray value_ba = value.toLatin1();
++    qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value_ba.data() );
+     return fn;
+ }
+ 
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 8ce04e6e2158..5927e4d57e6e 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -9,4 +9,7 @@
   compasses, thermometers, wheels and knobs to control or display
   values, arrays or ranges of type double.  
 </longdescription>
+<use>
+  <flag name='mathml'>Use the MathML renderer of the Qt solutions package.</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-libs/qwt/qwt-6.0.2.ebuild b/x11-libs/qwt/qwt-6.0.2.ebuild
new file mode 100644
index 000000000000..5ed0498b4da0
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.0.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.2.ebuild,v 1.1 2013/01/31 11:40:58 gienah Exp $
+
+EAPI=4
+
+inherit eutils qt4-r2
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+SLOT="6"
+IUSE="doc examples mathml svg"
+
+DEPEND="
+	x11-libs/qt-gui:4
+	doc? ( !<media-libs/coin-3.1.3[doc] )
+	svg? ( x11-libs/qt-svg:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="CHANGES README"
+
+src_prepare() {
+	cat > qwtconfig.pri <<-EOF
+		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+		QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
+		VERSION = ${PV/_*}
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/$(get_libdir)/qt4/features6"
+	EOF
+	if use mathml; then
+		cat >> qwtconfig.pri <<-EOF
+			QWT_CONFIG += QwtMathML
+		EOF
+	fi
+	cat > qwtbuild.pri <<-EOF
+		QWT_CONFIG += qt warn_on thread release no_keywords
+	EOF
+
+	# don't build examples - fix the qt files to build once installed
+	cat > examples/examples.pri <<-EOF
+		include( qwtconfig.pri )
+		TEMPLATE     = app
+		MOC_DIR      = moc
+		INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+		DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
+		LIBS        += -lqwt
+	EOF
+	sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+	sed \
+		-e 's/target doc/target/' \
+		-i src/src.pro || die
+
+	# Renaming lib to libqwt6.so to enable slotting
+	sed \
+		-e "/^TARGET/s:(qwt):(qwt6):g" \
+		-i src/src.pro || die
+	sed \
+		-e '/qwtAddLibrary/s:qwt:qwt6:g' \
+		-i qwt.prf designer/designer.pro examples/examples.pri \
+		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+	sed \
+		-e 's:libqwt:libqwt6:g' \
+		-i qwtbuild.pri || die
+
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+	cp *.pri examples/ || die
+	epatch "${FILESDIR}/${PN}-6.0.2-invalid-read.patch"
+}
+
+src_compile() {
+	# split compilation to allow parallel building
+	emake sub-src
+	emake
+}
+
+src_install () {
+	qt4-r2_src_install
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}