Added a patch for Python 2.5 compatibility and some other fixes.

Package-Manager: portage-2.1.3.15

4 files changed, 260 insertions, 17 deletions

diff --git a/kde-base/pykde/ChangeLog b/kde-base/pykde/ChangeLog
index 2c31a993b811..0b2cdbcac3b8 100644
--- a/kde-base/pykde/ChangeLog
+++ b/kde-base/pykde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/pykde
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde/ChangeLog,v 1.33 2007/10/27 14:11:11 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde/ChangeLog,v 1.34 2007/10/29 07:38:59 philantrop Exp $
+
+  29 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/pykde-3.5.8-python-2.5-compat.diff, pykde-3.5.8.ebuild:
+  Added a patch for Python 2.5 compatibility and some other fixes.
 
   27 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org> pykde-3.5.8.ebuild:
   Removed the obsolete patch. Makes bug 196900 a duplicate of bug 164027.
diff --git a/kde-base/pykde/Manifest b/kde-base/pykde/Manifest
index 8170a29df17f..8cc41ac1c9ff 100644
--- a/kde-base/pykde/Manifest
+++ b/kde-base/pykde/Manifest
@@ -13,6 +13,10 @@ AUX pykde-3.5.6-python-2.4.patch 10638 RMD160 a6f44f684a37c4fe60a999debd98a1190b
 MD5 6007a91c3ea4815064ed06079028e25e files/pykde-3.5.6-python-2.4.patch 10638
 RMD160 a6f44f684a37c4fe60a999debd98a1190be7b9a9 files/pykde-3.5.6-python-2.4.patch 10638
 SHA256 57a7d8b4186aa17a667b6e475d74c388c22f36f88ac9a0c13d79bb0283a8be98 files/pykde-3.5.6-python-2.4.patch 10638
+AUX pykde-3.5.8-python-2.5-compat.diff 7862 RMD160 fdb8e78aa455ca91db8bfb199a4202c6f82c676a SHA1 d7ef565aa9e17c552aef962aee18189b0b1933b8 SHA256 31d885dcf1aa9873f7007961e8a1dd88b2500811d5a918c2efac2de70dfefcaf
+MD5 3db474c4d000e388bced05d03714cf06 files/pykde-3.5.8-python-2.5-compat.diff 7862
+RMD160 fdb8e78aa455ca91db8bfb199a4202c6f82c676a files/pykde-3.5.8-python-2.5-compat.diff 7862
+SHA256 31d885dcf1aa9873f7007961e8a1dd88b2500811d5a918c2efac2de70dfefcaf files/pykde-3.5.8-python-2.5-compat.diff 7862
 DIST kdebindings-3.5.5.tar.bz2 5419613 RMD160 8515555111e2745f63b403d3255ff5521bf77875 SHA1 42b6a70280f2f7b0c0d90c236b983a68ea6a70c4 SHA256 54751d3fe6635abf7bb8ef08ff240354e56dfaaa02cd16b1dd2a837706c4b274
 DIST kdebindings-3.5.6.tar.bz2 5421905 RMD160 3c6547c5eb4baa9efe0e94473d4daf4e14514f80 SHA1 e844ef929ecb9d6ccf2225c78f4b9f5867e6a384 SHA256 9fad26d5827d996cbd88d9267883b5bc444f228d9fc8e0312db56e5f6d7363d8
 DIST kdebindings-3.5.7.tar.bz2 5577725 RMD160 847907a204fe02e3a99a9d51a719d203d8831099 SHA1 9ce5399fead3cdc17b4c1b5086dcff7bf26d42d2 SHA256 a453e3097231c3ec278f50009bfd348dea9d818a41ac6e3940b234e46f596043
@@ -33,14 +37,14 @@ EBUILD pykde-3.5.7.ebuild 1362 RMD160 fc3178ba4fa5925a8dc4f31d31508b6d8827832f S
 MD5 10affea114c37d4a7d23ef8c0ce8da32 pykde-3.5.7.ebuild 1362
 RMD160 fc3178ba4fa5925a8dc4f31d31508b6d8827832f pykde-3.5.7.ebuild 1362
 SHA256 b97d73351eb458e11e26ebae92dc651aca945cd2a093943dfd138d8bb93359aa pykde-3.5.7.ebuild 1362
