[kde-base/pykde4] Add patch to fix #284060

(Portage version: 2.2_rc46/git/Linux x86_64)
 (Signed Manifest commit)

5 files changed, 47 insertions, 24 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index cd509cde72f..9ccc378cb51 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,7 +1,16 @@
-AUX pykde4-installation-fix.patch 759 RMD160 31e00772af48c46e3af77cf2ef12f6af446f2979 SHA1 0f01bcec21e920f345207ef0c560246331f494e9 SHA256 09cd037c523c00274ed041efb09ea9e7fe627bc0bfffad74c883ae549e11152e
-AUX pykde4-installation.patch 873 RMD160 d290c37a40e4ad74de14e75556da813df9f42f38 SHA1 856298c1f1a5aac9069b34e83b2f54bbe061c601 SHA256 f8f0387283f134e0580e268dfbe3974ae98d9e6482f7bcb047264eae22496b2e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pykde4-kcategorydrawer.patch 1541 RMD160 ee66e94ab47b8b909178bb356ef670d75d1dd0a8 SHA1 6381e830e91d9c5982113845cd05e0e6931e2917 SHA256 7b00127541d1f01b93d0a5a09916fba75da8396ac297fda74a81d38a9ff18e43
 DIST kdebindings-4.3.72.tar.lzma 4186047 RMD160 bbedfb7430139765c3983d742377b6cc0d06c1a7 SHA1 1cce63b18a337cd69f830882746ca226d97d3e32 SHA256 db4cf4b036135db430df8a2a477d17061dabe89607541eaa5138f674d6df0ea5
-EBUILD pykde4-4.3.72.ebuild 1923 RMD160 91b5e897d1f6e2e6b2cadefb417b5def62baf85b SHA1 8e934d8e46f2c55bc20c410edd97e62b4619c5f4 SHA256 ee2852f6d0a14ebe3f336b9841977c5fda0585205c0516906b8c2c7b0b3af04a
+EBUILD pykde4-4.3.72.ebuild 1983 RMD160 dcb4915e3eaecdc4212f7008f7ce81a6d7f8304b SHA1 f86fcd803f296358df16f4e5d3632ce578d67d61 SHA256 5e543815fa3ccab589ae38dee22074b160bf4805b668f6dd6a34be635cd7843b
 EBUILD pykde4-4.3.9999.ebuild 1915 RMD160 b044273104441545520f46ad4223fde8a363e1d2 SHA1 7ad9e6bfcfae594ec9a7fe14e4419b6c255ac89b SHA256 0115213e06f5460e0d55d6847e735ebd4b2be5d103eb7f17a2b72b8b12f4c2a8
 EBUILD pykde4-9999.ebuild 1881 RMD160 17ac63ccf9ffbc8820b8085027a8a2f609452b11 SHA1 a8f1be3dbb9e0b1e9abfbf6a78e5f9afeb2e1e4e SHA256 1dcfeb719e9fcabfd8b6fab9444156360ba226e706d2d4215a825bf3d4b436ae
 MISC metadata.xml 329 RMD160 6424cd6e9a3dffa1ef07462160d03733beff3e02 SHA1 3a06ca30f6526a47772713084e9e36ca8a83e41b SHA256 e449422e44fd1a613b5810fe876de7fbdd4ff9ad97b40057af758061bb2607f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkrjdtMACgkQ5BmOA85PVLg7wQCfQOU2hHLCLSlABRhT0xHWIadH
