Version bump KDE SC 4.5.5

4 files changed, 253 insertions, 3 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 189774f222ca..c2aa6fabfac6 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/pykde4
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.95 2010/12/30 00:58:57 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.96 2011/01/10 11:53:48 tampakrap Exp $
+
+*pykde4-4.5.5 (10 Jan 2011)
+
+  10 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> +pykde4-4.5.5.ebuild,
+  +files/pykde4-4.5.5-typedefs-fix.patch:
+  Version bump KDE SC 4.5.5
 
   29 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pykde4-4.4.5.ebuild, +files/pykde4-4.4.5-sip-4.12.patch:
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 25f70132415b..c9409195c185 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,12 +1,15 @@
 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
 AUX pykde4-4.4.5-sip-4.12.patch 1988 RMD160 2d742d6d2d911a21ab8dbc3b3f938ac2096f8efe SHA1 ed5f74f9198e3e90c9fbb46c621d6e310a08fa0e SHA256 e15d7fda0dc0b2678bbd721601ee2581a00e6c478f5034c57877da394c9a14b2
 AUX pykde4-4.4.92-build-fix-sip.patch 557 RMD160 d9d1c299f6acbc97c75ff8ddc23bd13d1ff0bce6 SHA1 6cb4154b980320fcff792434b8abf7b9fce1ce68 SHA256 0b2fd1753e7fe41698a8c1c0568c4cd52fd14ddc6c010f91f6052fe89044cf6e
+AUX pykde4-4.5.5-typedefs-fix.patch 3309 RMD160 c81c29abdd9adaa73ffbf899fd722b861ba95a10 SHA1 f0e0318e996ccd82eaa9304c184b8d4cda4d7a50 SHA256 5a94419ae8edc80b7231ed3d3afb23d497fc47adf798b6e18bca9060788f87d7
 AUX pykde4-mapped-type-fix.patch 1406 RMD160 7af64a0841d604fc695441524561142a0ad1e3fe SHA1 8167ae067f6cb47b7685c2d052b9d57d3e88ba10 SHA256 94cbc246a62fe0256e3a57bdfd1aae6b1a313229031433f65a389442c7fa10e2
 DIST kdebindings-4.4.5.tar.bz2 5092007 RMD160 057cafc1922a5ab3999e6dcc532d656dd4cf446c SHA1 2f041c5b050da879e8f5d09f668b56881f9f1bb2 SHA256 c443b59fc4b5fd480bc112c409ac2378147853a59292a8a8404c2243379a1451
 DIST kdebindings-4.5.3.tar.bz2 6322551 RMD160 b0f0debb0340dfea96569ee89df4ee931b4b9abd SHA1 84a86395cf0dfb328111a5492e78a1967f6a1146 SHA256 1b36d6f4a5bf4f6205e565eddd03d6f3b39d49300f502431d23b054666f958e0
 DIST kdebindings-4.5.4.tar.bz2 7135083 RMD160 59504a5e617f8d472c4a6220ce2e0353c16fde69 SHA1 1562ca0e58450ed72bc18ed9a1c4c6ec62fd4a8f SHA256 40eec6029005809071d33889182008cc4f3222ebcbcbae58170b3c721e74a76f
+DIST kdebindings-4.5.5.tar.bz2 7134992 RMD160 c69f387c8dd5e3205fa8a436cc63cecf9511f38e SHA1 5f754f0b6989df9557c5ccec18b4f96207fceb94 SHA256 7bfa2df7e8a01c7f1a9cfd2e79e544794b94490d3ca3576cbbedb2328ef257c5
 EBUILD pykde4-4.4.5.ebuild 2220 RMD160 bb1b21a33cd2799f2b44e79138da1d995156f3b1 SHA1 b8164103e98cef32eb493c44b3368012482795ce SHA256 a3c9c65639c8c3b0c5e1eff6d895b3f8a3dc00421bd77cd0ad82d06c6b37e5b7
 EBUILD pykde4-4.5.3.ebuild 2146 RMD160 5b00ea94f8dfcca362866a062fb4759a45d43ed5 SHA1 219e0db274f7910bfe3a6a5110c70e5dc638011e SHA256 1f65cc45aeaf063246ea72c99a5626356a01ab5f85500d3d9567d19a27345539
 EBUILD pykde4-4.5.4.ebuild 2143 RMD160 a9d161d5bd6f2df4dc732a81f730a6f197255dcd SHA1 09c0a365d83128e20374c92d6cd9f08b28e93f54 SHA256 68a95992db724fe277d113cc11d3bba96f26cb8ac9da0df8b893879bc40765f1
