Udpate PyQt5 to 5.6.2

Update PyQt from 5.5.1 to 5.6.2 to match the Qt updates that have
already landed in the ports tree.

PR:		214355
Submitted by:	Adriaan de Groot <groot@kde.org>
Reviewed by:	rakuco, tcberner
Approved by:	rakuco (mentor)
Exp-Run by:	antoine
Differential Revision:	https://reviews.freebsd.org/D8408

5 files changed, 38 insertions, 19 deletions

diff --git a/devel/py-qt5-core/files/patch-configure.py b/devel/py-qt5-core/files/patch-configure.py
index 87e909eb3ffb..27350ce3b841 100644
--- a/devel/py-qt5-core/files/patch-configure.py
+++ b/devel/py-qt5-core/files/patch-configure.py
@@ -3,9 +3,13 @@ This patch is necessary for us to split PyQt5 up into several different ports.
 It works by conditionally building and installing some tools (such as
 pylupdate5 and pyrcc5), replacing the all-encompassing PyQt5.api file that
 depends on different modules with module-specific .api files.
---- configure.py.orig	2015-10-25 11:42:16 UTC
-+++ configure.py
-@@ -1458,13 +1458,13 @@ def generate_makefiles(target_config, ve
+
+Also fixes a bug where dbus support drops multiple -I flags produced
+by pkg-config --cflags dbus-1 .
+
+--- configure.py.orig	2016-04-24 10:55:08.000000000 +0000
++++ configure.py	2016-10-30 22:16:19.159104000 +0000
+@@ -1482,13 +1482,13 @@
  
      generate_sip_module_code(target_config, verbose, no_timestamp, parts,
              tracing, 'Qt', sip_flags)
@@ -24,7 +28,7 @@ depends on different modules with module-specific .api files.
  
          # Generate the pyuic5 wrapper.
          pyuic_wrapper = generate_pyuic5_wrapper(target_config)
-@@ -1483,22 +1483,6 @@ def generate_makefiles(target_config, ve
+@@ -1507,22 +1507,6 @@
                      source_path('examples', 'quick', 'tutorials', 'extending',
                              'chapter6-plugins'))
  
@@ -47,28 +51,28 @@ depends on different modules with module-specific .api files.
      # Generate the Python dbus module.
      if target_config.pydbus_module_dir != '':
          mname = 'dbus'
-@@ -1526,21 +1510,24 @@ def generate_makefiles(target_config, ve
+@@ -1548,21 +1532,24 @@
      out_f.write('''TEMPLATE = subdirs
  CONFIG += ordered nostrip
  SUBDIRS = %s
-+''' % (' '.join(subdirs)))
++''' % ' '.join(subdirs))
  
 +    if "QtCore" in target_config.pyqt_modules:
 +        out_f.write('''
  init_py.files = %s
- init_py.path = %s/PyQt5
+ init_py.path = %s
  INSTALLS += init_py
--''' % (' '.join(subdirs), source_path('__init__.py'), target_config.pyqt_module_dir))
-+''' % (source_path('__init__.py'), target_config.pyqt_module_dir))
+-''' % (' '.join(subdirs), source_path('__init__.py'), qmake_quote(target_config.pyqt_module_dir + '/PyQt5')))
++''' % (source_path('__init__.py'), qmake_quote(target_config.pyqt_module_dir + '/PyQt5')))
  
 -    # Install the uic module and the pyuic5 wrapper.
 -    out_f.write('''
 +        # Install the uic module and the pyuic5 wrapper.
 +        out_f.write('''
  uic_package.files = %s
- uic_package.path = %s/PyQt5
+ uic_package.path = %s
  INSTALLS += uic_package
- ''' % (source_path('pyuic', 'uic'), target_config.pyqt_module_dir))
+ ''' % (source_path('pyuic', 'uic'), qmake_quote(target_config.pyqt_module_dir + '/PyQt5')))
  
 -    if not target_config.no_tools:
 -        out_f.write('''
@@ -77,7 +81,7 @@ depends on different modules with module-specific .api files.
  pyuic5.files = %s
  pyuic5.path = %s
  INSTALLS += pyuic5
-@@ -1548,11 +1535,12 @@ INSTALLS += pyuic5
+@@ -1579,11 +1566,12 @@
  
      # Install the QScintilla .api file.
      if target_config.qsci_api:
@@ -85,10 +89,21 @@ depends on different modules with module-specific .api files.
          out_f.write('''
 -qscintilla_api.files = PyQt5.api
 +qscintilla_api.files = %s
- qscintilla_api.path = %s/api/python
+ qscintilla_api.path = %s
  INSTALLS += qscintilla_api
--''' % target_config.qsci_api_dir)
-+''' % (api_list, target_config.qsci_api_dir))
+-''' % qmake_quote(target_config.qsci_api_dir + '/api/python'))
++''' % (api_list, qmake_quote(target_config.qsci_api_dir + '/api/python')))
  
      out_f.close()
  
