[kde-base/pykde4] Further pykde4 cleanups + pykdeuic4 installation patch

7 files changed, 35 insertions, 51 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index bdcd62ba443..72b57843df0 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,8 +1,9 @@
-AUX pykde4-installation.patch 617 RMD160 dd40313a3ada798d7b65c2beed94896efcc116fa SHA1 d2a7923be5490510c85da92bf08e65d7a3c077bc SHA256 95088f93de3e805092114bca476410d7edbcbcfb0d037d596a40bdb6080a09e2
+AUX pykde4-installation-fix.patch 759 RMD160 31e00772af48c46e3af77cf2ef12f6af446f2979 SHA1 0f01bcec21e920f345207ef0c560246331f494e9 SHA256 09cd037c523c00274ed041efb09ea9e7fe627bc0bfffad74c883ae549e11152e
+AUX pykde4-installation.patch 674 RMD160 0004c6973d277a7286fa2ba75302667e022c6f61 SHA1 8e973376bf41a54b31203c4910645b6170385e2f SHA256 dd68c43d05707ff51cf2f36a4f8689366dc265b4b7d4146c03d1db51622de29f
 DIST kdebindings-4.2.98.tar.bz2 4878964 RMD160 a5432e86c22225aeb81e7680a951ad60cac139ed SHA1 a1d751f2073bdf888010ec0fce8b57ed87e71cbd SHA256 92885f5bba450d0a795640ad53911526e3c21556c2d83632fb4d8e65456ecfc5
 DIST kdebindings-4.3.61.tar.lzma 3898093 RMD160 b446d64411b0484d6c43cad114eb61a56b6f5f84 SHA1 fbafb8fb37e2c13ec7ca369d051777a34e91071c SHA256 c16d7b7583182517b7d08b67dde7d3aab2e534fa604dd6c9331c5fbbcb71e475
-EBUILD pykde4-4.2.98.ebuild 2238 RMD160 239696ca9efe4afc748cfd016b53f53f393e594a SHA1 0e58d1b0140d63b7663bf07ceb0e3015cef03949 SHA256 3643a129c8961dcb4cb199bd586584028997bc7c504555accb5be4192f2a1cd5
-EBUILD pykde4-4.3.61.ebuild 2185 RMD160 308869396503e1e65b40431d31d3b31529390be3 SHA1 05167c6b7ae78d5740bee62dc305c7ecf6564550 SHA256 0b9b15f3be895afa02dc230189d4a5ba27170dd94e5509bc05355086da167a77
-EBUILD pykde4-4.3.9999.ebuild 2143 RMD160 219d8d62150761ae4fdf8f9c819171813461ef06 SHA1 075bf5405caa44824557ee0210c3715b13baf3f0 SHA256 8181330b379714ef14ed3f0a2a299be7cb4d008a97fe31850b352af6dd32ba5b
-EBUILD pykde4-9999.ebuild 2143 RMD160 219d8d62150761ae4fdf8f9c819171813461ef06 SHA1 075bf5405caa44824557ee0210c3715b13baf3f0 SHA256 8181330b379714ef14ed3f0a2a299be7cb4d008a97fe31850b352af6dd32ba5b
+EBUILD pykde4-4.2.98.ebuild 1928 RMD160 fd8c8668d1e59d0645e2918e607d2e9d3073f407 SHA1 205993a7a867630accdbad66f2d82f6b045326b1 SHA256 5269cf0e37240a097448eab0e6711eb2ec7e02c2c398cdb1bb7774027d1bab69
+EBUILD pykde4-4.3.61.ebuild 1875 RMD160 54d0e68c820c00e7591e6ee618fe6a339b58bf8c SHA1 577109e650e0cee53f24dfd15298b96ed55ac232 SHA256 3732633d89f737688410e9d6c121b65ff0c4ca49320be1129e72b82d2a950dad
+EBUILD pykde4-4.3.9999.ebuild 1890 RMD160 ee06e60a377a13da82ff755e5ef3150841dee18f SHA1 f0f1ed0faa30bc03897a9ce94f9b3e0e83f65753 SHA256 171ad467812560bf5bff05d540cc6af043c38ed4ea43c614b905a23d8f9e8c79
+EBUILD pykde4-9999.ebuild 1890 RMD160 ee06e60a377a13da82ff755e5ef3150841dee18f SHA1 f0f1ed0faa30bc03897a9ce94f9b3e0e83f65753 SHA256 171ad467812560bf5bff05d540cc6af043c38ed4ea43c614b905a23d8f9e8c79
 MISC metadata.xml 329 RMD160 6424cd6e9a3dffa1ef07462160d03733beff3e02 SHA1 3a06ca30f6526a47772713084e9e36ca8a83e41b SHA256 e449422e44fd1a613b5810fe876de7fbdd4ff9ad97b40057af758061bb2607f8
diff --git a/kde-base/pykde4/files/pykde4-installation-fix.patch b/kde-base/pykde4/files/pykde4-installation-fix.patch
new file mode 100644
index 00000000000..a0a3e642d49
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-installation-fix.patch
@@ -0,0 +1,10 @@
+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
index 177aa449d9f..1e1a5ff40ab 100644
--- a/kde-base/pykde4/files/pykde4-installation.patch
+++ b/kde-base/pykde4/files/pykde4-installation.patch
@@ -1,9 +1,10 @@
 diff -up python/pykde4/tools/pykdeuic4/CMakeLists.txt.kdebug#198632 python/pykde4/tools/pykdeuic4/CMakeLists.txt
 --- kdebindings-4.2.96/python/pykde4/tools/pykdeuic4/CMakeLists.txt.kdebug#198632	2009-03-27 09:46:05.000000000 -0500
 +++ kdebindings-4.2.96/python/pykde4/tools/pykdeuic4/CMakeLists.txt	2009-07-16 12:39:38.457647506 -0500
