Merge branch 'master' into kde-git

Conflicts:
	app-office/akonadi-server/Manifest
	app-office/kexi/Manifest
	app-office/koffice-libs/Manifest
	app-office/koffice-meta/Manifest
	app-office/kplato/Manifest
	app-office/kpresenter/Manifest
	app-office/kspread/Manifest
	kde-base/kdeartwork-kscreensaver/Manifest
	kde-base/kdm/Manifest
	kde-base/kscreensaver/Manifest
	kde-base/pykde4/Manifest
	kde-base/rocs/Manifest
	media-plugins/kipi-plugins/Manifest

6 files changed, 174 insertions, 10 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index b803e77f998..5fc46d665d5 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,10 +1,11 @@
 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
+AUX pykde4-4.5.5-typedefs-fix.patch 3309 RMD160 c81c29abdd9adaa73ffbf899fd722b861ba95a10 SHA1 f0e0318e996ccd82eaa9304c184b8d4cda4d7a50 SHA256 5a94419ae8edc80b7231ed3d3afb23d497fc47adf798b6e18bca9060788f87d7
 AUX pykde4-4.5.90-typedefs-fix.patch 2110 RMD160 93a7e6b0a23fda700342ac4178a33fbe457c8244 SHA1 59b3992de8def0e415a055246d2d3d0a2934d8d9 SHA256 4b441ad05c553383a94e4856462c0c747b81acc5fe44782cdcb4371715b7ddf3
 DIST kdebindings-4.5.5.tar.bz2 7134992 RMD160 c69f387c8dd5e3205fa8a436cc63cecf9511f38e SHA1 5f754f0b6989df9557c5ccec18b4f96207fceb94 SHA256 7bfa2df7e8a01c7f1a9cfd2e79e544794b94490d3ca3576cbbedb2328ef257c5
 DIST kdebindings-4.5.95.tar.bz2 7079055 RMD160 67f41b2ae5a67e2d731cb3efc3094cde350116ef SHA1 55ce512006f53b31c41675fabe4565b6e4eb4483 SHA256 104b1d5fcd20078004146c65b35114015e9f4e8cc07f1c61aaac717eb4db7712
-EBUILD pykde4-4.5.5.ebuild 1885 RMD160 7f8818c08d166a016683a037eb293971d859fe5a SHA1 73e7eef7979147aec97ffae83811aea9e26914e0 SHA256 63eae625e8580fd06fb0db2d6fb1a0d303c455d1fde87012955e597a7a8801ed
-EBUILD pykde4-4.5.95.ebuild 1868 RMD160 f73b5f965479a72a6f68e9d9176fa22cbb074a53 SHA1 359c3a9eeff1be1ca6a2aff83aa5e8278d451ef7 SHA256 bd414ca89a4cc79f1527a9beb74114457da62df75be97db737c46b84a692f6cd
-EBUILD pykde4-4.5.9999.ebuild 1833 RMD160 95805f63f7f3527e3d9ba3f5c6c7dd27ab5611de SHA1 d1719603e0817bf47d4e58a8972acf11979f7a34 SHA256 9f787c349fdc0d8030d8f80959113bcad0a6c28cbab1094aa101eb62c1546fde
-EBUILD pykde4-4.6.9999.ebuild 1857 RMD160 745eb6e2d34101b6e0363b51a3ae34683b54830d SHA1 a06f29d39b43ab9f024ab7bfe69b2d1ea4ecf8a3 SHA256 4a3726567cdfd4ca9894e6ca42eabf73a102484699f0554bee00e0442b427141
+EBUILD pykde4-4.5.5.ebuild 1970 RMD160 5f05faa738611ef010de36b8bf9d2fe66636cfba SHA1 c13fb543d4f2dd09af6e350506775e10a6be7021 SHA256 155d98523debb9c215c70a2a0eb01c48bb8ef628a68635e265cc6397eb3b88c1
+EBUILD pykde4-4.5.95.ebuild 1895 RMD160 56b88171c1fb94dd1d9eafdbb5663e0f11ac5d52 SHA1 4bab8de802fbde6ba5d72ebea7eac53ee895f810 SHA256 27877dd219b32177fe88422dd24965db97de379b17fb44c9362ca28c10985b62
+EBUILD pykde4-4.5.9999.ebuild 1914 RMD160 6346bedb80355eda542adb022d796f828408d180 SHA1 7e8644ba4ac3a4e9cf2670c8fc7c2f60dff47922 SHA256 6363b3733294c81cfdd25c51b49f558158451b346e12ba2393b33ca81cfcaca8
+EBUILD pykde4-4.6.9999.ebuild 1884 RMD160 7a3f181670d6cca2ebfa2bf5c55e3e968c6d3aa9 SHA1 7b27ef664366c6a6e6bc050e6c182ef829a4c112 SHA256 211ceb16776e9ef380ae96b0a296f0c36269329c142c16268e45d1cb30b96d35
 EBUILD pykde4-9999.ebuild 1884 RMD160 7a3f181670d6cca2ebfa2bf5c55e3e968c6d3aa9 SHA1 7b27ef664366c6a6e6bc050e6c182ef829a4c112 SHA256 211ceb16776e9ef380ae96b0a296f0c36269329c142c16268e45d1cb30b96d35
 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 00000000000..6fb5714ad05
--- /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
index f0a450fc5c0..d486dd79494 100644
--- a/kde-base/pykde4/pykde4-4.5.5.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.5.ebuild
@@ -18,13 +18,16 @@ 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.7[dbus,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,X] )
+	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
diff --git a/kde-base/pykde4/pykde4-4.5.95.ebuild b/kde-base/pykde4/pykde4-4.5.95.ebuild
index 466942b2140..17f79815b97 100644
--- a/kde-base/pykde4/pykde4-4.5.95.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.95.ebuild
@@ -18,10 +18,11 @@ 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[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8[dbus,declarative,sql,svg,webkit,X] )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/pykde4/pykde4-4.5.9999.ebuild b/kde-base/pykde4/pykde4-4.5.9999.ebuild
index bffeace6a65..079845b5f16 100644
--- a/kde-base/pykde4/pykde4-4.5.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.9999.ebuild
@@ -18,6 +18,7 @@ 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.7[dbus,sql,svg,webkit,aqua] )
@@ -25,6 +26,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.5.5-typedefs-fix.patch" )
+
 pkg_setup() {
 	python_pkg_setup
 	kde4-meta_pkg_setup
diff --git a/kde-base/pykde4/pykde4-4.6.9999.ebuild b/kde-base/pykde4/pykde4-4.6.9999.ebuild
index 6162be7caa7..04c6de414c0 100644
--- a/kde-base/pykde4/pykde4-4.6.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.9999.ebuild
@@ -18,10 +18,11 @@ 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[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8[dbus,declarative,sql,svg,webkit,X] )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
 "
 RDEPEND="${DEPEND}"