-MISC ChangeLog 12747 RMD160 fd8552d573d1cce0745c3546259c05159ea9d655 SHA1 ccee07e980e8b83571122297840ef58163f1a28a SHA256 8a314850b104f3ecd6cba2df7d4be123f996e43ef1e45a1d07dcb622cf31cb10
+EBUILD pykde4-4.5.5.ebuild 1970 RMD160 5f05faa738611ef010de36b8bf9d2fe66636cfba SHA1 c13fb543d4f2dd09af6e350506775e10a6be7021 SHA256 155d98523debb9c215c70a2a0eb01c48bb8ef628a68635e265cc6397eb3b88c1
+MISC ChangeLog 12925 RMD160 818908e4ee824c491baed83f33804b416503cba6 SHA1 51f5617527361122dfa4ec35936d4904d6ec6e13 SHA256 a570f07270266a1064f23e34e7928193506c59d161aa02204604093ed422303c
 MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
diff --git a/kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch b/kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch
new file mode 100644
index 000000000000..6fb5714ad050
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch
@@ -0,0 +1,155 @@
+--- pykde4-4.5.5/python/pykde4/sip/kdecore/typedefs.sip~	2010-11-02 12:51:10.000000000 +0000
++++ pykde4-4.5.5/python/pykde4/sip/kdecore/typedefs.sip	2011-01-08 22:34:29.006096324 +0000
+@@ -582,90 +582,6 @@
+ %End
+ };
+ 
+-template <TYPE>
+-%MappedType QSet<TYPE>
+-{
+-%TypeHeaderCode
+-#include <qset.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    QSet<TYPE> set = *sipCpp;
+-    int i = 0;
+-    foreach (TYPE value, set)
+-    {
+-        PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj);
+-        if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
+-        {
+-            Py_DECREF(l);
+-
+-            if (obj)
+-                Py_DECREF(obj);
+-
+-            return NULL;
+-        }
+-
+-        Py_DECREF(obj);
+-        i++;
+-    }
+-   
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-    }
+-
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-
+-        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-            if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
+-                return 0;
+-    }
+-
+-    QSet<TYPE> *qs = new QSet<TYPE>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-    {
+-        int state;
+-
+-        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+- 
+-        if (*sipIsErr)
+-        {
+-            sipReleaseType(t, sipType_TYPE, state);
+-
+-            delete qs;
+-            return 0;
+-        }
+-
+-        *qs << *t;
+-
+-        sipReleaseType(t, sipType_TYPE, state);
+-    }
+- 
+-    *sipCppPtr = qs;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};
+-
+-
+ template <TYPE1,TYPE2>
+ %MappedType QPair<TYPE1,TYPE2>
+ {
+@@ -730,61 +646,6 @@
+  
+     return sipGetState(sipTransferObj);
+ %End
+-};
+-
+-
+-%MappedType QList<uint>
+-{
+-%TypeHeaderCode
+-#include <qlist.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    for (int i = 0; i < sipCpp->size(); ++i) {
+-        PyObject *pobj;
+-
+-#if PY_MAJOR_VERSION >= 3
+-        if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
+-#else
+-        if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
+-#endif
+-            Py_DECREF(l);
+-
+-            return NULL;
+-        }
+-
+-        PyList_SET_ITEM(l, i, pobj);
+-    }
+-
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-        return PyList_Check(sipPy);
+-
+-    QList<uint> *ql = new QList<uint>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
+-#if PY_MAJOR_VERSION >= 3
+-        ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#else
+-        ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#endif        
+-    }
+-    
+-    *sipCppPtr = ql;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+ };
+ 
+ 
diff --git a/kde-base/pykde4/pykde4-4.5.5.ebuild b/kde-base/pykde4/pykde4-4.5.5.ebuild
new file mode 100644
index 000000000000..e836ea4990bb
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.5.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.5.5.ebuild,v 1.1 2011/01/10 11:53:48 tampakrap Exp $
+
+EAPI="3"
+
+KMNAME="kdebindings"
+KMMODULE="python/pykde4"
+OPENGL_REQUIRED="always"
+PYTHON_USE_WITH="threads"
+RESTRICT_PYTHON_ABIS="2.4"
+inherit python kde4-meta
+
+DESCRIPTION="Python bindings for KDE4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples semantic-desktop"
+
+# blocker added due to compatibility issues and error during compile time
+DEPEND="
+	!dev-python/pykde
+	>=dev-python/sip-4.12
+	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,sql,svg,webkit,X] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.5.5-typedefs-fix.patch" )
+
+pkg_setup() {
+	python_pkg_setup
+	kde4-meta_pkg_setup
+}
+
+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
+
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_QScintilla=OFF
+		-DWITH_PolkitQt=OFF
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${S}/python/pykde4/docs/html/")
+
+	kde4-meta_src_install
+
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+	python_clean_installation_image -q
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	python_mod_optimize PyKDE4 PyQt4
+
+	if use examples; then
+		echo
+		elog "PyKDE4 examples have been installed to"
+		elog "${EKDEDIR}/share/apps/${PN}/examples"
+		echo
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	python_mod_cleanup PyKDE4 PyQt4
+}