+@@ -2140,7 +2128,9 @@
+     else:
+         dlist = target_config.dbus_inc_dirs
+ 
+-    target_config.dbus_inc_dirs = []
++    # Don't reset dbus_inc_dirs, because it will forget the flags
++    # found for dbus, above (which might require multiple -I flags).
++    # target_config.dbus_inc_dirs = []
+ 
+     for d in dlist:
+         if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK):
diff --git a/devel/py-qt5-core/pkg-plist b/devel/py-qt5-core/pkg-plist
index 433ef5d6b609..28950ed04e4e 100644
--- a/devel/py-qt5-core/pkg-plist
+++ b/devel/py-qt5-core/pkg-plist
@@ -213,6 +213,7 @@ bin/pyuic5
 %%PYQT_SIPDIR%%/QtCore/quuid.sip
 %%PYQT_SIPDIR%%/QtCore/qvariant.sip
 %%PYQT_SIPDIR%%/QtCore/qvariantanimation.sip
+%%PYQT_SIPDIR%%/QtCore/qversionnumber.sip
 %%PYQT_SIPDIR%%/QtCore/qwaitcondition.sip
 %%PYQT_SIPDIR%%/QtCore/qwineventnotifier.sip
 %%PYQT_SIPDIR%%/QtCore/qxmlstream.sip
diff --git a/devel/py-qt5/distinfo b/devel/py-qt5/distinfo
index 0dc55e6f9f49..c79dd9c9ce16 100644
--- a/devel/py-qt5/distinfo
+++ b/devel/py-qt5/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PyQt-gpl-5.5.1.tar.gz) = 0a70ef94fbffcf674b0dde024aae2a2a7a3f5a8c42806109ff7df2c941bd8386
-SIZE (PyQt-gpl-5.5.1.tar.gz) = 3705749
+TIMESTAMP = 1477759251
+SHA256 (PyQt5_gpl-5.6.tar.gz) = 2e481a6c4c41b96ed3b33449e5f9599987c63a5c8db93313bd57a6acbf20f0e1
+SIZE (PyQt5_gpl-5.6.tar.gz) = 3720782
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index 068a695edc90..4191b9e0956c 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,2 +1,3 @@
-SHA256 (sip-4.17.tar.gz) = 603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060
-SIZE (sip-4.17.tar.gz) = 959835
+TIMESTAMP = 1473848835
+SHA256 (sip-4.18.tar.gz) = f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6
+SIZE (sip-4.18.tar.gz) = 991980
diff --git a/devel/py-sip/pkg-plist b/devel/py-sip/pkg-plist
index 0a560907a499..6722afa4f48b 100644
--- a/devel/py-sip/pkg-plist
+++ b/devel/py-sip/pkg-plist
@@ -1,6 +1,7 @@
 bin/sip
 %%PYTHON_INCLUDEDIR%%/sip.h
 %%PYTHON_SITELIBDIR%%/sip.so
+%%PYTHON_SITELIBDIR%%/sip.pyi
 %%PYTHON_SITELIBDIR%%/sipconfig.py
 %%PYTHON_SITELIBDIR%%/sipconfig.pyc
 %%PYTHON_SITELIBDIR%%/sipconfig.pyo