Version bump to KDE 3.5.9.

(Portage version: 2.1.4.4)

4 files changed, 68 insertions, 1 deletions

diff --git a/kde-base/dcoppython/ChangeLog b/kde-base/dcoppython/ChangeLog
index 99b444926253..149074d27dd8 100644
--- a/kde-base/dcoppython/ChangeLog
+++ b/kde-base/dcoppython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/dcoppython
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.66 2008/02/17 02:44:51 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.67 2008/02/20 22:32:24 philantrop Exp $
+
+*dcoppython-3.5.9 (20 Feb 2008)
+
+  20 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/dcoppython-3.5.5-python-2.5-compat.diff,
+  +files/dcoppython-3.5.6-python-2.4.patch, +dcoppython-3.5.9.ebuild:
+  Version bump to KDE 3.5.9.
 
   16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -files/dcoppython-3.5.5-python-2.5-compat.diff,
diff --git a/kde-base/dcoppython/dcoppython-3.5.9.ebuild b/kde-base/dcoppython/dcoppython-3.5.9.ebuild
new file mode 100644
index 000000000000..1e78ae7c4682
--- /dev/null
+++ b/kde-base/dcoppython/dcoppython-3.5.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.9.ebuild,v 1.1 2008/02/20 22:32:24 philantrop Exp $
+
+KMNAME=kdebindings
+KM_MAKEFILESREV=1
+EAPI="1"
+inherit kde-meta
+
+DESCRIPTION="KDE: Python bindings for DCOP"
+KEYWORDS="~alpha ~amd64 ~ia64 ~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"
+
+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/dcoppython-3.5.6-python-2.4.patch b/kde-base/dcoppython/files/dcoppython-3.5.6-python-2.4.patch
new file mode 100644
index 000000000000..e6ba4409b881
--- /dev/null
+++ b/kde-base/dcoppython/files/dcoppython-3.5.6-python-2.4.patch
@@ -0,0 +1,24 @@
+Index: kdebindings/dcoppython/shell/marshaller.cpp
+===================================================================
+--- kdebindings/dcoppython/shell/marshaller.cpp	(revision 626831)
++++ kdebindings/dcoppython/shell/marshaller.cpp	(revision 626832)
+@@ -24,6 +24,10 @@
+ 
+ #include <kurl.h>
+ 
++#if PY_VERSION_HEX < 0x02050000
++typedef int Py_ssize_t;
++#endif
++
+ namespace PythonDCOP {
+ 
+ #include "marshal_funcs.h"
+@@ -124,7 +128,7 @@
+     if (!PyDict_Check(obj)) return false;
+ 
+ 
+-    ssize_t c=0;
++    Py_ssize_t c=0;
+     PyObject *key, *val;
+     while (PyDict_Next(obj, &c, &key, &val)==1)
+       if (!key_type.isMarshallable(key) ||