-EBUILD pykde-3.5.8.ebuild 1317 RMD160 ab47906574f1feded7d968d148653af7abe76001 SHA1 1d3e1c30640d7e077b1aa5a51ece2563fdf08db9 SHA256 31d66345844e4804948789e8e4c4685fa3f46c184f52e8aa03d1a2e84586f660
-MD5 a928709896b86480e3012d39fea2b225 pykde-3.5.8.ebuild 1317
-RMD160 ab47906574f1feded7d968d148653af7abe76001 pykde-3.5.8.ebuild 1317
-SHA256 31d66345844e4804948789e8e4c4685fa3f46c184f52e8aa03d1a2e84586f660 pykde-3.5.8.ebuild 1317
-MISC ChangeLog 4614 RMD160 458a6cdf97eef67128e35845bd99172f546b068d SHA1 230c5d757e5429f6a2859a4115cff0434902f461 SHA256 96e87f1ad7ad25bad53040222cf89cc867798daa379e3e0672d916d363e36988
-MD5 e958c1cec1a17b0c15e29317f674820f ChangeLog 4614
-RMD160 458a6cdf97eef67128e35845bd99172f546b068d ChangeLog 4614
-SHA256 96e87f1ad7ad25bad53040222cf89cc867798daa379e3e0672d916d363e36988 ChangeLog 4614
+EBUILD pykde-3.5.8.ebuild 1741 RMD160 2be51ae92e1ddf87a5e21f84eee8763029325a0f SHA1 645e04595a1d9117e0af8c117652a24804287872 SHA256 f5fdc619ad576091c5df4b3dcb4bc8ac2756c316d238c88445c315495ac09643
+MD5 256969482c6231d2e9b58ed60fca785c pykde-3.5.8.ebuild 1741
+RMD160 2be51ae92e1ddf87a5e21f84eee8763029325a0f pykde-3.5.8.ebuild 1741
+SHA256 f5fdc619ad576091c5df4b3dcb4bc8ac2756c316d238c88445c315495ac09643 pykde-3.5.8.ebuild 1741
+MISC ChangeLog 4802 RMD160 bc6480bade22786f568b31a3f3ccfc34d180305f SHA1 989485d708ab9ae8f2fe52702dc5dc437afeb586 SHA256 b1ae6747d002fac7951b2965bd492ab1f3d056919b7671f87d8eaae309b27077
+MD5 100e1c156daad7e855f3126adb8bfc4c ChangeLog 4802
+RMD160 bc6480bade22786f568b31a3f3ccfc34d180305f ChangeLog 4802
+SHA256 b1ae6747d002fac7951b2965bd492ab1f3d056919b7671f87d8eaae309b27077 ChangeLog 4802
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -63,7 +67,7 @@ SHA256 9e0141a3a8558d619289d4767c1b542fd6068db65e4cac81777e874d04edcb75 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHI0cFCkvF58q80IkRAoYbAJ43MDybogK68lbx6zFgCETmwBhkOACfWkZA
-P6HdsH22znF1ylaZ/0y4A/w=
-=y0Ur
+iD8DBQFHJY4aCkvF58q80IkRAn+VAJ4kU8Gm3IXOvmEMotMWd4J4qcBkgwCbBWrV
+QX0Fe0FkYtmgvVOChnnen0E=
+=2Xn5
 -----END PGP SIGNATURE-----
