revert to 4.10.2

4.10.3 needs sip-4.15 which is not compatible to pyqt3 and pyKDE

4 files changed, 13 insertions, 14 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index bf43e641472..647664e6798 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2013/08/23 11:27:17 drochner Exp $
+# $NetBSD: Makefile,v 1.70 2013/09/05 15:29:05 drochner Exp $
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=	4.10.3
+PYQT_VERSION=	4.10.2
 CATEGORIES=	x11 python
 #MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
@@ -68,7 +68,6 @@ do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
 
-BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.15
 .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 a4e215122e3..4d7bc68b3ed 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.22 2013/08/23 11:27:17 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.23 2013/09/05 15:29:05 drochner Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index 88a46db4988..6576974872f 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2013/08/23 11:27:17 drochner Exp $
+$NetBSD: distinfo,v 1.31 2013/09/05 15:29:05 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-4.10.3.tar.gz) = 2866ea9bdb1c30337fb326ca3442c61e3c3e3396
-RMD160 (PyQt-x11-gpl-4.10.3.tar.gz) = 1ca1de91d7445f604968e98b369aa6d2fd7d37ca
-Size (PyQt-x11-gpl-4.10.3.tar.gz) = 11187362 bytes
-SHA1 (patch-aa) = 5939aff0f322a5553a61464e0f7998226ca646e4
+SHA1 (PyQt-x11-gpl-4.10.2.tar.gz) = 9a90e74c73f7c3e4a91eeb6f268f323a5722d9b6
+RMD160 (PyQt-x11-gpl-4.10.2.tar.gz) = 530ec99325bade7c0451d3458da020e9ab981a1c
+Size (PyQt-x11-gpl-4.10.2.tar.gz) = 11280941 bytes
+SHA1 (patch-aa) = 726a9be11f0fa8a275daa61358557cf37a6bf531
 SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1
diff --git a/x11/py-qt4/patches/patch-aa b/x11/py-qt4/patches/patch-aa
index 1c9b7b09c7b..a4d62b8bf80 100644
--- a/x11/py-qt4/patches/patch-aa
+++ b/x11/py-qt4/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2013/08/23 11:27:17 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2013/09/05 15:29:05 drochner Exp $
 
---- configure.py.orig	2013-08-21 05:50:47.000000000 +0000
+--- configure.py.orig	2013-04-21 12:01:57.000000000 +0000
 +++ configure.py
 @@ -345,7 +345,7 @@ class ConfigurePyQt4:
          pyqt_modules.append("QtCore")
@@ -11,9 +11,9 @@ $NetBSD: patch-aa,v 1.9 2013/08/23 11:27:17 drochner Exp $
          check_module("QtMultimedia", "QAudioDeviceInfo",
                  "new QAudioDeviceInfo()")
          check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
-@@ -371,8 +371,8 @@ class ConfigurePyQt4:
-         check_module("QtTest", "QtTest", "QTest::qSleep(0)")
+@@ -369,8 +369,8 @@ class ConfigurePyQt4:
          check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
+         check_module("QtXml", "qdom.h", "new QDomDocument()")
          check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
 -        check_module("phonon", "phonon/videowidget.h",
 -                "new Phonon::VideoWidget()")
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.9 2013/08/23 11:27:17 drochner Exp $
          check_module("QtAssistant", "qassistantclient.h",
                  "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
                  extra_libs=ass_libs)
-@@ -2092,11 +2092,7 @@ int main(int argc, char **argv)
+@@ -2093,11 +2093,7 @@ int main(int argc, char **argv)
  
      out << QLibraryInfo::licensee() << '\\n';