[kde-base/plasma-workspace-4.2.2] Sync with tree. Fix bug #312661, merge fix to live builds.

4 files changed, 129 insertions, 2 deletions

diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 0e06424ff70..60ce271c344 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,3 +1,5 @@
-EBUILD plasma-workspace-4.4.9999.ebuild 2422 RMD160 11ae38fd4bc7a9e4be9fe43b115dff13eda0b8a8 SHA1 eaa02a13a4156867068ff73a9af98d0ab2a57694 SHA256 aa8732ce367cd3638f2e25d095143867cb840bde23140d4f83a4620ef99031bc
-EBUILD plasma-workspace-9999.ebuild 2472 RMD160 41f7f9eb9bf7fe7938818493ef709c01263c7d4f SHA1 138be5c51572d8c6f8f9c32a1cb6de57c1c7c564 SHA256 20973cff669f2025f5d3058a41f102c453c8948095231212e2dda2f6f594194c
+DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69ccb90f656266c SHA1 5fd38e48c6ddcf551bb49cf8841ba23b7682ee5b SHA256 8c32bda86e9ec67244ea2996a7e710ed04f0bb532c691af7d366c278f9b519bd
+EBUILD plasma-workspace-4.4.2.ebuild 2709 RMD160 f2bd92ab03cc5d17bcbb3c0f2ce370c5b24e9a5b SHA1 dc0cb39a15969b0ab20c97e672d3d29e3510a423 SHA256 0616e7ef10b0f049271d0e1fbc30f8cbea1290efe8359039f6e0d7dbdc783db4
+EBUILD plasma-workspace-4.4.9999.ebuild 2515 RMD160 d49186fab4a476ff26b14eb749c6b52874c9c12f SHA1 490359a034eedc86fff79a6f94fa81142f5892a8 SHA256 9d0a96a3ca146b5c2b60d745984d8fac9ca93224881ddfb4317f8289d32a0b24
+EBUILD plasma-workspace-9999.ebuild 2565 RMD160 6912fe87fadf7e68016b46a5a4a302ebfb832442 SHA1 1a9953ace3724ac2b787cba1a013b05d30252736 SHA256 f44eb082a620432a3610e1a647072ccbc516ae2f32bbf9e7a3dd0c31eaa38a2c
 MISC metadata.xml 332 RMD160 ca0d953faef7f42984b0853648b9524c304c7c46 SHA1 e79c7f7b292068daf0a6d5db386ff58fc4f9d6cd SHA256 55cde5f777627192cf9ae1935355902d496a45070fffe5a5ba2abd41168b4ce8
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild
new file mode 100644
index 00000000000..e58e4cdb48f
--- /dev/null
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild,v 1.1 2010/03/30 22:02:12 spatz Exp $
+
+EAPI="3"
+
+KMNAME="kdebase-workspace"
+KMMODULE="plasma"
+PYTHON_DEPEND="python? 2"
+inherit python kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +handbook google-gadgets python rss semantic-desktop xinerama"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libplasmaclock)
+	$(add_kdebase_dep libplasmagenericshell)
+	$(add_kdebase_dep libtaskmanager)
+	$(add_kdebase_dep solid)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
+	python? (
+		>=dev-python/PyQt4-4.4.0[X]
+		>=dev-python/sip-4.7.1
+		$(add_kdebase_dep pykde4)
+	)
+	rss? ( $(add_kdebase_dep kdepimlibs) )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/renderproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}"
+
+KMEXTRACTONLY="
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	libs/kworkspace/
+	libs/taskmanager/
+	libs/plasmagenericshell/
+	libs/ksysguard/
+	ksysguard/
+"
+
+KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+=" doc/plasma-desktop"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with google-gadgets Googlegadgets)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PyKDE4)
+		$(cmake-utils_use_with rss KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		-DWITH_Xmms=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	rm -f \
+		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
+		"${ED}${KDEDIR}"/share/apps/plasma_scriptengine_python/*.py[co]
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if use python; then
+		python_mod_optimize \
+			PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	if [[ -d ${EKDEDIR}/share/apps/plasma_scriptengine_python ]]; then
+		python_mod_cleanup \
+			PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
+}
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.4.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.9999.ebuild
index 3856ebafe7d..aae891ebfad 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.9999.ebuild
@@ -6,6 +6,7 @@ EAPI="3"
 
 KMNAME="kdebase-workspace"
 KMMODULE="plasma"
+PYTHON_DEPEND="python? 2"
 inherit python kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
@@ -56,6 +57,11 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+=" doc/plasma-desktop"
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 2b0a2cb92f8..cecc9197a2a 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -6,6 +6,7 @@ EAPI="3"
 
 KMNAME="kdebase-workspace"
 KMMODULE="plasma"
+PYTHON_DEPEND="python? 2"
 inherit python kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
@@ -60,6 +61,11 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+=" doc/plasma-desktop"