Changes 5.5.1:

- Added support for Qt v5.5.1.
- Added the --disable option to configure.py.
- Implemented __matmul__ and __imatmul__ for QMatrix4x4 and QTransform.

4 files changed, 76 insertions, 17 deletions

diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile
index 6503927bf8a..15404f81509 100644
--- a/x11/py-qt5/Makefile
+++ b/x11/py-qt5/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2015/10/10 01:58:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2015/10/26 21:40:39 adam Exp $
 
 DISTNAME=	PyQt-gpl-${PYQT_VERSION}
 PKGNAME=	${PYPKGPREFIX}-qt5-${PYQT_VERSION}
-PKGREVISION=	5
-PYQT_VERSION=	5.4
+PYQT_VERSION=	5.5.1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
 
@@ -65,7 +64,6 @@ do-configure:
 .include "../../sysutils/dbus-python-common/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-sip+=	${PYPKGPREFIX}-sip>=4.16.4
 .include "../../x11/py-sip/buildlink3.mk"
-.include "../../x11/qt5-dbus/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../x11/qt5-qtlocation/buildlink3.mk"
diff --git a/x11/py-qt5/PLIST b/x11/py-qt5/PLIST
index d3c00a06f4f..5608d9ad0df 100644
--- a/x11/py-qt5/PLIST
+++ b/x11/py-qt5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/04/20 06:45:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/10/26 21:40:39 adam Exp $
 bin/pylupdate5
 bin/pyrcc5
 bin/pyuic5
@@ -327,8 +327,49 @@ share/sip/PyQt5/QtHelp/qhelpindexwidget.sip
 share/sip/PyQt5/QtHelp/qhelpsearchengine.sip
 share/sip/PyQt5/QtHelp/qhelpsearchquerywidget.sip
 share/sip/PyQt5/QtHelp/qhelpsearchresultwidget.sip
+share/sip/PyQt5/QtLocation/QtLocationmod.sip
+share/sip/PyQt5/QtLocation/qgeocodereply.sip
+share/sip/PyQt5/QtLocation/qgeocodingmanager.sip
+share/sip/PyQt5/QtLocation/qgeocodingmanagerengine.sip
+share/sip/PyQt5/QtLocation/qgeomaneuver.sip
+share/sip/PyQt5/QtLocation/qgeoroute.sip
+share/sip/PyQt5/QtLocation/qgeoroutereply.sip
+share/sip/PyQt5/QtLocation/qgeorouterequest.sip
+share/sip/PyQt5/QtLocation/qgeoroutesegment.sip
+share/sip/PyQt5/QtLocation/qgeoroutingmanager.sip
+share/sip/PyQt5/QtLocation/qgeoroutingmanagerengine.sip
+share/sip/PyQt5/QtLocation/qgeoserviceprovider.sip
+share/sip/PyQt5/QtLocation/qlocation.sip
+share/sip/PyQt5/QtLocation/qplace.sip
+share/sip/PyQt5/QtLocation/qplaceattribute.sip
+share/sip/PyQt5/QtLocation/qplacecategory.sip
+share/sip/PyQt5/QtLocation/qplacecontactdetail.sip
+share/sip/PyQt5/QtLocation/qplacecontent.sip
+share/sip/PyQt5/QtLocation/qplacecontentreply.sip
+share/sip/PyQt5/QtLocation/qplacecontentrequest.sip
+share/sip/PyQt5/QtLocation/qplacedetailsreply.sip
+share/sip/PyQt5/QtLocation/qplaceeditorial.sip
+share/sip/PyQt5/QtLocation/qplaceicon.sip
+share/sip/PyQt5/QtLocation/qplaceidreply.sip
+share/sip/PyQt5/QtLocation/qplaceimage.sip
+share/sip/PyQt5/QtLocation/qplacemanager.sip
+share/sip/PyQt5/QtLocation/qplacemanagerengine.sip
+share/sip/PyQt5/QtLocation/qplacematchreply.sip
+share/sip/PyQt5/QtLocation/qplacematchrequest.sip
+share/sip/PyQt5/QtLocation/qplaceproposedsearchresult.sip
+share/sip/PyQt5/QtLocation/qplaceratings.sip
+share/sip/PyQt5/QtLocation/qplacereply.sip
+share/sip/PyQt5/QtLocation/qplaceresult.sip
+share/sip/PyQt5/QtLocation/qplacereview.sip
+share/sip/PyQt5/QtLocation/qplacesearchreply.sip
+share/sip/PyQt5/QtLocation/qplacesearchrequest.sip
+share/sip/PyQt5/QtLocation/qplacesearchresult.sip
+share/sip/PyQt5/QtLocation/qplacesearchsuggestionreply.sip
+share/sip/PyQt5/QtLocation/qplacesupplier.sip
+share/sip/PyQt5/QtLocation/qplaceuser.sip
 share/sip/PyQt5/QtMultimedia/QtMultimediamod.sip
 share/sip/PyQt5/QtMultimedia/qabstractvideobuffer.sip
