Final cleanups for pykde4 and plasma-workspace

5 files changed, 26 insertions, 13 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index d443b311145..710ceea07d9 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -4,6 +4,10 @@
 
   08 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   pykde4-4.2.2.ebuild, pykde4-4.2.69.ebuild, pykde4-9999.ebuild:
+  Final cleanups
+
+  08 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  pykde4-4.2.2.ebuild, pykde4-4.2.69.ebuild, pykde4-9999.ebuild:
   Fixed pykde4 .py{c,p} cleanup, added examples USE flag
 
   07 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org> -pykde4-4.2.68.ebuild,
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index e2c43f9379d..7336a4792a5 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,7 +1,7 @@
 DIST kdebindings-4.2.2.tar.bz2 4736376 RMD160 36acaa5c14620704575b19c2652f5c774a8cf44d SHA1 1d5eb1bb92f68172d0a0345070b1120c2601ab8c SHA256 8d8ce9ee98382c0d8950858d19a2185d7506a76f637a3c9c591f3017de83d946
 DIST kdebindings-4.2.69.tar.lzma 3837092 RMD160 4b476e373736a640675a19c87b13955ee4b24e22 SHA1 a8b81b87bc71eba7221d42a1950c0ca381ec1212 SHA256 ac0a897efd02c513687f43cd4dbc7721bb7d0889c8620c6b30330730c5a9bcc3
-EBUILD pykde4-4.2.2.ebuild 1751 RMD160 14ee3efff784152976f6dff4ebe044e5184541ac SHA1 5305d1d5705cbdcd937ac75afa36593a9af1cd8e SHA256 e11d1db767c2fa05417ac2be7daf1a5fa2c7af9ee4b045df350fd6c06e181b72
-EBUILD pykde4-4.2.69.ebuild 1639 RMD160 0b716eb5d08eedf5b535da58eab8745c95382377 SHA1 d474ec3604c45535ed2ee8a504ee546644cd5661 SHA256 e854e2fa054aa00840a319ca79a2356a7e50559ff75d4047ca45e2b918b06793
-EBUILD pykde4-9999.ebuild 1628 RMD160 8dc59245742a1646650035c5cce64b224d727866 SHA1 adf842525ca6f9009b599bc19c654adfa61422c0 SHA256 8cc26f9b1f3562d7e775497c8c5e73ac1789f3efc5cc67e101f816c862d32a71
-MISC ChangeLog 5734 RMD160 6d8ea05f44438d8dd67d76d44bb4471eeb23db2a SHA1 690de8d3bf1fd298b8c394a96ebcb0d5c6cd8c68 SHA256 b630dfc582e8e5c9fdc235f70de23bc3dc6b324ebe40a9f9af6e98067dd0451b
+EBUILD pykde4-4.2.2.ebuild 1828 RMD160 b71d1c33de5eb4b84654720fb2ea3a10b8347b39 SHA1 ccb05e4bfabab4eb8794049651ebedce6fa54608 SHA256 93fd72d663c826a54a6551016a1de5a4291ba107bcccb81d817a2526474cad83
+EBUILD pykde4-4.2.69.ebuild 1716 RMD160 bf2d04f54fb8c7043b2dd6d013346275fc6f13ca SHA1 3ffcb32af3b11186afb31a5ef8cf3cf185c94404 SHA256 1aeadf0816aec8ac41e1bb2a937ff819b07d50ed2c8c4847c5bd8346e3e44d9f
+EBUILD pykde4-9999.ebuild 1705 RMD160 860a9352584d4caa0976f40f8907a3ad1c807ad7 SHA1 ade9732791187dc4c107e3193f1ec734271996ed SHA256 63d99e2594796ecabf9e6edd7f55bcd30298f2258eca3ca9d91b9eacfbf12241
+MISC ChangeLog 5881 RMD160 d907bd5952985e8a4db25c71d02b88db01d0f1d5 SHA1 8585863d691957622553c11eaf23c1a9c3b9101a SHA256 5bf2478d12f9d2ee7f83bfa11968b36050321c4a0275e93620405802bb8e7364
 MISC metadata.xml 329 RMD160 6424cd6e9a3dffa1ef07462160d03733beff3e02 SHA1 3a06ca30f6526a47772713084e9e36ca8a83e41b SHA256 e449422e44fd1a613b5810fe876de7fbdd4ff9ad97b40057af758061bb2607f8
diff --git a/kde-base/pykde4/pykde4-4.2.2.ebuild b/kde-base/pykde4/pykde4-4.2.2.ebuild
index 3ffd6d8b966..140de97de6c 100644
--- a/kde-base/pykde4/pykde4-4.2.2.ebuild
+++ b/kde-base/pykde4/pykde4-4.2.2.ebuild
@@ -44,7 +44,8 @@ src_install() {
 	kde4-meta_src_install
 
 	python_version
-	rm -f "${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
+	rm -f \
+		"${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
 		"${D}${PREFIX}"/share/apps/"${PN}"/*.py[co]
 }
 
@@ -52,6 +53,7 @@ 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
 
 	if use examples; then
@@ -65,6 +67,7 @@ pkg_postinst() {
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup
-	python_mod_cleanup "${PREFIX}"/share/apps/"${PN}"
+	python_mod_cleanup \
+		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+		"${PREFIX}"/share/apps/"${PN}"
 }
diff --git a/kde-base/pykde4/pykde4-4.2.69.ebuild b/kde-base/pykde4/pykde4-4.2.69.ebuild
index 21d7ca22caf..f4e1bd9cfe0 100644
--- a/kde-base/pykde4/pykde4-4.2.69.ebuild
+++ b/kde-base/pykde4/pykde4-4.2.69.ebuild
@@ -44,7 +44,8 @@ src_install() {
 	kde4-meta_src_install
 
 	python_version
-	rm -f "${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
+	rm -f \
+		"${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
 		"${D}${PREFIX}"/share/apps/"${PN}"/*.py[co]
 }
 
@@ -52,6 +53,7 @@ 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
 
 	if use examples; then
@@ -65,6 +67,7 @@ pkg_postinst() {
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup
-	python_mod_cleanup "${PREFIX}"/share/apps/"${PN}"
+	python_mod_cleanup \
+		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+		"${PREFIX}"/share/apps/"${PN}"
 }
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 2fea9f47676..82b1a484716 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -44,7 +44,8 @@ src_install() {
 	kde4-meta_src_install
 
 	python_version
-	rm -f "${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
+	rm -f \
+		"${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
 		"${D}${PREFIX}"/share/apps/"${PN}"/*.py[co]
 }
 
@@ -52,6 +53,7 @@ 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
 
 	if use examples; then
@@ -65,6 +67,7 @@ pkg_postinst() {
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup
-	python_mod_cleanup "${PREFIX}"/share/apps/"${PN}"
+	python_mod_cleanup \
+		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+		"${PREFIX}"/share/apps/"${PN}"
 }