update PyQt to 3.14

changes:
-support for new qscintilla
-added support for QUuid, QMetaObject and QMetaProperty classes
-bugfixes

4 files changed, 69 insertions, 24 deletions

diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index 7b8417142c0..1e0f3e7b283 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/01/23 20:41:50 recht Exp $
+# $NetBSD: Makefile,v 1.12 2005/02/24 20:17:36 drochner Exp $
 #
 
-DISTNAME=		PyQt-x11-gpl-3.11
-PKGNAME=		${PYPKGPREFIX}-qt3-base-3.11
-PKGREVISION=	1
+DISTNAME=		PyQt-x11-gpl-3.14
+PKGNAME=		${PYPKGPREFIX}-qt3-base-3.14
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
 
diff --git a/x11/py-qt3-base/PLIST b/x11/py-qt3-base/PLIST
index 515b26cf42b..996b86a7e10 100644
--- a/x11/py-qt3-base/PLIST
+++ b/x11/py-qt3-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/09 17:06:07 recht Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/02/24 20:17:37 drochner Exp $
 bin/pylupdate${PYVERSSUFFIX}
 bin/pyuic${PYVERSSUFFIX}
 ${PYSITELIB}/pyqtconfig.py
@@ -79,6 +79,7 @@ share/sip${PYVERSSUFFIX}/qt/qmemarray.sip
 share/sip${PYVERSSUFFIX}/qt/qmenubar.sip
 share/sip${PYVERSSUFFIX}/qt/qmenudata.sip
 share/sip${PYVERSSUFFIX}/qt/qmessagebox.sip
+share/sip${PYVERSSUFFIX}/qt/qmetaobject.sip
 share/sip${PYVERSSUFFIX}/qt/qmime.sip
 share/sip${PYVERSSUFFIX}/qt/qmotifplusstyle.sip
 share/sip${PYVERSSUFFIX}/qt/qmotifstyle.sip
@@ -161,6 +162,7 @@ share/sip${PYVERSSUFFIX}/qt/qtranslator.sip
 share/sip${PYVERSSUFFIX}/qt/qurl.sip
 share/sip${PYVERSSUFFIX}/qt/qurlinfo.sip
 share/sip${PYVERSSUFFIX}/qt/qurloperator.sip
+share/sip${PYVERSSUFFIX}/qt/quuid.sip
 share/sip${PYVERSSUFFIX}/qt/qvalidator.sip
 share/sip${PYVERSSUFFIX}/qt/qvaluelist.sip
 share/sip${PYVERSSUFFIX}/qt/qvariant.sip
diff --git a/x11/py-qt3-base/distinfo b/x11/py-qt3-base/distinfo
index f0b09be8a49..f4ba8c7feb4 100644
--- a/x11/py-qt3-base/distinfo
+++ b/x11/py-qt3-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:18 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/02/24 20:17:37 drochner Exp $
 
 SHA1 (PyQt-x11-gpl-3.11.tar.gz) = 7b4949d97cdf989119681d34f8c30fede2d04e82
 RMD160 (PyQt-x11-gpl-3.11.tar.gz) = 985e21b213b195944f766f249d8fc44916c2f1ec
 Size (PyQt-x11-gpl-3.11.tar.gz) = 757652 bytes
-SHA1 (patch-aa) = 1d16293b66739d2d4fbfd45b4ad850c6c2842863
+SHA1 (patch-aa) = f77e1969b0403e96c9445018ed71f431f32dcfb2
 SHA1 (patch-ab) = 46cf5b2eb3481a9f5a1264f11abc57421c4d47a0
 SHA1 (patch-ac) = c3cd88ef6119f224920c0b8e6852b35052e6751a
diff --git a/x11/py-qt3-base/patches/patch-aa b/x11/py-qt3-base/patches/patch-aa
index 83b94ddacfb..7434db354cd 100644
--- a/x11/py-qt3-base/patches/patch-aa
+++ b/x11/py-qt3-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
+$NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
 
