Update to 4.5. Major new features are:

* support for Python v3
* support for Qt v4.5.1
* added the QInputContextFactory class
* a new, more Pythonic, API has been added for connecting signals and slots
  which does not require knowledge of C++ data types
* new signals can now be defined using pyqtSignal as a more Pythonic
  replacement of the __pyqtSignals__ class attribute.
* added the pyqtSlot decorator as a more Pythonic replacement of the
  pyqtSignature decorator
* the "type" argument to pyqtProperty() can also be a Python type object
* the "type" argument to Q_ARG() can also be a Python type object
* the "type" argument to Q_RETURN_ARG() can also be a Python type object
* added QT_TR_NOOP_UTF8()
* super() works without restrictions
* replaced the old qtdemo example launcher with a port of the newer version
* added the editabletreemodel.py and fetchmore.py examples
* replaced the old tutorial with the newer Address Book tutorial.

4 files changed, 35 insertions, 11 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 3f4c410c0eb..4f66336701b 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/02/13 02:05:26 epg Exp $
+# $NetBSD: Makefile,v 1.8 2009/06/13 12:15:42 hasso Exp $
 #
 
 PKGNAME=		${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PKGREVISION=		1
-PYQT_VERSION=		4.4.4
+PYQT_VERSION=		4.5
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 
@@ -25,7 +24,7 @@ CONFIGURE_ARGS+=	--confirm-license
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR:Q}
 
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	26 25 24
 PY_PATCHPLIST=			yes
 PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
@@ -55,7 +54,7 @@ do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
 
-BUILDLINK_API_DEPENDS.py-sip+=	${PYPKGPREFIX}-sip>=4.7.9
+BUILDLINK_API_DEPENDS.py-sip+=	${PYPKGPREFIX}-sip>=4.8
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
diff --git a/x11/py-qt4/PLIST.common b/x11/py-qt4/PLIST.common
index dd39d42e693..478462230ca 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2008/12/13 12:31:53 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2009/06/13 12:15:42 hasso Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
@@ -21,18 +21,34 @@ ${PYSITELIB}/PyQt4/pyqtconfig.py
 ${PYSITELIB}/PyQt4/uic/Compiler/__init__.py
 ${PYSITELIB}/PyQt4/uic/Compiler/compiler.py
 ${PYSITELIB}/PyQt4/uic/Compiler/indenter.py
+${PYSITELIB}/PyQt4/uic/Compiler/misc.py
+${PYSITELIB}/PyQt4/uic/Compiler/proxy_type.py
 ${PYSITELIB}/PyQt4/uic/Compiler/qobjectcreator.py
 ${PYSITELIB}/PyQt4/uic/Compiler/qtproxies.py
 ${PYSITELIB}/PyQt4/uic/Loader/__init__.py
 ${PYSITELIB}/PyQt4/uic/Loader/loader.py
 ${PYSITELIB}/PyQt4/uic/Loader/qobjectcreator.py
 ${PYSITELIB}/PyQt4/uic/__init__.py
+${PYSITELIB}/PyQt4/uic/driver.py
 ${PYSITELIB}/PyQt4/uic/exceptions.py
 ${PYSITELIB}/PyQt4/uic/icon_cache.py
 ${PYSITELIB}/PyQt4/uic/objcreator.py
+${PYSITELIB}/PyQt4/uic/port_v2/__init__.py
+${PYSITELIB}/PyQt4/uic/port_v2/encode_utf8.py
+${PYSITELIB}/PyQt4/uic/port_v2/invoke.py
+${PYSITELIB}/PyQt4/uic/port_v2/load_plugin.py
+${PYSITELIB}/PyQt4/uic/port_v2/proxy_base.py
+${PYSITELIB}/PyQt4/uic/port_v2/string_io.py
+${PYSITELIB}/PyQt4/uic/port_v3/__init__.py
+${PYSITELIB}/PyQt4/uic/port_v3/encode_utf8.py
+${PYSITELIB}/PyQt4/uic/port_v3/invoke.py
+${PYSITELIB}/PyQt4/uic/port_v3/load_plugin.py
+${PYSITELIB}/PyQt4/uic/port_v3/proxy_base.py
+${PYSITELIB}/PyQt4/uic/port_v3/string_io.py
 ${PYSITELIB}/PyQt4/uic/properties.py
 ${PYSITELIB}/PyQt4/uic/pyuic.py
 ${PYSITELIB}/PyQt4/uic/uiparser.py