+share/sip/PyQt5/QtMultimedia/qabstractvideofilter.sip
 share/sip/PyQt5/QtMultimedia/qabstractvideosurface.sip
 share/sip/PyQt5/QtMultimedia/qaudio.sip
 share/sip/PyQt5/QtMultimedia/qaudiobuffer.sip
@@ -345,6 +386,7 @@ share/sip/PyQt5/QtMultimedia/qcamerafocus.sip
 share/sip/PyQt5/QtMultimedia/qcameraimagecapture.sip
 share/sip/PyQt5/QtMultimedia/qcameraimageprocessing.sip
 share/sip/PyQt5/QtMultimedia/qcamerainfo.sip
+share/sip/PyQt5/QtMultimedia/qcameraviewfindersettings.sip
 share/sip/PyQt5/QtMultimedia/qmediabindableinterface.sip
 share/sip/PyQt5/QtMultimedia/qmediacontent.sip
 share/sip/PyQt5/QtMultimedia/qmediacontrol.sip
@@ -398,8 +440,10 @@ share/sip/PyQt5/QtNetwork/qsslcertificate.sip
 share/sip/PyQt5/QtNetwork/qsslcertificateextension.sip
 share/sip/PyQt5/QtNetwork/qsslcipher.sip
 share/sip/PyQt5/QtNetwork/qsslconfiguration.sip
+share/sip/PyQt5/QtNetwork/qsslellipticcurve.sip
 share/sip/PyQt5/QtNetwork/qsslerror.sip
 share/sip/PyQt5/QtNetwork/qsslkey.sip
+share/sip/PyQt5/QtNetwork/qsslpresharedkeyauthenticator.sip
 share/sip/PyQt5/QtNetwork/qsslsocket.sip
 share/sip/PyQt5/QtNetwork/qtcpserver.sip
 share/sip/PyQt5/QtNetwork/qtcpsocket.sip
@@ -609,6 +653,7 @@ share/sip/PyQt5/QtWidgets/qlcdnumber.sip
 share/sip/PyQt5/QtWidgets/qlineedit.sip
 share/sip/PyQt5/QtWidgets/qlistview.sip
 share/sip/PyQt5/QtWidgets/qlistwidget.sip
+share/sip/PyQt5/QtWidgets/qmaccocoaviewcontainer.sip
 share/sip/PyQt5/QtWidgets/qmainwindow.sip
 share/sip/PyQt5/QtWidgets/qmdiarea.sip
 share/sip/PyQt5/QtWidgets/qmdisubwindow.sip
@@ -620,6 +665,7 @@ share/sip/PyQt5/QtWidgets/qopenglwidget.sip
 share/sip/PyQt5/QtWidgets/qplaintextedit.sip
 share/sip/PyQt5/QtWidgets/qprogressbar.sip
 share/sip/PyQt5/QtWidgets/qprogressdialog.sip
+share/sip/PyQt5/QtWidgets/qproxystyle.sip
 share/sip/PyQt5/QtWidgets/qpushbutton.sip
 share/sip/PyQt5/QtWidgets/qpywidgets_qlist.sip
 share/sip/PyQt5/QtWidgets/qradiobutton.sip
@@ -684,3 +730,7 @@ share/sip/PyQt5/QtXmlPatterns/qxmlschemavalidator.sip
 share/sip/PyQt5/QtXmlPatterns/qxmlserializer.sip
 share/sip/PyQt5/_QOpenGLFunctions_2_0/_QOpenGLFunctions_2_0mod.sip
 share/sip/PyQt5/_QOpenGLFunctions_2_0/qopenglfunctions_2_0.sip
