Remove the Python 2.5 patch for 3.5.5 series, as it's broken for 64-bit arches; add...

Package-Manager: portage-2.1.2-r4

diff --git a/kde-base/dcoppython/ChangeLog b/kde-base/dcoppython/ChangeLog
index 40e77781bc659685b59ff75353714a5a41dc7182..22d87d660e69a97f68ff85799884ae68a2e41787 100644 (file)
--- a/kde-base/dcoppython/ChangeLog
+++ b/kde-base/dcoppython/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/dcoppython
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.43 2007/01/16 19:22:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.44 2007/01/25 19:29:41 flameeyes Exp $
+
+*dcoppython-3.5.5-r1 (25 Jan 2007)
+
+  25 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/dcoppython-3.5.6-python-2.4.patch, +dcoppython-3.5.5-r1.ebuild,
+  dcoppython-3.5.6.ebuild:
+  Remove the Python 2.5 patch for 3.5.5 series, as it's broken for 64-bit
+  arches; add patch to support Python 2.4 on 3.5.6.
 
 *dcoppython-3.5.6 (16 Jan 2007)
 

diff --git a/kde-base/dcoppython/dcoppython-3.5.5-r1.ebuild b/kde-base/dcoppython/dcoppython-3.5.5-r1.ebuild
new file mode 100644 (file)
index 0000000..2f4b45d
--- /dev/null
+++ b/kde-base/dcoppython/dcoppython-3.5.5-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/01/25 19:29:41 flameeyes Exp $
+
+KMNAME=kdebindings
+KM_MAKEFILESREV=1
+MAXKDEVER=3.5.5
+KM_DEPRANGE="$PV $MAXKDEVER"
+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/dcoppython-3.5.6.ebuild b/kde-base/dcoppython/dcoppython-3.5.6.ebuild
index 77cef006387c5e628d3701f457605416f8f76a7c..a6c130056a9a5796534cf672065c8f24c5b9f96c 100644 (file)
--- a/kde-base/dcoppython/dcoppython-3.5.6.ebuild
+++ b/kde-base/dcoppython/dcoppython-3.5.6.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/dcoppython/dcoppython-3.5.6.ebuild,v 1.1 2007/01/16 19:22:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.6.ebuild,v 1.2 2007/01/25 19:29:41 flameeyes Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -18,7 +18,7 @@ DEPEND="virtual/python"
 SLOT="0"
 
 PATCHES="$FILESDIR/no-gtk-glib-check.diff
-       ${FILESDIR}/dcoppython-3.5.5-python-2.5-compat.diff"
+       ${FILESDIR}/dcoppython-3.5.6-python-2.4.patch"
 
 src_compile() {
        kde_src_compile myconf

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 (file)
index 0000000..e6ba440
--- /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) ||

diff --git a/kde-base/dcoppython/files/digest-dcoppython-3.5.5-r1 b/kde-base/dcoppython/files/digest-dcoppython-3.5.5-r1
new file mode 100644 (file)
index 0000000..d6542e5
--- /dev/null
+++ b/kde-base/dcoppython/files/digest-dcoppython-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/ChangeLog b/kde-base/pykde/ChangeLog
index 9d2f7357b58615eb2603678e7ee01adc119f3c2c..a118a70207984c8e5f3c6deee58fa5d938bef1f4 100644 (file)
--- a/kde-base/pykde/ChangeLog
+++ b/kde-base/pykde/ChangeLog
@@ -1,6 +1,14 @@
 # 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.20 2007/01/16 22:00:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde/ChangeLog,v 1.21 2007/01/25 19:30:21 flameeyes Exp $
+
+*pykde-3.5.5-r2 (25 Jan 2007)
+
+  25 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pykde-3.5.6-python-2.4.patch, +pykde-3.5.5-r2.ebuild,
+  pykde-3.5.6.ebuild:
+  Remove the Python 2.5 patch for 3.5.5 series, as it's broken for 64-bit
+  arches; add patch to support Python 2.4 on 3.5.6.
 
 *pykde-3.5.6 (16 Jan 2007)
 

