7 files changed, 55 insertions, 7 deletions

diff --git a/x11-toolkits/py-kde/Makefile b/x11-toolkits/py-kde/Makefile
index cdea82fbbe91..46fe2f574524 100644
--- a/x11-toolkits/py-kde/Makefile
+++ b/x11-toolkits/py-kde/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	kde
 PORTVERSION=	${PYKDE3_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits python kde
-MASTER_SITES=	${MASTER_SITES_PYKDE3} ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=lofi
+MASTER_SITES=	${MASTER_SITES_PYKDE3}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PYKDE3_DISTNAME}
 
@@ -20,7 +19,7 @@ COMMENT=	Python bindings for KDE3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
 		${PYTHON_PKGNAMEPREFIX}qt>=${PYQT3_VERSION}:${PORTSDIR}/x11-toolkits/py-qt
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_KDEBASE_VER=3
 USE_PYTHON=	2.5+
diff --git a/x11-toolkits/py-kde/files/patch-sip__kio__global.sip b/x11-toolkits/py-kde/files/patch-sip__kio__global.sip
new file mode 100644
index 000000000000..502a8327bfbb
--- /dev/null
+++ b/x11-toolkits/py-kde/files/patch-sip__kio__global.sip
@@ -0,0 +1,25 @@
+diff -ru PyKDE-3.16.6/sip/kio/global.sip PyKDE-3.16.7/sip/kio/global.sip
+--- sip/kio/global.sip	2009-06-10 22:44:48.000000000 +0100
++++ sip/kio/global.sip	2010-01-25 09:47:39.410088826 +0000
+@@ -477,20 +477,7 @@
+ %MethodCode
+ //takes dict | (KIO.MetaData)
+ //returns (KIO.MetaData)
+-
+-
+-    PyObject *dict;
+-    if (sipParseArgs(&sipArgsParsed,sipArgs,"T", &PyDict_Type, &dict))
+-    {
+-        int isErr = 0;
+-        KIO::MetaData *map = (KIO::MetaData *)sipForceConvertToType(dict, sipType_KIO_MetaData, NULL, SIP_NO_CONVERTORS, NULL, &isErr);
+-        if (isErr)
+-        {
+-            Py_INCREF (Py_None);
+-            return Py_None;
+-        }
+-        return sipConvertFromType(map, sipType_KIO_MetaData, NULL);
+-    }
++    sipRes = a0;
+ %End
+ 
+ //end
diff --git a/x11-toolkits/py-pyqwt/Makefile b/x11-toolkits/py-pyqwt/Makefile
index 5b3522611bf9..2093e1784278 100644
--- a/x11-toolkits/py-pyqwt/Makefile
+++ b/x11-toolkits/py-pyqwt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pyqwt
 PORTVERSION=	5.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}5/PyQwt-${PORTVERSION}
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index f13895820d56..7598cab7ec1c 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	${PYQT3_VERSION}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITES_PYQT3}
diff --git a/x11-toolkits/py-qt/files/patch-configure.py b/x11-toolkits/py-qt/files/patch-configure.py
index f42fc0938f36..b0489c79e591 100644
--- a/x11-toolkits/py-qt/files/patch-configure.py
+++ b/x11-toolkits/py-qt/files/patch-configure.py
@@ -1,5 +1,14 @@
 --- configure.py.orig	Sun May 13 20:08:01 2007
 +++ configure.py	Sun May 13 20:14:01 2007
+@@ -107,7 +107,7 @@
+     sys.stdout.write("  -a tag  explicitly enable the qtpe module\n")
+     sys.stdout.write("  -b dir  where pyuic and pylupdate will be installed [default %s]\n" % opt_pyqtbindir)
+     sys.stdout.write("  -c      concatenate each module's C/C++ source files\n")
+-    sys.stdout.write("  -d dir  where the PyQt modules will be installed [default %\ns]" % opt_pyqtmoddir)
++    sys.stdout.write("  -d dir  where the PyQt modules will be installed [default %s]\n" % opt_pyqtmoddir)
+     sys.stdout.write("  -f      keep any existing features file (when cross-compiling) [default remove]\n")
+     sys.stdout.write("  -g dir  where the Qt qconfig.h file can be found [default Qt include directory]\n")
+     sys.stdout.write("  -i      enable checking of signed interpreters using the VendorID package [default disabled]\n")
 @@ -1081,15 +1081,12 @@
          macros["LIBDIR_QT"] = qt_libdir
  