+share/sip/PyQt5/_QOpenGLFunctions_2_1/_QOpenGLFunctions_2_1mod.sip
+share/sip/PyQt5/_QOpenGLFunctions_2_1/qopenglfunctions_2_1.sip
+share/sip/PyQt5/_QOpenGLFunctions_4_1_Core/_QOpenGLFunctions_4_1_Coremod.sip
+share/sip/PyQt5/_QOpenGLFunctions_4_1_Core/qopenglfunctions_4_1_core.sip
diff --git a/x11/py-qt5/distinfo b/x11/py-qt5/distinfo
index 26c270714df..b13d4ef6f92 100644
--- a/x11/py-qt5/distinfo
+++ b/x11/py-qt5/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/04/12 17:55:46 adam Exp $
+$NetBSD: distinfo,v 1.3 2015/10/26 21:40:39 adam Exp $
 
-SHA1 (PyQt-gpl-5.4.tar.gz) = 057e6b32c43e673e79f876fb9b6f33d3072edfc2
-RMD160 (PyQt-gpl-5.4.tar.gz) = 93a7046162d6a65d781797599cf08532e1fb1746
-Size (PyQt-gpl-5.4.tar.gz) = 3644542 bytes
-SHA1 (patch-configure.py) = 7bf757bb94f40e7bbe3b572f4d05d9cf40d2e6c0
+SHA1 (PyQt-gpl-5.5.1.tar.gz) = d54cd7cf26b10f0b59fddce4a6a742f9697a94ff
+RMD160 (PyQt-gpl-5.5.1.tar.gz) = f0027899d9cef20d40dbcad01560edd25c6f7e4e
+SHA512 (PyQt-gpl-5.5.1.tar.gz) = ed9a4f30a50c0879f25b6a0841247f3f0de86942b55c1de9efea963bfbf64ee963a9e5c09be036ff2dec76164863b3b6235e45e8662776425f15378fa0abeab4
+Size (PyQt-gpl-5.5.1.tar.gz) = 3705749 bytes
+SHA1 (patch-configure.py) = 8cba68f76142df2ed61dec766f8c0e952210487e
diff --git a/x11/py-qt5/patches/patch-configure.py b/x11/py-qt5/patches/patch-configure.py
index 211a88146e5..3e17eb70887 100644
--- a/x11/py-qt5/patches/patch-configure.py
+++ b/x11/py-qt5/patches/patch-configure.py
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure.py,v 1.2 2015/04/12 17:55:46 adam Exp $
+$NetBSD: patch-configure.py,v 1.3 2015/10/26 21:40:40 adam Exp $
 
 On Darwin, do not expect application bundle.
 Adapt for pkgsrc change to make qmake create libtool files.
 
---- configure.py.orig	2014-12-25 10:18:15.000000000 +0000
+--- configure.py.orig	2015-10-25 11:42:16.000000000 +0000
 +++ configure.py
-@@ -1858,10 +1858,7 @@ def run_make(target_config, verbose, exe
+@@ -1932,10 +1932,7 @@ def run_make(target_config, verbose, exe
          make = 'make'
          makefile_target = ''
  
@@ -17,7 +17,7 @@ Adapt for pkgsrc change to make qmake create libtool files.
  
      remove_file(platform_exe)
  
-@@ -2363,8 +2360,8 @@ win32 {
+@@ -2441,8 +2438,8 @@ win32 {
      target.files = %s%s.pyd
      LIBS += %s
  } else {
@@ -28,11 +28,21 @@ Adapt for pkgsrc change to make qmake create libtool files.
  }
  ''' % (target_name, debug_suffix, target_name, debug_suffix, link, target_name, target_name)
  
-@@ -2434,7 +2431,6 @@ win32 {
+@@ -2517,9 +2514,6 @@ win32 {
+             # common case where the PyQt configuration reflects the Qt
+             # configuration.
+             fwks = []
+-            for m in ('QtPrintSupport', 'QtDBus', 'QtWidgets'):
+-                if m in target_config.pyqt_modules:
+-                    fwks.append('-framework ' + m)
+ 
+             if len(fwks) != 0:
+                 extra_lflags = 'QMAKE_LFLAGS += "%s"\n        ' % ' '.join(fwks)
+@@ -2532,7 +2526,6 @@ win32 {
  }
  macx {
      QMAKE_LFLAGS += "-undefined dynamic_lookup"
 -    QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
- }
- '''
  
+     greaterThan(QT_MINOR_VERSION, 4) {
+         %sQMAKE_RPATHDIR += $$[QT_INSTALL_LIBS]