Update PyQt4 to 4.11.4, SIP to 4.17 and QScintilla2 to 2.9.1.

Bring in some long overdue updates, some of which are required for us to
later land the PyQt5 ports.

One big change with this update is that the PyQt4 ports now install their
.sip files into share/py-sip/PyQt4 instead of share/py-sip. This way we do
not end up with directories like share/py-sip/QtCore, which are especially
confusing once PyQt5 lands and starts installing files with the same names.

Other noteworthy items:
- PORTREVISION has been bumped on ports depending on devel/qscintilla2
  because libqscintilla2.so's SOVERSION has changed.
- graphics/seexpr has been converted to USE_PYQT, as the file it used to
  define a build-time dependency on x11-toolkits/py-qt4-gui has moved.

Once again, big thanks to Tobias Berner <tcberner@gmail.com> and Guido Falsi
(madpilot@) for their initial work on these ports as part of the effort to
land PyQt5 into the tree (see D2910 in Phabricator for an earlier version of
the PyQt5 patch set).

PR:		205143

11 files changed, 14 insertions, 16 deletions

diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index cbdc145f4fbc..d484f836ff82 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	dbus
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 
diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile
index 9f72701dda9e..3f3c2297c09e 100644
--- a/devel/py-qt4-dbussupport/Makefile
+++ b/devel/py-qt4-dbussupport/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	dbussupport
-PORTREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/py-qt4-qscintilla2/pkg-plist b/devel/py-qt4-qscintilla2/pkg-plist
index 18d73a9e6403..774f88502737 100644
--- a/devel/py-qt4-qscintilla2/pkg-plist
+++ b/devel/py-qt4-qscintilla2/pkg-plist
@@ -43,14 +43,12 @@
 %%PYQT_SIPDIR%%/Qsci/qscilexerxml.sip
 %%PYQT_SIPDIR%%/Qsci/qscilexeryaml.sip
 %%PYQT_SIPDIR%%/Qsci/qscimacro.sip
-%%PYQT_SIPDIR%%/Qsci/qscimod3.sip
 %%PYQT_SIPDIR%%/Qsci/qscimod4.sip
 %%PYQT_SIPDIR%%/Qsci/qscimod5.sip
 %%PYQT_SIPDIR%%/Qsci/qscimodcommon.sip
 %%PYQT_SIPDIR%%/Qsci/qsciprinter.sip
 %%PYQT_SIPDIR%%/Qsci/qsciscintilla.sip
-%%PYQT_SIPDIR%%/Qsci/qsciscintillabase3.sip
-%%PYQT_SIPDIR%%/Qsci/qsciscintillabase4.sip
+%%PYQT_SIPDIR%%/Qsci/qsciscintillabase.sip
 %%PYQT_SIPDIR%%/Qsci/qscistyle.sip
 %%PYQT_SIPDIR%%/Qsci/qscistyledtext.sip
 share/qt4/qsci/api/python/QScintilla2.api
diff --git a/devel/py-qt4/distinfo b/devel/py-qt4/distinfo
index 5cf3cf369996..300e82a26909 100644
--- a/devel/py-qt4/distinfo
+++ b/devel/py-qt4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.11.3.tar.gz) = 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686
-SIZE (PyQt-x11-gpl-4.11.3.tar.gz) = 11120237
+SHA256 (PyQt-x11-gpl-4.11.4.tar.gz) = fc1fe77495432ba3b0d74ff5cb164d375a97f5dddb728256330f615a7cdcf407
+SIZE (PyQt-x11-gpl-4.11.4.tar.gz) = 11317088
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 1e763599b0ab..56991de9c7f0 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	sip
 PORTVERSION=	${SIP_VERSION}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_SIP}
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index 7b467ba73da6..068a695edc90 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sip-4.16.5.tar.gz) = a00ba34c30bedc0f61916eb10bd12867b4754910a766647e3e58f88bd00f1e87
-SIZE (sip-4.16.5.tar.gz) = 859672
+SHA256 (sip-4.17.tar.gz) = 603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060
+SIZE (sip-4.17.tar.gz) = 959835
diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo
index c6d9c210e0cc..35ea2ad97749 100644
--- a/devel/qscintilla2/distinfo
+++ b/devel/qscintilla2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (QScintilla-gpl-2.8.4.tar.gz) = 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f
-SIZE (QScintilla-gpl-2.8.4.tar.gz) = 3031919
+SHA256 (QScintilla-gpl-2.9.1.tar.gz) = 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf
+SIZE (QScintilla-gpl-2.9.1.tar.gz) = 2490144
diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist
index d65adc109adf..dc5eb1a07684 100644
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@@ -49,9 +49,9 @@
 %%QT_INCDIR%%/Qsci/qscistyle.h
 %%QT_INCDIR%%/Qsci/qscistyledtext.h
 %%QT_LIBDIR%%/libqscintilla2.so
-%%QT_LIBDIR%%/libqscintilla2.so.11
-%%QT_LIBDIR%%/libqscintilla2.so.11.3
-%%QT_LIBDIR%%/libqscintilla2.so.11.3.0
+%%QT_LIBDIR%%/libqscintilla2.so.12
+%%QT_LIBDIR%%/libqscintilla2.so.12.0
+%%QT_LIBDIR%%/libqscintilla2.so.12.0.1
 %%QT_MKSPECDIR%%/features/qscintilla2.prf
 share/qt4/qsci/api/python/Python-2.4.api
 share/qt4/qsci/api/python/Python-2.5.api
@@ -61,6 +61,7 @@ share/qt4/qsci/api/python/Python-3.1.api
 share/qt4/qsci/api/python/Python-3.2.api
 share/qt4/qsci/api/python/Python-3.3.api
 share/qt4/qsci/api/python/Python-3.4.api
+share/qt4/qsci/api/python/Python-3.5.api
 %%NLS%%share/qt4/translations/qscintilla_cs.qm
 %%NLS%%share/qt4/translations/qscintilla_de.qm
 %%NLS%%share/qt4/translations/qscintilla_es.qm
diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile
index 1ac93b2769f1..7eca6a0c99c0 100644
--- a/devel/ruby-qtruby/Makefile
+++ b/devel/ruby-qtruby/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qtruby
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde ruby
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/smokeqt/Makefile b/devel/smokeqt/Makefile
index 1385ca398162..311a67f4975b 100644
--- a/devel/smokeqt/Makefile
+++ b/devel/smokeqt/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	smokeqt
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile
index 983bb6e6daf6..802586759fce 100644
--- a/devel/universalindentgui/Makefile
+++ b/devel/universalindentgui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	universalindentgui
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	SF/universalindent/uigui/UniversalIndentGUI_${PORTVERSION}