diff --git a/x11-toolkits/py-qt4-gui/distinfo b/x11-toolkits/py-qt4-gui/distinfo
index f6a298a5be54..a5eccc57a770 100644
--- a/x11-toolkits/py-qt4-gui/distinfo
+++ b/x11-toolkits/py-qt4-gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-4.6.2.tar.gz) = b7aba1b0e41d674b0ebcb64844f442f7
-SHA256 (PyQt-x11-gpl-4.6.2.tar.gz) = 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
-SIZE (PyQt-x11-gpl-4.6.2.tar.gz) = 6979753
+MD5 (PyQt-x11-gpl-4.7.tar.gz) = 4882179ab4da128aaa8520f146afb955
+SHA256 (PyQt-x11-gpl-4.7.tar.gz) = 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
+SIZE (PyQt-x11-gpl-4.7.tar.gz) = 7888435
diff --git a/x11-toolkits/py-qt4-gui/pkg-plist b/x11-toolkits/py-qt4-gui/pkg-plist
index 743a7234ba0a..03648e900b98 100644
--- a/x11-toolkits/py-qt4-gui/pkg-plist
+++ b/x11-toolkits/py-qt4-gui/pkg-plist
@@ -51,6 +51,11 @@
 %%SIP%%share/py-sip/QtGui/qfontmetrics.sip
 %%SIP%%share/py-sip/QtGui/qformlayout.sip
 %%SIP%%share/py-sip/QtGui/qframe.sip
+%%SIP%%share/py-sip/QtGui/qgenericmatrix.sip
+%%SIP%%share/py-sip/QtGui/qgesture.sip
+%%SIP%%share/py-sip/QtGui/qgesturerecognizer.sip
+%%SIP%%share/py-sip/QtGui/qgraphicsanchorlayout.sip
+%%SIP%%share/py-sip/QtGui/qgraphicseffect.sip
 %%SIP%%share/py-sip/QtGui/qgraphicsgridlayout.sip
 %%SIP%%share/py-sip/QtGui/qgraphicsitem.sip
 %%SIP%%share/py-sip/QtGui/qgraphicsitemanimation.sip
@@ -60,6 +65,7 @@
 %%SIP%%share/py-sip/QtGui/qgraphicsproxywidget.sip
 %%SIP%%share/py-sip/QtGui/qgraphicsscene.sip
 %%SIP%%share/py-sip/QtGui/qgraphicssceneevent.sip
+%%SIP%%share/py-sip/QtGui/qgraphicstransform.sip
 %%SIP%%share/py-sip/QtGui/qgraphicsview.sip
 %%SIP%%share/py-sip/QtGui/qgraphicswidget.sip
 %%SIP%%share/py-sip/QtGui/qgridlayout.sip
@@ -77,6 +83,7 @@
 %%SIP%%share/py-sip/QtGui/qitemdelegate.sip
 %%SIP%%share/py-sip/QtGui/qitemeditorfactory.sip
 %%SIP%%share/py-sip/QtGui/qitemselectionmodel.sip
+%%SIP%%share/py-sip/QtGui/qkeyeventtransition.sip
 %%SIP%%share/py-sip/QtGui/qkeysequence.sip
 %%SIP%%share/py-sip/QtGui/qlabel.sip
 %%SIP%%share/py-sip/QtGui/qlayout.sip
@@ -87,12 +94,14 @@
 %%SIP%%share/py-sip/QtGui/qlistwidget.sip
 %%SIP%%share/py-sip/QtGui/qmainwindow.sip
 %%SIP%%share/py-sip/QtGui/qmatrix.sip
+%%SIP%%share/py-sip/QtGui/qmatrix4x4.sip
 %%SIP%%share/py-sip/QtGui/qmdiarea.sip
 %%SIP%%share/py-sip/QtGui/qmdisubwindow.sip
 %%SIP%%share/py-sip/QtGui/qmenu.sip
 %%SIP%%share/py-sip/QtGui/qmenubar.sip
 %%SIP%%share/py-sip/QtGui/qmessagebox.sip
 %%SIP%%share/py-sip/QtGui/qmime.sip
+%%SIP%%share/py-sip/QtGui/qmouseeventtransition.sip
 %%SIP%%share/py-sip/QtGui/qmovie.sip
 %%SIP%%share/py-sip/QtGui/qpagesetupdialog.sip
 %%SIP%%share/py-sip/QtGui/qpaintdevice.sip
@@ -117,6 +126,7 @@
 %%SIP%%share/py-sip/QtGui/qproxymodel.sip
 %%SIP%%share/py-sip/QtGui/qpushbutton.sip
 %%SIP%%share/py-sip/QtGui/qpytextobject.sip
+%%SIP%%share/py-sip/QtGui/qquaternion.sip
 %%SIP%%share/py-sip/QtGui/qradiobutton.sip
 %%SIP%%share/py-sip/QtGui/qregion.sip
 %%SIP%%share/py-sip/QtGui/qrgb.sip
@@ -173,6 +183,9 @@
 %%SIP%%share/py-sip/QtGui/qundostack.sip
 %%SIP%%share/py-sip/QtGui/qundoview.sip
 %%SIP%%share/py-sip/QtGui/qvalidator.sip
+%%SIP%%share/py-sip/QtGui/qvector2d.sip
+%%SIP%%share/py-sip/QtGui/qvector3d.sip
+%%SIP%%share/py-sip/QtGui/qvector4d.sip
 %%SIP%%share/py-sip/QtGui/qwhatsthis.sip
 %%SIP%%share/py-sip/QtGui/qwidget.sip
 %%SIP%%share/py-sip/QtGui/qwidgetaction.sip