diff --git a/kde-base/pykde/files/digest-pykde-3.5.5-r2 b/kde-base/pykde/files/digest-pykde-3.5.5-r2
new file mode 100644 (file)
index 0000000..d6542e5
--- /dev/null
+++ b/kde-base/pykde/files/digest-pykde-3.5.5-r2
@@ -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.6-python-2.4.patch b/kde-base/pykde/files/pykde-3.5.6-python-2.4.patch
new file mode 100644 (file)
index 0000000..9ab8d81
--- /dev/null
+++ b/kde-base/pykde/files/pykde-3.5.6-python-2.4.patch
@@ -0,0 +1,343 @@
+Index: kdebindings/python/pykde/sip/kio/global.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kio/global.sip        (revision 626831)
++++ kdebindings/python/pykde/sip/kio/global.sip        (revision 626832)
+@@ -675,7 +675,7 @@
+     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
+ 
+     PyObject *aelem, *belem;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QString *acpp;
+     QString *bcpp;
+ 
+Index: kdebindings/python/pykde/sip/kio/authinfo.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kio/authinfo.sip      (revision 626831)
++++ kdebindings/python/pykde/sip/kio/authinfo.sip      (revision 626832)
+@@ -176,7 +176,7 @@
+     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+ 
+     PyObject *key, *value;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QString *sKey;
+     QStringList *sData;
+ 
+Index: kdebindings/python/pykde/sip/kio/kservicetype.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kio/kservicetype.sip  (revision 626831)
++++ kdebindings/python/pykde/sip/kio/kservicetype.sip  (revision 626832)
+@@ -184,7 +184,7 @@
+     QMap<QString,QVariant::Type> *cppmap = new QMap<QString,QVariant::Type>;
+ 
+     PyObject *aelem, *belem;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QString *acpp;
+     QVariant::Type bcpp;
+ 
+Index: kdebindings/python/pykde/sip/kmdi/kmdichildfrm.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kmdi/kmdichildfrm.sip (revision 626831)
++++ kdebindings/python/pykde/sip/kmdi/kmdichildfrm.sip (revision 626832)
+@@ -245,7 +245,7 @@
+     QDict<QWidget::FocusPolicy>* qdict = new QDict<QWidget::FocusPolicy>;
+ 
+     PyObject *key, *value;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QString *a0;
+     QWidget::FocusPolicy a1;
+ 
+Index: kdebindings/python/pykde/sip/kdeui/kkeydialog.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kdeui/kkeydialog.sip  (revision 626831)
++++ kdebindings/python/pykde/sip/kdeui/kkeydialog.sip  (revision 626832)
+@@ -231,7 +231,7 @@
+     QDict<int>* qdict = new QDict<int>;
+ 
+     PyObject *key, *value;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QString *a0;
+     int a1;
+ 
+Index: kdebindings/python/pykde/sip/kparts/browserextension.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kparts/browserextension.sip   (revision 626831)
++++ kdebindings/python/pykde/sip/kparts/browserextension.sip   (revision 626832)
+@@ -404,7 +404,7 @@
+     QMap<QCString,QCString> *cppmap = new QMap<QCString,QCString>;
+ 
+     PyObject *aelem, *belem;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QCString *acpp;
+     QCString *bcpp;
+ 
+@@ -487,7 +487,7 @@
+     QMap<QCString,int> *cppmap = new QMap<QCString,int>;
+ 
+     PyObject *aelem, *belem;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QCString *acpp;
+     int bcpp;
+ 
+Index: kdebindings/python/pykde/sip/kdecore/bytearray.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kdecore/bytearray.sip (revision 626831)
++++ kdebindings/python/pykde/sip/kdecore/bytearray.sip (revision 626832)
+@@ -620,7 +620,7 @@
+     QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
+ 
+     PyObject *aelem, *belem;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QCString *acpp;
+     DCOPRef *bcpp;
+ 
+@@ -705,7 +705,7 @@
+     QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
+ 
+     PyObject *aelem, *belem;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QString *acpp;
+     DCOPRef *bcpp;
+ 
+Index: kdebindings/python/pykde/sip/kdecore/kconfigdata.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kdecore/kconfigdata.sip       (revision 626831)
++++ kdebindings/python/pykde/sip/kdecore/kconfigdata.sip       (revision 626832)
+@@ -141,7 +141,7 @@
+     QMap<KEntryKey,KEntry> *cppmap = new QMap<KEntryKey,KEntry>;
+ 
+     PyObject *aelem, *belem;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     KEntryKey *acpp;
+     KEntry *bcpp;
+ 
+Index: kdebindings/python/pykde/sip/kdecore/kaccel.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kdecore/kaccel.sip    (revision 626831)
++++ kdebindings/python/pykde/sip/kdecore/kaccel.sip    (revision 626832)
+@@ -209,7 +209,7 @@
+     QMap<int,QString> *map = new QMap<int,QString>;
+ 
+         PyObject *key, *value;
+-        ssize_t pos = 0;
++        _SIP_SSIZE_T pos = 0;
+         int iKey;
+         QString *sData;
+ 
+Index: kdebindings/python/pykde/sip/kdecore/kcompletion.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kdecore/kcompletion.sip       (revision 626831)
++++ kdebindings/python/pykde/sip/kdecore/kcompletion.sip       (revision 626832)
+@@ -201,7 +201,7 @@
+     QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
+ 
+     PyObject *key, *value;
+-        ssize_t pos = 0;
++        _SIP_SSIZE_T pos = 0;
+         KShortcut *cValue;
+         int iserr;
+ 
+Index: kdebindings/python/pykde/sip/kdecore/kmacroexpander.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kdecore/kmacroexpander.sip    (revision 626831)
++++ kdebindings/python/pykde/sip/kdecore/kmacroexpander.sip    (revision 626832)
+@@ -169,7 +169,7 @@
+     QMap<QChar,QString> *map = new QMap<QChar,QString>;
+ 
+     PyObject *key, *value;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QChar *cKey;
+     QString *sData;
+ 
+@@ -255,7 +255,7 @@
+     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+ 
+     PyObject *key, *value;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QString *sKey;
+     QStringList *slData;
+ 
+@@ -343,7 +343,7 @@
+     QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
+ 
+     PyObject *key, *value;
+-    ssize_t pos = 0;
++    _SIP_SSIZE_T pos = 0;
+     QChar *cKey;
+     QStringList *slData;
+ 
+Index: kdebindings/python/pykde/sip/kdecore/kurl.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kdecore/kurl.sip      (revision 626831)
++++ kdebindings/python/pykde/sip/kdecore/kurl.sip      (revision 626832)
+@@ -234,7 +234,7 @@
+         void                 __setitem__ (int, const KURL&);
+ %MethodCode
+ //takes index | (int) | value | (KURL)
+-    ssize_t len;
++    _SIP_SSIZE_T len;
+ 
+     len = sipCpp -> count();
+ 
+@@ -248,7 +248,7 @@
+ %MethodCode
+ //takes range | (a Python slice) | urlList | (KURL.List)
+ 
+-    ssize_t len, start, stop, step, slicelength;
++    _SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+ 
+@@ -278,7 +278,7 @@
+         void                 __delitem__ (int);
+ %MethodCode
+ //takes index | (int)
+-    ssize_t len;
++    _SIP_SSIZE_T len;
+ 
+     len = sipCpp -> count();
+ 
+@@ -291,7 +291,7 @@
+         void                 __delitem__ (SIP_PYSLICE);
+ %MethodCode
+ //takes range | (a Python slice)
+-    ssize_t 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)
+@@ -308,7 +308,7 @@
+ %MethodCode
+ //returns (KURL)
+ //takes index | (int)
+-    ssize_t len;
++    _SIP_SSIZE_T len;
+ 
+     len = sipCpp -> count();
+ 
+@@ -322,7 +322,7 @@
+ %MethodCode
+ //returns (KURL.List)
+ //takes range | (a Python slice)
+-    ssize_t len, start, stop, step, slicelength;
++    _SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+ 
+Index: kdebindings/python/pykde/sip/kdecore/kconfig.sip
+===================================================================
+--- kdebindings/python/pykde/sip/kdecore/kconfig.sip   (revision 626831)
++++ kdebindings/python/pykde/sip/kdecore/kconfig.sip   (revision 626832)
+@@ -158,7 +158,7 @@
+     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
+ 
+     PyObject *aelem, *belem;
+-    ssize_t  pos = 0;
++    _SIP_SSIZE_T  pos = 0;
+     QString *acpp;
+     QString *bcpp;
+ 
+Index: kdebindings/python/pyqt/sip/qt/qstring.sip
+===================================================================
+--- kdebindings/python/pyqt/sip/qt/qstring.sip (revision 626831)
++++ kdebindings/python/pyqt/sip/qt/qstring.sip (revision 626832)
+@@ -746,7 +746,7 @@
+ 
+       QString operator[](SIP_PYSLICE) const;
+ %MethodCode
+-              ssize_t len, start, stop, step, slicelength;
++              _SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+               len = sipCpp -> length();
+ 
+Index: kdebindings/python/pyqt/sip/qt/qdir.sip
+===================================================================
+--- kdebindings/python/pyqt/sip/qt/qdir.sip    (revision 626831)
++++ kdebindings/python/pyqt/sip/qt/qdir.sip    (revision 626832)
+@@ -238,7 +238,7 @@
+ 
+       QString operator[](int) const;
+ %MethodCode
+-              ssize_t len;
++              _SIP_SSIZE_T len;
+ 
+               Py_BEGIN_ALLOW_THREADS
+               len = sipCpp -> count();
+@@ -256,7 +256,7 @@
+ 
+       QStringList operator[](SIP_PYSLICE) const;
+ %MethodCode
+-              ssize_t len, start, stop, step, slicelength;
++              _SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+               Py_BEGIN_ALLOW_THREADS
+               len = sipCpp -> count();
+Index: kdebindings/python/pyqt/sip/qt/qstringlist.sip
+===================================================================
+--- kdebindings/python/pyqt/sip/qt/qstringlist.sip     (revision 626831)
++++ kdebindings/python/pyqt/sip/qt/qstringlist.sip     (revision 626832)
+@@ -99,7 +99,7 @@
+ 
+       void __setitem__(int,const QString &);
+ %MethodCode
+-              ssize_t len;
++              _SIP_SSIZE_T len;
+ 
+               len = sipCpp -> count();
+ 
+@@ -111,7 +111,7 @@
+ 
+       void __setitem__(SIP_PYSLICE,const QStringList &);
+ %MethodCode
+-              ssize_t len, start, stop, step, slicelength;
++              _SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+               len = sipCpp -> count();
+ 
+@@ -142,7 +142,7 @@
+ 
+       void __delitem__(int);
+ %MethodCode
+-              ssize_t len;
++              _SIP_SSIZE_T len;
+ 
+               len = sipCpp -> count();
+ 
+@@ -154,7 +154,7 @@
+ 
+       void __delitem__(SIP_PYSLICE);
+ %MethodCode
+-              ssize_t len, start, stop, step, slicelength;
++              _SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+               len = sipCpp -> count();
+ 
+@@ -170,7 +170,7 @@
+ 
+       QString operator[](int);
+ %MethodCode
+-              ssize_t len;
++              _SIP_SSIZE_T len;
+ 
+               len = sipCpp -> count();
+ 
+@@ -182,7 +182,7 @@
+ 
+       QStringList operator[](SIP_PYSLICE);
+ %MethodCode
+-              ssize_t len, start, stop, step, slicelength;
++              _SIP_SSIZE_T len, start, stop, step, slicelength;
+ 
+               len = sipCpp -> count();
+ 