+${PYSITELIB}/PyQt4/uic/widget-plugins/phonon.py
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qaxcontainer.py
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qscintilla.py
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qtwebkit.py
@@ -214,6 +230,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qimageiohandler.sip
 share/sip${PYVERSSUFFIX}/QtGui/qimagereader.sip
 share/sip${PYVERSSUFFIX}/QtGui/qimagewriter.sip
 share/sip${PYVERSSUFFIX}/QtGui/qinputcontext.sip
+share/sip${PYVERSSUFFIX}/QtGui/qinputcontextfactory.sip
 share/sip${PYVERSSUFFIX}/QtGui/qinputdialog.sip
 share/sip${PYVERSSUFFIX}/QtGui/qitemdelegate.sip
 share/sip${PYVERSSUFFIX}/QtGui/qitemeditorfactory.sip
@@ -257,6 +274,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qprogressbar.sip
 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/qradiobutton.sip
 share/sip${PYVERSSUFFIX}/QtGui/qregion.sip
 share/sip${PYVERSSUFFIX}/QtGui/qrgb.sip
@@ -293,6 +311,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qtextbrowser.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtextcursor.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtextdocument.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtextdocumentfragment.sip
+share/sip${PYVERSSUFFIX}/QtGui/qtextdocumentwriter.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtextedit.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtextformat.sip
 share/sip${PYVERSSUFFIX}/QtGui/qtextlayout.sip
@@ -327,6 +346,7 @@ share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchengine.sip
 share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchquerywidget.sip
 share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchresultwidget.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/QtNetworkmod.sip
+share/sip${PYVERSSUFFIX}/QtNetwork/qabstractnetworkcache.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qabstractsocket.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qauthenticator.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qftp.sip
@@ -337,6 +357,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/qnetworkdiskcache.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkinterface.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkproxy.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkreply.sip
@@ -392,11 +413,13 @@ share/sip${PYVERSSUFFIX}/QtTest/qtestkeyboard.sip
 share/sip${PYVERSSUFFIX}/QtTest/qtestmouse.sip
 share/sip${PYVERSSUFFIX}/QtTest/qtestsystem.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/QtWebKitmod.sip
+share/sip${PYVERSSUFFIX}/QtWebKit/qwebdatabase.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebframe.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebhistory.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebhistoryinterface.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebpage.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebpluginfactory.sip
+share/sip${PYVERSSUFFIX}/QtWebKit/qwebsecurityorigin.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebsettings.sip
 share/sip${PYVERSSUFFIX}/QtWebKit/qwebview.sip
 share/sip${PYVERSSUFFIX}/QtXml/QtXmlmod.sip
diff --git a/x11/py-qt4/PLIST.common_end b/x11/py-qt4/PLIST.common_end
index 2fbb02595fc..c0f45f9032a 100644
--- a/x11/py-qt4/PLIST.common_end
+++ b/x11/py-qt4/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.2 2008/12/13 12:31:53 wiz Exp $
+@comment $NetBSD: PLIST.common_end,v 1.3 2009/06/13 12:15:42 hasso Exp $
 @dirrm share/sip${PYVERSSUFFIX}/QtXml
 @dirrm share/sip${PYVERSSUFFIX}/QtWebKit
 @dirrm share/sip${PYVERSSUFFIX}/QtTest
@@ -19,6 +19,8 @@
 @dirrm ${PYSITELIB}/PyQt4/uic/widget-plugins
 @dirrm ${PYSITELIB}/PyQt4/uic/Loader
 @dirrm ${PYSITELIB}/PyQt4/uic/Compiler
+@dirrm ${PYSITELIB}/PyQt4/uic/port_v3
+@dirrm ${PYSITELIB}/PyQt4/uic/port_v2
 @dirrm ${PYSITELIB}/PyQt4/uic
 @dirrm ${PYSITELIB}/PyQt4
 @dirrm qt4/plugins/designer/python
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index fdab5a241bb..c1d45060d74 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/12/13 05:19:12 epg Exp $
+$NetBSD: distinfo,v 1.2 2009/06/13 12:15:42 hasso Exp $
 
-SHA1 (PyQt-x11-gpl-4.4.4.tar.gz) = 6b91a8020de10e807fa0d3db6b7a92029a17cf0b
-RMD160 (PyQt-x11-gpl-4.4.4.tar.gz) = 970bca082a93402b1986b4e8a14738575732e8ae
-Size (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063 bytes
+SHA1 (PyQt-x11-gpl-4.5.tar.gz) = 0c66f55d93c6fbb0c6fe5ae31be57037c1a829e0
+RMD160 (PyQt-x11-gpl-4.5.tar.gz) = bf90e4597faa4f117fc217620a706efbf28065b1
+Size (PyQt-x11-gpl-4.5.tar.gz) = 6941757 bytes
 SHA1 (patch-aa) = 9ba0e372d817bda27282da3632db71869cf2a6d6