-@@ -1,3 +1,3 @@
+@@ -1,3 +1,4 @@
 
 -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 ${BIN_INSTALL_DIR}/pykdeuic4)
++PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
++PYKDE4_ADD_EXECUTABLE(pykdeuic4.py pykdeuic4)
diff --git a/kde-base/pykde4/pykde4-4.2.98.ebuild b/kde-base/pykde4/pykde4-4.2.98.ebuild
index c035760ba79..ceb3451a2e8 100644
--- a/kde-base/pykde4/pykde4-4.2.98.ebuild
+++ b/kde-base/pykde4/pykde4-4.2.98.ebuild
@@ -32,11 +32,6 @@ PATCHES=(
 src_prepare() {
 	kde4-meta_src_prepare
 
-	# FIXME temporary fix
-	rm -f python/${PN}/sip/kio/ksslcertificatemanager.sip
-	sed -e 's|%Include ksslcertificatemanager.sip||' \
-		-i python/${PN}/sip/kio/kiomod.sip || die "failed to hack around"
-
 	if ! use examples; then
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
 			|| die "Failed to disable examples"
@@ -68,9 +63,7 @@ src_install() {
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
-	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
-	# Do not optimize examples
-	python_mod_compile "${PREFIX}"/share/apps/"${PN}"/*.py
+	python_mod_optimize ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
 
 	if use examples; then
 		echo
@@ -83,7 +76,5 @@ pkg_postinst() {
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/"${PN}"
+	python_mod_cleanup ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
 }
diff --git a/kde-base/pykde4/pykde4-4.3.61.ebuild b/kde-base/pykde4/pykde4-4.3.61.ebuild
index 7e03e677917..702af8fe972 100644
--- a/kde-base/pykde4/pykde4-4.3.61.ebuild
+++ b/kde-base/pykde4/pykde4-4.3.61.ebuild
@@ -28,11 +28,6 @@ RDEPEND="${COMMON_DEPEND}
 src_prepare() {
 	kde4-meta_src_prepare
 
-	# FIXME temporary fix
-	rm -f python/${PN}/sip/kio/ksslcertificatemanager.sip
-	sed -e 's|%Include ksslcertificatemanager.sip||' \
-		-i python/${PN}/sip/kio/kiomod.sip || die "failed to hack around"
-
 	if ! use examples; then
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
 			|| die "Failed to disable examples"
@@ -64,9 +59,7 @@ src_install() {
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
-	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
-	# Do not optimize examples
-	python_mod_compile "${PREFIX}"/share/apps/"${PN}"/*.py
+	python_mod_optimize ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
 
 	if use examples; then
 		echo
@@ -79,7 +72,5 @@ pkg_postinst() {
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/"${PN}"
+	python_mod_cleanup ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
 }
diff --git a/kde-base/pykde4/pykde4-4.3.9999.ebuild b/kde-base/pykde4/pykde4-4.3.9999.ebuild
index c91b87d2e8e..8291892182e 100644
--- a/kde-base/pykde4/pykde4-4.3.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.3.9999.ebuild
@@ -25,14 +25,13 @@ RDEPEND="${COMMON_DEPEND}
 	!dev-python/pykde
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-installation-fix.patch"
+)
+
 src_prepare() {
 	kde4-meta_src_prepare
 
-	# FIXME temporary fix
-	rm -f python/${PN}/sip/kio/ksslcertificatemanager.sip
-	sed -e 's|%Include ksslcertificatemanager.sip||' \
-		-i python/${PN}/sip/kio/kiomod.sip || die "failed to hack around"
-
 	if ! use examples; then
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
 			|| die "Failed to disable examples"
@@ -64,9 +63,7 @@ src_install() {
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
-	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
-	# Do not optimize examples
-	python_mod_compile "${PREFIX}"/share/apps/"${PN}"/*.py
+	python_mod_optimize ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
 
 	if use examples; then
 		echo
@@ -79,7 +76,5 @@ pkg_postinst() {
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/"${PN}"
+	python_mod_cleanup ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
 }
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index c91b87d2e8e..8291892182e 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -25,14 +25,13 @@ RDEPEND="${COMMON_DEPEND}
 	!dev-python/pykde
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-installation-fix.patch"
+)
+
 src_prepare() {
 	kde4-meta_src_prepare
 
-	# FIXME temporary fix
-	rm -f python/${PN}/sip/kio/ksslcertificatemanager.sip
-	sed -e 's|%Include ksslcertificatemanager.sip||' \
-		-i python/${PN}/sip/kio/kiomod.sip || die "failed to hack around"
-
 	if ! use examples; then
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
 			|| die "Failed to disable examples"
@@ -64,9 +63,7 @@ src_install() {
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
-	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
-	# Do not optimize examples
-	python_mod_compile "${PREFIX}"/share/apps/"${PN}"/*.py
+	python_mod_optimize ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
 
 	if use examples; then
 		echo
@@ -79,7 +76,5 @@ pkg_postinst() {
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/"${PN}"
+	python_mod_cleanup ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
 }