update to 4.7

The highlights of this release include full support for Qt v4.6,
automatically generated docstrings for all callables that describe
the valid Python signatures, and support for keywords for all
optional arguments.

3 files changed, 74 insertions, 8 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index abe77b9dee4..f8c0bb92d7f 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/04 18:40:28 drochner Exp $
 #
 
 PKGNAME=		${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=		4.6.2
-PKGREVISION=		1
+PYQT_VERSION=		4.7
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 
@@ -65,6 +64,8 @@ do-configure:
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../textproc/py-elementtree/buildlink3.mk"
+# needs the QtXmlPatterns fix
+BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.6.1nb3
 .include "../../x11/qt4-libs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.4.0nb1
 .include "../../x11/qt4-tools/buildlink3.mk"
diff --git a/x11/py-qt4/PLIST.common b/x11/py-qt4/PLIST.common
index ec90f18d1da..30528e1e896 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.7 2009/11/18 16:39:22 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.8 2010/02/04 18:40:28 drochner Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
@@ -8,6 +8,7 @@ ${PYSITELIB}/PyQt4/QtCore.so
 ${PYSITELIB}/PyQt4/QtDesigner.so
 ${PYSITELIB}/PyQt4/QtGui.so
 ${PYSITELIB}/PyQt4/QtHelp.so
+${PYSITELIB}/PyQt4/QtMultimedia.so
 ${PYSITELIB}/PyQt4/QtNetwork.so
 ${PYSITELIB}/PyQt4/QtOpenGL.so
 ${PYSITELIB}/PyQt4/QtScript.so
@@ -17,6 +18,7 @@ ${PYSITELIB}/PyQt4/QtSvg.so
 ${PYSITELIB}/PyQt4/QtTest.so
 ${PYSITELIB}/PyQt4/QtWebKit.so
 ${PYSITELIB}/PyQt4/QtXml.so
+${PYSITELIB}/PyQt4/QtXmlPatterns.so
 ${PYSITELIB}/PyQt4/__init__.py
 ${PYSITELIB}/PyQt4/pyqtconfig.py
 ${PYSITELIB}/PyQt4/uic/Compiler/__init__.py
@@ -61,9 +63,13 @@ share/sip${PYVERSSUFFIX}/Qt/Qtmod.sip
 share/sip${PYVERSSUFFIX}/QtAssistant/QtAssistantmod.sip
 share/sip${PYVERSSUFFIX}/QtAssistant/qassistantclient.sip
 share/sip${PYVERSSUFFIX}/QtCore/QtCoremod.sip
+share/sip${PYVERSSUFFIX}/QtCore/qabstractanimation.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstracteventdispatcher.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstractfileengine.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstractitemmodel.sip
+share/sip${PYVERSSUFFIX}/QtCore/qabstractstate.sip
+share/sip${PYVERSSUFFIX}/QtCore/qabstracttransition.sip
+share/sip${PYVERSSUFFIX}/QtCore/qanimationgroup.sip
 share/sip${PYVERSSUFFIX}/QtCore/qbasictimer.sip
 share/sip${PYVERSSUFFIX}/QtCore/qbitarray.sip
 share/sip${PYVERSSUFFIX}/QtCore/qbuffer.sip
@@ -77,13 +83,17 @@ share/sip${PYVERSSUFFIX}/QtCore/qdatastream.sip
 share/sip${PYVERSSUFFIX}/QtCore/qdatetime.sip
 share/sip${PYVERSSUFFIX}/QtCore/qdir.sip
 share/sip${PYVERSSUFFIX}/QtCore/qdiriterator.sip
+share/sip${PYVERSSUFFIX}/QtCore/qeasingcurve.sip
 share/sip${PYVERSSUFFIX}/QtCore/qeventloop.sip
+share/sip${PYVERSSUFFIX}/QtCore/qeventtransition.sip
 share/sip${PYVERSSUFFIX}/QtCore/qfile.sip
 share/sip${PYVERSSUFFIX}/QtCore/qfileinfo.sip
 share/sip${PYVERSSUFFIX}/QtCore/qfilesystemwatcher.sip
+share/sip${PYVERSSUFFIX}/QtCore/qfinalstate.sip
 share/sip${PYVERSSUFFIX}/QtCore/qfsfileengine.sip
 share/sip${PYVERSSUFFIX}/QtCore/qglobal.sip
 share/sip${PYVERSSUFFIX}/QtCore/qhash.sip
+share/sip${PYVERSSUFFIX}/QtCore/qhistorystate.sip
 share/sip${PYVERSSUFFIX}/QtCore/qiodevice.sip
 share/sip${PYVERSSUFFIX}/QtCore/qlibrary.sip
 share/sip${PYVERSSUFFIX}/QtCore/qlibraryinfo.sip
@@ -91,6 +101,7 @@ share/sip${PYVERSSUFFIX}/QtCore/qline.sip
 share/sip${PYVERSSUFFIX}/QtCore/qlist.sip
 share/sip${PYVERSSUFFIX}/QtCore/qlocale.sip
 share/sip${PYVERSSUFFIX}/QtCore/qmap.sip
+share/sip${PYVERSSUFFIX}/QtCore/qmargins.sip
 share/sip${PYVERSSUFFIX}/QtCore/qmetaobject.sip
 share/sip${PYVERSSUFFIX}/QtCore/qmetatype.sip
 share/sip${PYVERSSUFFIX}/QtCore/qmimedata.sip
@@ -101,20 +112,28 @@ share/sip${PYVERSSUFFIX}/QtCore/qobject.sip
 share/sip${PYVERSSUFFIX}/QtCore/qobjectcleanuphandler.sip
 share/sip${PYVERSSUFFIX}/QtCore/qobjectdefs.sip
 share/sip${PYVERSSUFFIX}/QtCore/qpair.sip
+share/sip${PYVERSSUFFIX}/QtCore/qparallelanimationgroup.sip
+share/sip${PYVERSSUFFIX}/QtCore/qpauseanimation.sip
 share/sip${PYVERSSUFFIX}/QtCore/qpluginloader.sip
 share/sip${PYVERSSUFFIX}/QtCore/qpoint.sip
 share/sip${PYVERSSUFFIX}/QtCore/qprocess.sip
+share/sip${PYVERSSUFFIX}/QtCore/qpropertyanimation.sip
 share/sip${PYVERSSUFFIX}/QtCore/qreadwritelock.sip
 share/sip${PYVERSSUFFIX}/QtCore/qrect.sip
 share/sip${PYVERSSUFFIX}/QtCore/qregexp.sip
 share/sip${PYVERSSUFFIX}/QtCore/qresource.sip
 share/sip${PYVERSSUFFIX}/QtCore/qrunnable.sip
 share/sip${PYVERSSUFFIX}/QtCore/qsemaphore.sip
+share/sip${PYVERSSUFFIX}/QtCore/qsequentialanimationgroup.sip
+share/sip${PYVERSSUFFIX}/QtCore/qset.sip
 share/sip${PYVERSSUFFIX}/QtCore/qsettings.sip
 share/sip${PYVERSSUFFIX}/QtCore/qsharedmemory.sip
 share/sip${PYVERSSUFFIX}/QtCore/qsignalmapper.sip
+share/sip${PYVERSSUFFIX}/QtCore/qsignaltransition.sip
 share/sip${PYVERSSUFFIX}/QtCore/qsize.sip
 share/sip${PYVERSSUFFIX}/QtCore/qsocketnotifier.sip
+share/sip${PYVERSSUFFIX}/QtCore/qstate.sip
+share/sip${PYVERSSUFFIX}/QtCore/qstatemachine.sip
 share/sip${PYVERSSUFFIX}/QtCore/qstring.sip
 share/sip${PYVERSSUFFIX}/QtCore/qstringlist.sip
 share/sip${PYVERSSUFFIX}/QtCore/qstringmatcher.sip
@@ -131,6 +150,7 @@ share/sip${PYVERSSUFFIX}/QtCore/qtranslator.sip
 share/sip${PYVERSSUFFIX}/QtCore/qurl.sip
 share/sip${PYVERSSUFFIX}/QtCore/quuid.sip
 share/sip${PYVERSSUFFIX}/QtCore/qvariant.sip
+share/sip${PYVERSSUFFIX}/QtCore/qvariantanimation.sip
 share/sip${PYVERSSUFFIX}/QtCore/qvector.sip
 share/sip${PYVERSSUFFIX}/QtCore/qwaitcondition.sip
 share/sip${PYVERSSUFFIX}/QtCore/qxmlstream.sip
@@ -211,6 +231,11 @@ share/sip${PYVERSSUFFIX}/QtGui/qfontinfo.sip
 share/sip${PYVERSSUFFIX}/QtGui/qfontmetrics.sip
 share/sip${PYVERSSUFFIX}/QtGui/qformlayout.sip
 share/sip${PYVERSSUFFIX}/QtGui/qframe.sip
+share/sip${PYVERSSUFFIX}/QtGui/qgenericmatrix.sip
+share/sip${PYVERSSUFFIX}/QtGui/qgesture.sip
+share/sip${PYVERSSUFFIX}/QtGui/qgesturerecognizer.sip
+share/sip${PYVERSSUFFIX}/QtGui/qgraphicsanchorlayout.sip
+share/sip${PYVERSSUFFIX}/QtGui/qgraphicseffect.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgraphicsgridlayout.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgraphicsitem.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgraphicsitemanimation.sip
@@ -220,6 +245,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qgraphicslinearlayout.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgraphicsproxywidget.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgraphicsscene.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgraphicssceneevent.sip
+share/sip${PYVERSSUFFIX}/QtGui/qgraphicstransform.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgraphicsview.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgraphicswidget.sip
 share/sip${PYVERSSUFFIX}/QtGui/qgridlayout.sip
@@ -237,6 +263,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qinputdialog.sip
 share/sip${PYVERSSUFFIX}/QtGui/qitemdelegate.sip
 share/sip${PYVERSSUFFIX}/QtGui/qitemeditorfactory.sip
 share/sip${PYVERSSUFFIX}/QtGui/qitemselectionmodel.sip
+share/sip${PYVERSSUFFIX}/QtGui/qkeyeventtransition.sip
 share/sip${PYVERSSUFFIX}/QtGui/qkeysequence.sip
 share/sip${PYVERSSUFFIX}/QtGui/qlabel.sip
 share/sip${PYVERSSUFFIX}/QtGui/qlayout.sip
@@ -247,12 +274,14 @@ share/sip${PYVERSSUFFIX}/QtGui/qlistview.sip
 share/sip${PYVERSSUFFIX}/QtGui/qlistwidget.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmainwindow.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmatrix.sip
+share/sip${PYVERSSUFFIX}/QtGui/qmatrix4x4.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmdiarea.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmdisubwindow.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmenu.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmenubar.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmessagebox.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmime.sip
+share/sip${PYVERSSUFFIX}/QtGui/qmouseeventtransition.sip
 share/sip${PYVERSSUFFIX}/QtGui/qmovie.sip
 share/sip${PYVERSSUFFIX}/QtGui/qpagesetupdialog.sip
 share/sip${PYVERSSUFFIX}/QtGui/qpaintdevice.sip
@@ -277,6 +306,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qprogressdialog.sip
 share/sip${PYVERSSUFFIX}/QtGui/qproxymodel.sip
 share/sip${PYVERSSUFFIX}/QtGui/qpushbutton.sip
 share/sip${PYVERSSUFFIX}/QtGui/qpytextobject.sip
+share/sip${PYVERSSUFFIX}/QtGui/qquaternion.sip
 share/sip${PYVERSSUFFIX}/QtGui/qradiobutton.sip
 share/sip${PYVERSSUFFIX}/QtGui/qregion.sip
 share/sip${PYVERSSUFFIX}/QtGui/qrgb.sip
@@ -333,6 +363,9 @@ share/sip${PYVERSSUFFIX}/QtGui/qundogroup.sip
 share/sip${PYVERSSUFFIX}/QtGui/qundostack.sip
 share/sip${PYVERSSUFFIX}/QtGui/qundoview.sip
 share/sip${PYVERSSUFFIX}/QtGui/qvalidator.sip
+share/sip${PYVERSSUFFIX}/QtGui/qvector2d.sip
+share/sip${PYVERSSUFFIX}/QtGui/qvector3d.sip
+share/sip${PYVERSSUFFIX}/QtGui/qvector4d.sip
 share/sip${PYVERSSUFFIX}/QtGui/qwhatsthis.sip
 share/sip${PYVERSSUFFIX}/QtGui/qwidget.sip
 share/sip${PYVERSSUFFIX}/QtGui/qwidgetaction.sip
@@ -347,6 +380,16 @@ share/sip${PYVERSSUFFIX}/QtHelp/qhelpindexwidget.sip
 share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchengine.sip
 share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchquerywidget.sip
 share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchresultwidget.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/QtMultimediamod.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/qabstractvideobuffer.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/qabstractvideosurface.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/qaudio.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/qaudiodeviceinfo.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/qaudioformat.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/qaudioinput.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/qaudiooutput.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/qvideoframe.sip
+share/sip${PYVERSSUFFIX}/QtMultimedia/qvideosurfaceformat.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/QtNetworkmod.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qabstractnetworkcache.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qabstractsocket.sip
@@ -359,6 +402,7 @@ share/sip${PYVERSSUFFIX}/QtNetwork/qlocalserver.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qlocalsocket.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkaccessmanager.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkcookie.sip
+share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkcookiejar.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkdiskcache.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkinterface.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkproxy.sip
@@ -380,6 +424,7 @@ share/sip${PYVERSSUFFIX}/QtOpenGL/qgl.sip
 share/sip${PYVERSSUFFIX}/QtOpenGL/qglcolormap.sip
 share/sip${PYVERSSUFFIX}/QtOpenGL/qglframebufferobject.sip
 share/sip${PYVERSSUFFIX}/QtOpenGL/qglpixelbuffer.sip
+share/sip${PYVERSSUFFIX}/QtOpenGL/qglshaderprogram.sip
 share/sip${PYVERSSUFFIX}/QtScript/QtScriptmod.sip
 share/sip${PYVERSSUFFIX}/QtScript/qscriptclass.sip
 share/sip${PYVERSSUFFIX}/QtScript/qscriptclasspropertyiterator.sip
@@ -416,11 +461,16 @@ share/sip${PYVERSSUFFIX}/QtTest/qtestcase.sip
 share/sip${PYVERSSUFFIX}/QtTest/qtestkeyboard.sip
 share/sip${PYVERSSUFFIX}/QtTest/qtestmouse.sip
 share/sip${PYVERSSUFFIX}/QtTest/qtestsystem.sip
+share/sip${PYVERSSUFFIX}/QtTest/qtesttouch.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/QtWebKitmod.sip
+share/sip${PYVERSSUFFIX}/QtWebKit/qgraphicswebview.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebdatabase.sip
+share/sip${PYVERSSUFFIX}/QtWebKit/qwebelement.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebframe.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebhistory.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebhistoryinterface.sip
+share/sip${PYVERSSUFFIX}/QtWebKit/qwebinspector.sip
+share/sip${PYVERSSUFFIX}/QtWebKit/qwebkitversion.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebpage.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebpluginfactory.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebsecurityorigin.sip
@@ -430,3 +480,18 @@ share/sip${PYVERSSUFFIX}/QtXml/QtXmlmod.sip
 share/sip${PYVERSSUFFIX}/QtXml/qdom.sip
 share/sip${PYVERSSUFFIX}/QtXml/qxml.sip
 share/sip${PYVERSSUFFIX}/QtXml/qxmlstream.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/QtXmlPatternsmod.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qabstractmessagehandler.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qabstracturiresolver.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qabstractxmlnodemodel.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qabstractxmlreceiver.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qsimplexmlnodemodel.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qsourcelocation.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qxmlformatter.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qxmlname.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qxmlnamepool.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qxmlquery.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qxmlresultitems.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qxmlschema.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qxmlschemavalidator.sip
+share/sip${PYVERSSUFFIX}/QtXmlPatterns/qxmlserializer.sip
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index afd070fab95..5689bcd7e60 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/11/23 15:00:33 wiz Exp $
+$NetBSD: distinfo,v 1.8 2010/02/04 18:40:28 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-4.6.2.tar.gz) = 41c04232618b78497145ba91ff25e5891c1624b5
-RMD160 (PyQt-x11-gpl-4.6.2.tar.gz) = acd984f335c3b9661603388347e064098f50856c
-Size (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753 bytes
+SHA1 (PyQt-x11-gpl-4.7.tar.gz) = 3cc46c8cc9c83ac111cd171ee594b2d34a4133dc
+RMD160 (PyQt-x11-gpl-4.7.tar.gz) = bddf2b4d668733a7a6bbb179dd986b5f82752198
+Size (PyQt-x11-gpl-4.7.tar.gz) = 7888435 bytes
 SHA1 (patch-aa) = ff6010dec03d1e17e2023d2f6d4418a03bf21bcc