Python 2.5 compatibility.

Package-Manager: portage-2.1.2_pre3-r6

8 files changed, 342 insertions, 2 deletions

diff --git a/kde-base/dcoppython/ChangeLog b/kde-base/dcoppython/ChangeLog
index 193fc4c4794d..582de1cc0bcf 100644
--- a/kde-base/dcoppython/ChangeLog
+++ b/kde-base/dcoppython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/dcoppython
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.34 2006/10/03 08:58:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.35 2006/10/22 15:17:38 carlo Exp $
+
+*dcoppython-3.5.5 (22 Oct 2006)
+
+  22 Oct 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/dcoppython-3.5.5-python-2.5-compat.diff, +dcoppython-3.5.5.ebuild:
+  Python 2.5 compatibility.
 
   03 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   dcoppython-3.5.0.ebuild:
diff --git a/kde-base/dcoppython/dcoppython-3.5.5.ebuild b/kde-base/dcoppython/dcoppython-3.5.5.ebuild
new file mode 100644
index 000000000000..e9f6463e0f72
--- /dev/null
+++ b/kde-base/dcoppython/dcoppython-3.5.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.5.ebuild,v 1.1 2006/10/22 15:17:38 carlo Exp $
+
+KMNAME=kdebindings
+KM_MAKEFILESREV=1
+MAXKDEVER=3.5.5
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta
+
+DESCRIPTION="KDE: Python bindings for DCOP"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND="virtual/python"
+
+# Because this installs into /usr/lib/python2.3/..., it doesn't have SLOT=X.Y like the rest of KDE,
+# and it installs into /usr entirely
+SLOT="0"
+
+PATCHES="$FILESDIR/no-gtk-glib-check.diff
+	${FILESDIR}/dcoppython-3.5.5-python-2.5-compat.diff"
+
+src_compile() {
+	kde_src_compile myconf
+	myconf="$myconf --prefix=/usr"
+	kde_src_compile configure make
+}
+
diff --git a/kde-base/dcoppython/files/dcoppython-3.5.5-python-2.5-compat.diff b/kde-base/dcoppython/files/dcoppython-3.5.5-python-2.5-compat.diff
new file mode 100644
index 000000000000..2b3060710719
--- /dev/null
+++ b/kde-base/dcoppython/files/dcoppython-3.5.5-python-2.5-compat.diff
@@ -0,0 +1,11 @@
+--- dcoppython/shell/marshaller.cpp	2005/07/26 18:54:59	438982
++++ dcoppython/shell/marshaller.cpp	2006/10/03 15:28:22	592000
+@@ -124,7 +124,7 @@
+     if (!PyDict_Check(obj)) return false;
+ 
+ 
+-    int c=0;
++    ssize_t c=0;
+     PyObject *key, *val;
+     while (PyDict_Next(obj, &c, &key, &val)==1)
+       if (!key_type.isMarshallable(key) ||
diff --git a/kde-base/dcoppython/files/digest-dcoppython-3.5.5 b/kde-base/dcoppython/files/digest-dcoppython-3.5.5
new file mode 100644
index 000000000000..d6542e599565
--- /dev/null
+++ b/kde-base/dcoppython/files/digest-dcoppython-3.5.5
@@ -0,0 +1,3 @@
+MD5 e0da219943407a786c2ceea1605fadd1 kdebindings-3.5.5.tar.bz2 5419613
+RMD160 8515555111e2745f63b403d3255ff5521bf77875 kdebindings-3.5.5.tar.bz2 5419613
+SHA256 54751d3fe6635abf7bb8ef08ff240354e56dfaaa02cd16b1dd2a837706c4b274 kdebindings-3.5.5.tar.bz2 5419613
diff --git a/kde-base/pykde/ChangeLog b/kde-base/pykde/ChangeLog
index 7eca44314f17..213b11b2a0ec 100644
--- a/kde-base/pykde/ChangeLog
+++ b/kde-base/pykde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/pykde
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde/ChangeLog,v 1.11 2006/10/15 20:04:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde/ChangeLog,v 1.12 2006/10/22 15:13:43 carlo Exp $
+
+*pykde-3.5.5-r1 (22 Oct 2006)
+
+  22 Oct 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/pykde-3.5.5-python-2.5-compat.diff, +pykde-3.5.5-r1.ebuild:
+  Python 2.5 compatibility.
 
   15 Oct 2006; Markus Rothe <corsair@gentoo.org> pykde-3.5.0.ebuild,
   pykde-3.5.5.ebuild:
diff --git a/kde-base/pykde/files/digest-pykde-3.5.5-r1 b/kde-base/pykde/files/digest-pykde-3.5.5-r1
new file mode 100644
index 000000000000..d6542e599565
--- /dev/null
+++ b/kde-base/pykde/files/digest-pykde-3.5.5-r1
@@ -0,0 +1,3 @@
+MD5 e0da219943407a786c2ceea1605fadd1 kdebindings-3.5.5.tar.bz2 5419613
+RMD160 8515555111e2745f63b403d3255ff5521bf77875 kdebindings-3.5.5.tar.bz2 5419613
+SHA256 54751d3fe6635abf7bb8ef08ff240354e56dfaaa02cd16b1dd2a837706c4b274 kdebindings-3.5.5.tar.bz2 5419613
diff --git a/kde-base/pykde/files/pykde-3.5.5-python-2.5-compat.diff b/kde-base/pykde/files/pykde-3.5.5-python-2.5-compat.diff
new file mode 100644
index 000000000000..96c43bc33360
--- /dev/null
+++ b/kde-base/pykde/files/pykde-3.5.5-python-2.5-compat.diff
@@ -0,0 +1,224 @@
+--- sip/kio/authinfo.sip	2005/09/29 14:33:08	465369
++++ sip/kio/authinfo.sip	2006/10/11 22:54:45	594670
+@@ -176,7 +176,7 @@
+     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *sKey;
+     QStringList *sData;
+ 
+--- sip/kparts/browserextension.sip	2005/09/29 14:33:08	465369
++++ sip/kparts/browserextension.sip	2006/10/11 22:54:45	594670
+@@ -404,7 +404,7 @@
+     QMap<QCString,QCString> *cppmap = new QMap<QCString,QCString>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QCString *acpp;
+     QCString *bcpp;
+ 
+@@ -487,7 +487,7 @@
+     QMap<QCString,int> *cppmap = new QMap<QCString,int>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QCString *acpp;
+     int bcpp;
+ 
+--- sip/kdecore/bytearray.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/bytearray.sip	2006/10/11 22:54:45	594670
+@@ -620,7 +620,7 @@
+     QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QCString *acpp;
+     DCOPRef *bcpp;
+ 
+@@ -705,7 +705,7 @@
+     QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *acpp;
+     DCOPRef *bcpp;
+ 
+--- sip/kio/global.sip	2005/09/29 14:33:08	465369
++++ sip/kio/global.sip	2006/10/11 22:54:45	594670
+@@ -675,7 +675,7 @@
+     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *acpp;
+     QString *bcpp;
+ 
+--- sip/kdecore/kaccel.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kaccel.sip	2006/10/11 22:54:45	594670
+@@ -209,7 +209,7 @@
+     QMap<int,QString> *map = new QMap<int,QString>;
+ 
+         PyObject *key, *value;
+-        int pos = 0;
++        ssize_t pos = 0;
+         int iKey;
+         QString *sData;
+ 
+--- sip/kdecore/kcompletion.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kcompletion.sip	2006/10/11 22:54:45	594670
+@@ -201,7 +201,7 @@
+     QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
+ 
+     PyObject *key, *value;
+-        int pos = 0;
++        ssize_t pos = 0;
+         KShortcut *cValue;
+         int iserr;
+ 
+--- sip/kdecore/kconfig.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kconfig.sip	2006/10/11 22:54:45	594670
+@@ -158,7 +158,7 @@
+     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t  pos = 0;
+     QString *acpp;
+     QString *bcpp;
+ 
+--- sip/kdecore/kconfigdata.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kconfigdata.sip	2006/10/11 22:54:45	594670
+@@ -141,7 +141,7 @@
+     QMap<KEntryKey,KEntry> *cppmap = new QMap<KEntryKey,KEntry>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     KEntryKey *acpp;
+     KEntry *bcpp;
+ 
+--- sip/kdeui/kkeydialog.sip	2005/09/29 14:33:08	465369
++++ sip/kdeui/kkeydialog.sip	2006/10/11 22:54:45	594670
+@@ -231,7 +231,7 @@
+     QDict<int>* qdict = new QDict<int>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *a0;
+     int a1;
+ 
+--- sip/kdecore/kmacroexpander.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kmacroexpander.sip	2006/10/11 22:54:45	594670
+@@ -169,7 +169,7 @@
+     QMap<QChar,QString> *map = new QMap<QChar,QString>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QChar *cKey;
+     QString *sData;
+ 
+@@ -255,7 +255,7 @@
+     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *sKey;
+     QStringList *slData;
+ 
+@@ -343,7 +343,7 @@
+     QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QChar *cKey;
+     QStringList *slData;
+ 
+--- sip/kmdi/kmdichildfrm.sip	2005/09/29 14:33:08	465369
++++ sip/kmdi/kmdichildfrm.sip	2006/10/11 22:54:45	594670
+@@ -245,7 +245,7 @@
+     QDict<QWidget::FocusPolicy>* qdict = new QDict<QWidget::FocusPolicy>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *a0;
+     QWidget::FocusPolicy a1;
+ 
+--- sip/kio/kservicetype.sip	2005/09/29 14:33:08	465369
++++ sip/kio/kservicetype.sip	2006/10/11 22:54:45	594670
+@@ -184,7 +184,7 @@
+     QMap<QString,QVariant::Type> *cppmap = new QMap<QString,QVariant::Type>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *acpp;
+     QVariant::Type bcpp;
+ 
+--- sip/kdecore/kurl.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kurl.sip	2006/10/11 22:54:45	594670
+@@ -234,7 +234,7 @@
+         void                 __setitem__ (int, const KURL&);
+ %MethodCode
+ //takes index | (int) | value | (KURL)
+-    int len;
++    ssize_t len;
+ 
+     len = sipCpp -> count();
+ 
+@@ -248,7 +248,7 @@
+ %MethodCode
+ //takes range | (a Python slice) | urlList | (KURL.List)
+ 
+-    int len, start, stop, step, slicelength;
++    ssize_t len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+ 
+@@ -278,7 +278,7 @@
+         void                 __delitem__ (int);
+ %MethodCode
+ //takes index | (int)
+-    int len;
++    ssize_t len;
+ 
+     len = sipCpp -> count();
+ 
+@@ -291,7 +291,7 @@
+         void                 __delitem__ (SIP_PYSLICE);
+ %MethodCode
+ //takes range | (a Python slice)
+-    int len, start, stop, step, slicelength;
++    ssize_t len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+     if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
+@@ -308,7 +308,7 @@
+ %MethodCode
+ //returns (KURL)
+ //takes index | (int)
+-    int len;
++    ssize_t len;
+ 
+     len = sipCpp -> count();
+ 
+@@ -322,7 +322,7 @@
+ %MethodCode
+ //returns (KURL.List)
+ //takes range | (a Python slice)
+-    int len, start, stop, step, slicelength;
++    ssize_t len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+ 
diff --git a/kde-base/pykde/pykde-3.5.5-r1.ebuild b/kde-base/pykde/pykde-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..db02efb58289
--- /dev/null
+++ b/kde-base/pykde/pykde-3.5.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde/pykde-3.5.5-r1.ebuild,v 1.1 2006/10/22 15:13:43 carlo Exp $
+
+KMNAME=kdebindings
+KMMODULE=python
+KM_MAKEFILESREV=1
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+
+inherit kde-meta distutils
+
+DESCRIPTION="PyKDE is a set of Python bindings for kdelibs."
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples"
+
+DEPEND="~dev-python/sip-4.2.1
+	=dev-python/PyQt-3.14.1-r2
+	kde-base/kdelibs
+	!dev-python/pykde"
+
+src_unpack() {
+	kde-meta_src_unpack
+	cd ${S}/python/pykde
+	epatch "${FILESDIR}/configure.py.diff"
+	epatch "${FILESDIR}/pykde-3.5.5-python-2.5-compat.diff"
+}
+
+src_compile() {
+	cd ${S}/python/pykde
+	distutils_python_version
+
+	local myconf="-d ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages \
+			-v ${ROOT}/usr/share/sip \
+			-k $(kde-config --prefix) \
+			-t ${S}/python/pykde"
+
+	use debug && myconf="${myconf} -u"
+	myconf="${myconf} -i"
+
+	python configure.py ${myconf} || die "configure failed"
+	emake || die
+}
+
+src_install() {
+	cd ${S}/python/pykde
+	make DESTDIR=${D} install || die
+	find ${D}/usr/share/sip -not -type d -not -iname *.sip -exec rm '{}' \;
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		cp -r examples ${D}/usr/share/doc/${PF}
+		cp -r templates ${D}/usr/share/doc/${PF}
+	fi
+}