diff --git a/kde-base/pykde/files/pykde-3.5.8-python-2.5-compat.diff b/kde-base/pykde/files/pykde-3.5.8-python-2.5-compat.diff
new file mode 100644
index 000000000000..0bac32549609
--- /dev/null
+++ b/kde-base/pykde/files/pykde-3.5.8-python-2.5-compat.diff
@@ -0,0 +1,223 @@
+Nur in PyKDE-3.16.0.py25: dcop.
+diff -ru PyKDE-3.16.0/sip/kdecore/bytearray.sip PyKDE-3.16.0.py25/sip/kdecore/bytearray.sip
+--- PyKDE-3.16.0/sip/kdecore/bytearray.sip	2006-09-22 07:53:14.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kdecore/bytearray.sip	2006-12-23 15:42:13.000000000 +0100
+@@ -633,7 +633,7 @@
+     QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QCString *acpp;
+     DCOPRef *bcpp;
+ 
+@@ -717,7 +717,7 @@
+     QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QString *acpp;
+     DCOPRef *bcpp;
+ 
+diff -ru PyKDE-3.16.0/sip/kdecore/kaccel.sip PyKDE-3.16.0.py25/sip/kdecore/kaccel.sip
+--- PyKDE-3.16.0/sip/kdecore/kaccel.sip	2006-09-22 05:11:16.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kdecore/kaccel.sip	2006-12-23 15:42:22.000000000 +0100
+@@ -209,7 +209,7 @@
+     QMap<int,QString> *map = new QMap<int,QString>;
+ 
+         PyObject *key, *value;
+-        int pos = 0;
++        SIP_SSIZE_T pos = 0;
+         int iKey;
+         QString *sData;
+ 
+diff -ru PyKDE-3.16.0/sip/kdecore/kcompletion.sip PyKDE-3.16.0.py25/sip/kdecore/kcompletion.sip
+--- PyKDE-3.16.0/sip/kdecore/kcompletion.sip	2006-09-22 05:11:16.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kdecore/kcompletion.sip	2006-12-23 15:42:31.000000000 +0100
+@@ -201,7 +201,7 @@
+     QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
+ 
+     PyObject *key, *value;
+-        int pos = 0;
++        SIP_SSIZE_T pos = 0;
+         KShortcut *cValue;
+         int iserr;
+ 
+diff -ru PyKDE-3.16.0/sip/kdecore/kconfigdata.sip PyKDE-3.16.0.py25/sip/kdecore/kconfigdata.sip
+--- PyKDE-3.16.0/sip/kdecore/kconfigdata.sip	2006-09-22 05:11:16.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kdecore/kconfigdata.sip	2006-12-23 15:42:39.000000000 +0100
+@@ -146,7 +146,7 @@
+     KEntryMap *cppmap = new KEntryMap;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     KEntryKey *acpp;
+     KEntry *bcpp;
+ 
+diff -ru PyKDE-3.16.0/sip/kdecore/kconfig.sip PyKDE-3.16.0.py25/sip/kdecore/kconfig.sip
+--- PyKDE-3.16.0/sip/kdecore/kconfig.sip	2006-09-22 05:11:16.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kdecore/kconfig.sip	2006-12-23 15:42:45.000000000 +0100
+@@ -158,7 +158,7 @@
+     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QString *acpp;
+     QString *bcpp;
+ 
+diff -ru PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip PyKDE-3.16.0.py25/sip/kdecore/kmacroexpander.sip
+--- PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip	2006-09-22 05:11:16.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kdecore/kmacroexpander.sip	2006-12-23 15:42:57.000000000 +0100
+@@ -169,7 +169,7 @@
+     QMap<QChar,QString> *map = new QMap<QChar,QString>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QChar *cKey;
+     QString *sData;
+ 
+@@ -251,7 +251,7 @@
+     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QString *sKey;
+     QStringList *slData;
+ 
+@@ -334,7 +334,7 @@
+     QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QChar *cKey;
+     QStringList *slData;
+ 
+diff -ru PyKDE-3.16.0/sip/kdecore/ktimezones.sip PyKDE-3.16.0.py25/sip/kdecore/ktimezones.sip
+--- PyKDE-3.16.0/sip/kdecore/ktimezones.sip	2006-09-22 05:11:16.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kdecore/ktimezones.sip	2006-12-23 15:43:04.000000000 +0100
+@@ -240,7 +240,7 @@
+     QMap<QString, KTimezone*> *cppmap = new QMap<QString, KTimezone*>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QString *acpp;
+     KTimezone *bcpp;
+ 
+diff -ru PyKDE-3.16.0/sip/kdecore/kurl.sip PyKDE-3.16.0.py25/sip/kdecore/kurl.sip
+--- PyKDE-3.16.0/sip/kdecore/kurl.sip	2006-09-22 05:11:16.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kdecore/kurl.sip	2006-12-23 15:43:18.000000000 +0100
+@@ -248,7 +248,7 @@
+ %MethodCode
+ //takes range | (a Python slice) | urlList | (KURL.List)
+ 
+-    int len, start, stop, step, slicelength;
++    SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+ 
+@@ -291,7 +291,7 @@
+         void                 __delitem__ (SIP_PYSLICE);
+ %MethodCode
+ //takes range | (a Python slice)
+-    int len, start, stop, step, slicelength;
++    SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+     if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
+@@ -322,7 +322,7 @@
+ %MethodCode
+ //returns (KURL.List)
+ //takes range | (a Python slice)
+-    int len, start, stop, step, slicelength;
++    SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+ 
+diff -ru PyKDE-3.16.0/sip/kdeui/kkeydialog.sip PyKDE-3.16.0.py25/sip/kdeui/kkeydialog.sip
+--- PyKDE-3.16.0/sip/kdeui/kkeydialog.sip	2006-09-22 05:11:15.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kdeui/kkeydialog.sip	2006-12-23 15:43:23.000000000 +0100
+@@ -231,7 +231,7 @@
+     QDict<int>* qdict = new QDict<int>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QString *a0;
+     int a1;
+ 
+diff -ru PyKDE-3.16.0/sip/kio/authinfo.sip PyKDE-3.16.0.py25/sip/kio/authinfo.sip
+--- PyKDE-3.16.0/sip/kio/authinfo.sip	2006-09-22 05:11:14.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kio/authinfo.sip	2006-12-23 15:43:28.000000000 +0100
+@@ -176,7 +176,7 @@
+     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QString *sKey;
+     QStringList *sData;
+ 
+diff -ru PyKDE-3.16.0/sip/kio/global.sip PyKDE-3.16.0.py25/sip/kio/global.sip
+--- PyKDE-3.16.0/sip/kio/global.sip	2006-09-22 05:11:14.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kio/global.sip	2006-12-23 15:43:33.000000000 +0100
+@@ -702,7 +702,7 @@
+     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QString *acpp;
+     QString *bcpp;
+ 
+diff -ru PyKDE-3.16.0/sip/kio/kservicetype.sip PyKDE-3.16.0.py25/sip/kio/kservicetype.sip
+--- PyKDE-3.16.0/sip/kio/kservicetype.sip	2006-09-22 05:11:14.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kio/kservicetype.sip	2006-12-23 15:43:44.000000000 +0100
+@@ -183,7 +183,7 @@
+     QMap<QString,QVariant::Type> *cppmap = new QMap<QString,QVariant::Type>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QString *acpp;
+     QVariant::Type bcpp;
+ 
+diff -ru PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip PyKDE-3.16.0.py25/sip/kmdi/kmdichildfrm.sip
+--- PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip	2006-09-22 05:11:14.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kmdi/kmdichildfrm.sip	2006-12-23 15:39:49.000000000 +0100
+@@ -245,7 +245,7 @@
+     QDict<QWidget::FocusPolicy>* qdict = new QDict<QWidget::FocusPolicy>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QString *a0;
+     QWidget::FocusPolicy a1;
+ 
+diff -ru PyKDE-3.16.0/sip/kparts/browserextension.sip PyKDE-3.16.0.py25/sip/kparts/browserextension.sip
+--- PyKDE-3.16.0/sip/kparts/browserextension.sip	2006-09-22 05:11:15.000000000 +0200
++++ PyKDE-3.16.0.py25/sip/kparts/browserextension.sip	2006-12-23 15:33:51.000000000 +0100
+@@ -419,7 +419,7 @@
+     QMap<QCString,QCString> *cppmap = new QMap<QCString,QCString>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QCString *acpp;
+     QCString *bcpp;
+ 
+@@ -503,7 +503,7 @@
+     QMap<QCString,int> *cppmap = new QMap<QCString,int>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    SIP_SSIZE_T pos = 0;
+     QCString *acpp;
+     int bcpp;
+ 
diff --git a/kde-base/pykde/pykde-3.5.8.ebuild b/kde-base/pykde/pykde-3.5.8.ebuild
index 406eea536b6c..5b234a1e725c 100644
--- a/kde-base/pykde/pykde-3.5.8.ebuild
+++ b/kde-base/pykde/pykde-3.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde/pykde-3.5.8.ebuild,v 1.2 2007/10/27 14:11:11 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde/pykde-3.5.8.ebuild,v 1.3 2007/10/29 07:38:59 philantrop Exp $
 
 KMNAME=kdebindings
 KMMODULE=python
