plasma-workspace, removed redundant unpack, small QA in python cleanup

5 files changed, 42 insertions, 55 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 95d02b9d6f7..555bf0bdce6 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -5,6 +5,11 @@
   09 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   plasma-workspace-4.2.2.ebuild, plasma-workspace-4.2.69.ebuild,
   plasma-workspace-9999.ebuild:
+  Redundant
+
+  09 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  plasma-workspace-4.2.2.ebuild, plasma-workspace-4.2.69.ebuild,
+  plasma-workspace-9999.ebuild:
   Added doc IUSE
 
   08 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index e6d9baf23ca..4565f87a0ad 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,8 +1,8 @@
 AUX plasma-workspace-4.1.72-fix.patch 958 RMD160 2922b5ac13b9cbd79a747181b3ff846691508872 SHA1 d3d889ebc5cb7c9f7bd7d00a0729b8350c09b481 SHA256 b2bb0ab8133cd07ca134b41394b0244d07286831a4a4b063b55d8bee157918b3
 DIST kdebase-workspace-4.2.2.tar.bz2 50800751 RMD160 a7cc0bedde529ff7e27ed9e0b6362ef6c20c4082 SHA1 9397220827f378cedf38e800e06e9ca8b1a1235d SHA256 1620cf0467eb08046aeee6bce46ca17948a703e98c0e3d0de3064ab39f196c2f
 DIST kdebase-workspace-4.2.69.tar.lzma 50199185 RMD160 9830f5caecac82953815ea148ff57bc357dbad69 SHA1 2b6916f811e591f8a301480e04d2b9927c1de8b7 SHA256 92a29d31a2271bc7fde21bbf078ce5254bee9c2592dd78c055da633512a49c73
-EBUILD plasma-workspace-4.2.2.ebuild 2688 RMD160 581d6ae3227f4eb887b26b6805186a4c45dd4a95 SHA1 8eba1677fc558229accdc324f5f49c500dfd4087 SHA256 5cb750b0a5018269a8e4564d4619ad70782879f68c5a6b65d5855cadc175cb4e
-EBUILD plasma-workspace-4.2.69.ebuild 2557 RMD160 71bd4ef2094b3a1dd5a0f8ddcd35d96473132325 SHA1 093823e860e0c83cf686cfd5ee0a076a80624dfa SHA256 455b003bc5c793e8ebd4578c76cc533c38a6cf6f5ae0f9dff2ab74011400d036
-EBUILD plasma-workspace-9999.ebuild 2546 RMD160 e0301f1aa950c0610dc83c7c1a273e382469e52d SHA1 9f0df15a7b8a3fa1a86585cfc2a00a484e016f49 SHA256 178e905d07eb887c4edbce4da0b72f0356751c85acc7e0f13d48f69995ff124e
-MISC ChangeLog 10252 RMD160 302a8ae15b554358bcef32923d3d19d5880695d5 SHA1 c303a6bdace535dc3d470ebce21f3c892dd25129 SHA256 dbc26ac9a95433da346b58f7c5d9955ce32bd0b90faaaee52939c6123e323c13
+EBUILD plasma-workspace-4.2.2.ebuild 2689 RMD160 16f25547136306f515c3cf9f5743f0f1f2229df1 SHA1 dc19342135b71a8d868be2e6f1559fa228f19d0a SHA256 838726ef523e5245d3f047b8fc28d18807f4276774b361036c490ca774d6ac0c
+EBUILD plasma-workspace-4.2.69.ebuild 2558 RMD160 d2800361385f579d1b81c63f2a20421b854a1ea9 SHA1 13050a589b7de9062d139211b1fa666f8e564d48 SHA256 9b8cca0c5f0db7347316c9d79411f091105f68b1b1a5a2558433cec61ac68f74
+EBUILD plasma-workspace-9999.ebuild 2547 RMD160 20af8387826d806207ad7e8ad0af3253b7390051 SHA1 0099d35e1828397ca0c165532172187fba501e5e SHA256 e2c8105f2e5d397a9b7f62cdfea5151b9eac761d1cb957fc47fc5fa5fdca9473
+MISC ChangeLog 10426 RMD160 161b0fd137fa6db9ce9aeffc0750e5620a6fdcce SHA1 70da2678e823e66a3072901456322aa9ef84b10e SHA256 34750d5443022d0ea835cef0f11d0e816efe1cafe15a940f74a6e25efe3f2b3d
 MISC metadata.xml 332 RMD160 ca0d953faef7f42984b0853648b9524c304c7c46 SHA1 e79c7f7b292068daf0a6d5db386ff58fc4f9d6cd SHA256 55cde5f777627192cf9ae1935355902d496a45070fffe5a5ba2abd41168b4ce8
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
index b97367f478d..c37c3c07e44 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
@@ -57,16 +57,6 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
 
-src_unpack() {
-	if use doc; then
-		KMEXTRA="${KMEXTRA}
-			doc/plasma
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with google-gadgets Googlegadgets)
@@ -85,21 +75,25 @@ src_install() {
 	python_version
 	rm -f \
 		"${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
-		"${D}${PREFIX}"/share/apps/plasma_scriptengine_python/*.py[co]
+		"${D}${KDEDIR}"/share/apps/plasma_scriptengine_python/*.py[co]
 }
 
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
-	python_mod_optimize \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/plasma_scriptengine_python
+	if use python; then
+		python_mod_optimize \
+			"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
 }
 
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/plasma_scriptengine_python
+	if [[ -d "${KDEDIR}"/share/apps/plasma_scriptengine_python ]]; then
+		python_mod_cleanup \
+			"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
 }
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.69.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.69.ebuild
index 2dc7ff145a6..4e6202ef175 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.69.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.2.69.ebuild
@@ -57,16 +57,6 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
 
-src_unpack() {
-	if use doc; then
-		KMEXTRA="${KMEXTRA}
-			doc/plasma
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with google-gadgets Googlegadgets)
@@ -85,21 +75,25 @@ src_install() {
 	python_version
 	rm -f \
 		"${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
-		"${D}${PREFIX}"/share/apps/plasma_scriptengine_python/*.py[co]
+		"${D}${KDEDIR}"/share/apps/plasma_scriptengine_python/*.py[co]
 }
 
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
-	python_mod_optimize \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/plasma_scriptengine_python
+	if use python; then
+		python_mod_optimize \
+			"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
 }
 
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/plasma_scriptengine_python
+	if [[ -d "${KDEDIR}"/share/apps/plasma_scriptengine_python ]]; then
+		python_mod_cleanup \
+			"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
 }
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index aca4a1caa17..797181ead64 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -57,16 +57,6 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
 
-src_unpack() {
-	if use doc; then
-		KMEXTRA="${KMEXTRA}
-			doc/plasma
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with google-gadgets Googlegadgets)
@@ -85,21 +75,25 @@ src_install() {
 	python_version
 	rm -f \
 		"${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
-		"${D}${PREFIX}"/share/apps/plasma_scriptengine_python/*.py[co]
+		"${D}${KDEDIR}"/share/apps/plasma_scriptengine_python/*.py[co]
 }
 
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
-	python_mod_optimize \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/plasma_scriptengine_python
+	if use python; then
+		python_mod_optimize \
+			"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
 }
 
 pkg_postrm() {
 	kde4-meta_pkg_postrm
 
-	python_mod_cleanup \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/plasma_scriptengine_python
+	if [[ -d "${KDEDIR}"/share/apps/plasma_scriptengine_python ]]; then
+		python_mod_cleanup \
+			"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
 }