---- configure.py.orig	2004-03-11 20:23:30.000000000 +0100
-+++ configure.py	2004-05-09 11:30:42.000000000 +0200
-@@ -663,7 +663,7 @@
+--- configure.py.orig	2005-02-19 16:49:33.000000000 +0100
++++ configure.py
+@@ -732,7 +732,7 @@ def check_license():
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -11,12 +11,48 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -853,21 +853,21 @@
+@@ -768,7 +768,7 @@ def create_makefiles():
+ 
+         sipconfig.inform("Creating pyuic Makefile...")
+ 
+-        if prof or "qtxml" not in pyqt_modules:
++        if prof: #or "qtxml" not in pyqt_modules:
+             buildfile= "pyuic-prof.sbf"
+ 
+             for xml in ("qdom.cpp", "qxml.cpp"):
+@@ -789,7 +789,7 @@ def create_makefiles():
+         makefile.extra_defines.append("UIC")
+         makefile.extra_defines.append("QT_INTERNAL_XML")
+ 
+-        if prof or "qtxml" not in pyqt_modules:
++        if prof: #or "qtxml" not in pyqt_modules:
+             makefile.extra_defines.append("QT_MODULE_XML")
+ 
+         if sipcfg.qt_version < 0x030100:
+@@ -800,7 +800,7 @@ def create_makefiles():
+ 
+         sipconfig.inform("Creating pylupdate Makefile...")
+ 
+-        if prof or "qtxml" not in pyqt_modules:
++        if prof: #or "qtxml" not in pyqt_modules:
+             buildfile= "pylupdate-prof.sbf"
+ 
+             shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
+@@ -819,7 +819,7 @@ def create_makefiles():
+ 
+         makefile.extra_defines.append("QT_INTERNAL_XML")
+ 
+-        if prof or "qtxml" not in pyqt_modules:
++        if prof: #or "qtxml" not in pyqt_modules:
+             makefile.extra_defines.append("QT_MODULE_XML")
+ 
+         makefile.generate()
+@@ -936,26 +936,26 @@ def main(argv):
              sipcfg.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
  
      # Check for QScintilla.
 -    check_qscintilla()
-+    #check_qscintilla()
++#    check_qscintilla()
  
      # Check which modules to build.
 -    check_module("qtcanvas", "qcanvas.h", "QCanvas()")
@@ -24,24 +60,32 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
 -    check_module("qttable", "qtable.h", "QTable()")
 -    check_module("qtxml", "qdom.h", "QDomImplementation()")
 -    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
-+    #check_module("qtcanvas", "qcanvas.h", "QCanvas()")
-+    #check_module("qtnetwork", "qsocket.h", "QSocket()")
-+    #check_module("qttable", "qtable.h", "QTable()")
-+    #check_module("qtxml", "qdom.h", "QDomImplementation()")
-+    #check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
++#    check_module("qtcanvas", "qcanvas.h", "QCanvas()")
++#    check_module("qtnetwork", "qsocket.h", "QSocket()")
++#    check_module("qttable", "qtable.h", "QTable()")
++#    check_module("qtxml", "qdom.h", "QDomImplementation()")
++#    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
 +
-+    #if sipcfg.qt_version >= 0x030000:
-+    #    check_module("qtsql", "qsql.h", "QSql()")
-+    #    check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
++#    if sipcfg.qt_version >= 0x030000:
++#        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
  
 -    if sipcfg.qt_version >= 0x030000:
--        check_module("qtsql", "qsql.h", "QSql()")
 -        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
 -
+-        if sipcfg.qt_edition in ("enterprise", "free"):
+-            check_module("qtsql", "qsql.h", "QSql()")
++#        if sipcfg.qt_edition in ("enterprise", "free"):
++#            check_module("qtsql", "qsql.h", "QSql()")
+ 
+-            if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
+-                check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
++#            if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
++#                check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
+ 
 -    if qsci_version:
 -        check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
-+    #if qsci_version:
-+    #    check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
++#    if qsci_version:
++#        check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
  
      if opt_qtpetag:
          pyqt_modules.append("qtpe")