@@ -17,14 +17,19 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc examples"
 
-DEPEND="~dev-python/sip-4.2.1
-	~dev-python/PyQt-3.14.1
-	kde-base/kdelibs
-	!dev-python/pykde"
+DEPEND=">=dev-python/sip-4.6
+		>=dev-python/PyQt-3.17.2
+		kde-base/kdelibs
+		|| ( kde-base/kdebase kde-base/konsole )
+		!dev-python/pykde"
 
 src_unpack() {
 	kde-meta_src_unpack
 	cd "${S}/python/pykde"
+	epatch "${FILESDIR}/${P}-python-2.5-compat.diff"
+
+	mkdir -p kparts
+	ln -s "${PREFIX}"/$(get_libdir)/kde3/libkonsolepart* ./kparts/
 }
 
 src_compile() {
@@ -44,6 +49,13 @@ src_compile() {
 
 src_install() {
 	cd "${S}/python/pykde"
+	dodir "${PREFIX}"/$(get_libdir)
+	sed -i -e "s:/lib/:/$(get_libdir)/:g" Makefile
+
+	for X in dcop kdecore kdefx kdeui kio kresources kabc kutils kfile kparts khtml kspell kdeprint kmdi ; do
+		sed -i -e '/strip $(DESTDIR).*/d' ${X}/Makefile
+	done
+
 	make DESTDIR="${D}" install || die
 	find "${D}/usr/share/sip" -not -type d -not -iname *.sip -exec rm '{}' \;