Revbump which fixes compatibility issues with PyQt4-4.5. Fixes bug 273473

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 195 insertions, 1 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index f12735c61fab..f042c16500b3 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.21 2009/06/05 07:47:44 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.22 2009/06/11 13:33:25 hwoarang Exp $
+
+*pykde4-4.2.4-r1 (11 Jun 2009)
+
+  11 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
+  +pykde4-4.2.4-r1.ebuild, +files/pykde4_sip-4.8.patch:
+  Revbump which fixes compatibility issues with PyQt4-4.5. Fixes bug 273473
 
   05 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> ChangeLog:
   Fix accidently added keywords
diff --git a/kde-base/pykde4/files/pykde4_sip-4.8.patch b/kde-base/pykde4/files/pykde4_sip-4.8.patch
new file mode 100644
index 000000000000..5e7321896eba
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4_sip-4.8.patch
@@ -0,0 +1,109 @@
+--- python/pykde4/sip/plasma/abstractrunner.sip	2009/01/06 06:52:12	906396
++++ python/pykde4/sip/plasma/abstractrunner.sip	2009/04/25 13:15:30	959021
+@@ -129,7 +129,7 @@
+     void                    setHasRunOptions (bool hasRunOptions);
+     void                    setSpeed (Plasma::AbstractRunner::Speed newSpeed);
+     void                    setPriority (Plasma::AbstractRunner::Priority newPriority);
+-    KService::List          serviceQuery (const QString& serviceType, const QString& constraint = QString()) const;
++//FIXME    KService::List          serviceQuery (const QString& serviceType, const QString& constraint = QString()) const;
+     virtual QList<QAction*>  actionsForMatch (const Plasma::QueryMatch& match);
+     QAction*                addAction (const QString& id, const QIcon& icon, const QString& text);
+     void                    addAction (const QString& id, QAction* action);
+--- python/pykde4/sip/phonon/backendcapabilities.sip	2008/07/04 19:03:58	828140
++++ python/pykde4/sip/phonon/backendcapabilities.sip	2009/04/25 13:15:30	959021
+@@ -26,7 +26,7 @@
+ {
+ namespace BackendCapabilities
+ {
+-class Notifier : QObject /NoDefaultCtors,NoQMetaObject/
++class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
+ {
+ 
+ signals:
+--- python/pykde4/sip/kio/global.sip	2008/12/16 07:51:39	897475
++++ python/pykde4/sip/kio/global.sip	2009/04/25 13:15:30	959021
+@@ -243,8 +243,8 @@
+     {
+         int iserr = 0;
+ 
+-        acpp = (QString *)sipForceConvertTo_QString (aelem, &iserr);
+-        bcpp = (QString *)sipForceConvertTo_QString (belem, &iserr);
++        acpp = (QString *)sipForceConvertToInstance(aelem, sipClass_QString, NULL, 0, NULL, &iserr);
++        bcpp = (QString *)sipForceConvertToInstance(belem, sipClass_QString, NULL, 0, NULL, &iserr);
+ 
+         if (iserr)
+         {
+--- python/pykde4/sip/kio/kacl.sip	2008/07/04 19:03:58	828140
++++ python/pykde4/sip/kio/kacl.sip	2009/04/25 13:15:30	959021
+@@ -144,8 +144,7 @@
+     {
+         PyObject *elem = PyList_GET_ITEM (sipPy, i);
+         PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0);
+-        p1 = *(QString *)sipForceConvertTo_QString (pyp1, &iserr);
+-
++        p1 = *(QString *)sipForceConvertToInstance(pyp1, sipClass_QString, NULL, 0, NULL, &iserr);
+         if (iserr)
+         {
+             *sipIsErr = 1;
+--- python/pykde4/sip/kdecore/kptydevice.sip	2008/07/04 19:03:58	828140
++++ python/pykde4/sip/kdecore/kptydevice.sip	2009/04/25 13:15:30	959021
+@@ -46,9 +46,9 @@ signals:
+     void                 readEof ();
+
+ protected:
+-    virtual qint64       readData (char*, qint64);
+-    virtual qint64       readLineData (char*, qint64);
+-    virtual qint64       writeData (const char*, qint64);
++//ig    virtual qint64       readData (char*, qint64);
++//ig    virtual qint64       readLineData (char*, qint64);
++//ig    virtual qint64       writeData (const char*, qint64);
+
+ };  // class KPtyDevice
+
+--- python/pykde4/sip/akonadi/messagethreadingattribute.sip	2008/12/30 19:21:36	903526
++++ python/pykde4/sip/akonadi/messagethreadingattribute.sip	2009/04/25 13:15:30	959021
+@@ -30,7 +30,7 @@
+ 
+ public:
+                             MessageThreadingAttribute ();
+-                            MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other);
++//ig                            MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other);
+     QList<Akonadi::Entity::Id>         perfectParents () const;
+     void                    setPerfectParents (const QList<Akonadi::Entity::Id>& parents);
+     QList<Akonadi::Entity::Id>         unperfectParents () const;
+--- python/pykde4/sip/dnssd/servicebase.sip	2008/12/30 19:21:36	903526
++++ python/pykde4/sip/dnssd/servicebase.sip	2009/04/25 13:15:30	959021
+@@ -27,7 +27,7 @@
+ %End
+ 
+ public:
+-    typedef KSharedPtr<DNSSD::ServiceBase> Ptr;
++//    typedef KSharedPtr<DNSSD::ServiceBase> Ptr;
+ 
+     explicit                ServiceBase (const QString& name = QString(), const QString& type = QString(), const QString& domain = QString(), const QString& host = QString(), unsigned short port = 0);
+     QString                 serviceName () const;
+--- python/pykde4/sip/kdecore/typedefs.sip	2008/07/06 15:57:41	828781
++++ python/pykde4/sip/kdecore/typedefs.sip	2009/04/25 13:15:30	959021
+@@ -244,7 +244,7 @@
+         return PyInstance_Check(sipPy);
+ 
+     int iserr = 0;
+-    TYPE *cpp = (TYPE *)sipForceConvertTo_TYPE (sipPy, &iserr);
++    TYPE *cpp = (TYPE *)sipForceConvertToInstance(sipPy, sipClass_TYPE, NULL, 0, NULL, &iserr);
+ 
+     if (iserr)
+     {
+
+
+--- python/pykde4/sip/kparts/factory.sip  2008/07/04 19:03:58     828140
++++ python/pykde4/sip/kparts/factory.sip  2009/06/01 19:03:03     976474
+@@ -37,7 +37,7 @@
+
+ protected:
+     virtual KParts::Part*   createPartObject (QWidget* parentWidget = 0, QObject* parent /Transfer/ = 0, const char* classname = "KParts::Part", const QStringList& args = QStringList()) = 0;
+-    virtual QObject*        createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList());
++//ig    virtual QObject*        createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList());
+ };   // Factory
+
+ };   // KParts
+
diff --git a/kde-base/pykde4/pykde4-4.2.4-r1.ebuild b/kde-base/pykde4/pykde4-4.2.4-r1.ebuild
new file mode 100644
index 000000000000..5a1d3b225bfb
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.2.4-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.2.4-r1.ebuild,v 1.1 2009/06/11 13:33:25 hwoarang Exp $
+
+EAPI="2"
+
+KMNAME="kdebindings"
+KMMODULE="python/${PN}"
+OPENGL_REQUIRED="always"
+inherit python kde4-meta
+
+DESCRIPTION="Python bindings for KDE4"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="akonadi debug examples semantic-desktop"
+
+DEPEND="
+	>=dev-python/PyQt4-4.5_pre1[dbus,qt3support,svg,webkit,X]
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,opengl,semantic-desktop?]
+	akonadi? ( >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] )
+"
+# blocker added due to compatibility issues and error during compile time
+RDEPEND="${DEPEND}
+	!dev-python/pykde
+"
+PATCHES=(
+	"${FILESDIR}"/pykde4_sip-4.8.patch
+)
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	if ! use examples; then
+		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
+			|| die "Failed to disable examples"
+	fi
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DWITH_QScintilla=OFF
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with akonadi Akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)"
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	python_version
+	rm -f \
+		"${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
+		"${D}${PREFIX}"/share/apps/"${PN}"/*.py[co]
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
+	# Do not optimize examples
+	python_mod_compile "${PREFIX}"/share/apps/"${PN}"/*.py
+
+	if use examples; then
+		echo
+		elog "PyKDE4 examples have been installed to"
+		elog "${PREFIX}/share/apps/${PN}/examples"
+		echo
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	python_mod_cleanup \
+		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+		"${PREFIX}"/share/apps/"${PN}"
+}