diff --git a/kde-base/pykde/pykde-3.5.5-r2.ebuild b/kde-base/pykde/pykde-3.5.5-r2.ebuild
new file mode 100644 (file)
index 0000000..680a357
--- /dev/null
+++ b/kde-base/pykde/pykde-3.5.5-r2.ebuild
@@ -0,0 +1,58 @@
+# 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.5-r2.ebuild,v 1.1 2007/01/25 19:30:21 flameeyes 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 ~ppc64 ~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"
+}
+
+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
+}

diff --git a/kde-base/pykde/pykde-3.5.6.ebuild b/kde-base/pykde/pykde-3.5.6.ebuild
index ed4aa62b651a09eb6dcbeb75a6eb5d535913f44a..ee1cc3993fa5a6170326ea19cfac2f0d2d24a337 100644 (file)
--- a/kde-base/pykde/pykde-3.5.6.ebuild
+++ b/kde-base/pykde/pykde-3.5.6.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.6.ebuild,v 1.1 2007/01/16 22:00:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde/pykde-3.5.6.ebuild,v 1.2 2007/01/25 19:30:21 flameeyes Exp $
 
 KMNAME=kdebindings
 KMMODULE=python
@@ -22,11 +22,12 @@ DEPEND="~dev-python/sip-4.2.1
        kde-base/kdelibs
        !dev-python/pykde"
 
+PATCHES="${FILESDIR}/${P}-python-2.4.patch"
+
 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() {