+XzYAnRWIQIKYSNKxZ1I4JC38ifck7tlO
+=hXUo
+-----END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/files/pykde4-installation-fix.patch b/kde-base/pykde4/files/pykde4-installation-fix.patch
deleted file mode 100644
index a0a3e642d49..00000000000
--- a/kde-base/pykde4/files/pykde4-installation-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: python/pykde4/tools/pykdeuic4/CMakeLists.txt
-===================================================================
---- python/pykde4/tools/pykdeuic4/CMakeLists.txt	(revision 1001414)
-+++ python/pykde4/tools/pykdeuic4/CMakeLists.txt	(working copy)
-@@ -1,2 +1,4 @@
- PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
--PYTHON_INSTALL(pykdeuic4.py ${BIN_INSTALL_DIR}/pykdeuic4)
-+PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
-+find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH})
-+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
diff --git a/kde-base/pykde4/files/pykde4-installation.patch b/kde-base/pykde4/files/pykde4-installation.patch
deleted file mode 100644
index f452a0799a5..00000000000
--- a/kde-base/pykde4/files/pykde4-installation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up python/pykde4/tools/pykdeuic4/CMakeLists.txt.kdebug#198632 python/pykde4/tools/pykdeuic4/CMakeLists.txt
---- python/pykde4/tools/pykdeuic4/CMakeLists.txt.kdebug#198632	2009-03-27 09:46:05.000000000 -0500
-+++ python/pykde4/tools/pykdeuic4/CMakeLists.txt	2009-07-16 12:39:38.457647506 -0500
-@@ -1,3 +1,5 @@
-
--PYTHON_INSTALL(kde4.py ${DATA_INSTALL_DIR}/${PROJECT_NAME})
--PYTHON_INSTALL(pykdeuic4.py ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-+PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
-+PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
-+find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH})
-+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
diff --git a/kde-base/pykde4/files/pykde4-kcategorydrawer.patch b/kde-base/pykde4/files/pykde4-kcategorydrawer.patch
new file mode 100644
index 00000000000..25a6711b758
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-kcategorydrawer.patch
@@ -0,0 +1,31 @@
+--- pykde4-4.3.72/python/pykde4/sip/kdeui/kcategorydrawer.sip.def	2008-07-08 13:27:45.000000000 +0400
++++ pykde4-4.3.72/python/pykde4/sip/kdeui/kcategorydrawer.sip	2009-10-25 00:39:24.573756918 +0400
+@@ -29,6 +29,28 @@
+                             KCategoryDrawer ();
+     virtual void            drawCategory (const QModelIndex& index, int sortRole, const QStyleOption& option, QPainter* painter) const;
+     virtual int             categoryHeight (const QModelIndex& index, const QStyleOption& option) const;
++    int                     leftMargin () const;
++    void                    setLeftMargin (int leftMargin);
++    int                     rightMargin () const;
++    void                    setRightMargin (int rightMargin);
++
++private:
++                            KCategoryDrawer (const KCategoryDrawer&);
+ };   // KCategoryDrawer
+ 
++class KCategoryDrawerV2 : QObject, KCategoryDrawer
++{
++%TypeHeaderCode
++#include <kcategorydrawer.h>
++%End
++
++public:
++                            KCategoryDrawerV2 (QObject *parent = 0);
++    virtual void            mouseButtonPressed (const QModelIndex &index, QMouseEvent *event);
++    virtual void            mouseButtonReleased (const QModelIndex &index, QMouseEvent *event);
++    virtual void            mouseButtonMoved(const QModelIndex &index, QMouseEvent *event);
++    virtual void            mouseButtonDoubleClicked(const QModelIndex &index, QMouseEvent *event);
+ 
++signals:
++    void                    collapseOrExpandClicked(const QModelIndex &index);
++};   // KCategoryDrawerV2
diff --git a/kde-base/pykde4/pykde4-4.3.72.ebuild b/kde-base/pykde4/pykde4-4.3.72.ebuild
index 7a89b8ce8ce..0a305a8284e 100644
--- a/kde-base/pykde4/pykde4-4.3.72.ebuild
+++ b/kde-base/pykde4/pykde4-4.3.72.ebuild
@@ -26,6 +26,10 @@ RDEPEND="${COMMON_DEPEND}
 	!dev-python/pykde
 "
 
+PATCHES=(
+			"${FILESDIR}/${PN}-kcategorydrawer.patch"
+		)
+
 pkg_setup() {
 	python_pkg_setup
 	kde4-meta_pkg_setup