[kde-base/plasma-workspace] Fix python support, wrt bug #440362 and 440364.

Package-Manager: portage-2.1.11.31

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild
index 55dcbc1..be2aa67 100644 (file)
--- a/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=4
 
+DECLARATIVE_REQUIRED="always"
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
 KMMODULE="plasma"
@@ -70,7 +71,9 @@ KMEXTRACTONLY="
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
 pkg_setup() {
-       python_set_active_version 2
+       if use python ; then
+               python_set_active_version 2
+       fi
        python_pkg_setup
        kde4-meta_pkg_setup
 }
@@ -87,9 +90,7 @@ src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_with google-gadgets Googlegadgets)
                $(cmake-utils_use_with gps libgps)
-               $(cmake-utils_use_with python SIP)
-               $(cmake-utils_use_with python PyQt4)
-               $(cmake-utils_use_with python PyKDE4)
+               $(cmake-utils_use_with python PythonLibrary)
                $(cmake-utils_use_with qalculate)
                $(cmake-utils_use_with rss KdepimLibs)
                $(cmake-utils_use_with semantic-desktop Akonadi)

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 55dcbc1..be2aa67 100644 (file)
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=4
 
+DECLARATIVE_REQUIRED="always"
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
 KMMODULE="plasma"
@@ -70,7 +71,9 @@ KMEXTRACTONLY="
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
 pkg_setup() {
-       python_set_active_version 2
+       if use python ; then
+               python_set_active_version 2
+       fi
        python_pkg_setup
        kde4-meta_pkg_setup
 }
@@ -87,9 +90,7 @@ src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_with google-gadgets Googlegadgets)
                $(cmake-utils_use_with gps libgps)
-               $(cmake-utils_use_with python SIP)
-               $(cmake-utils_use_with python PyQt4)
-               $(cmake-utils_use_with python PyKDE4)
+               $(cmake-utils_use_with python PythonLibrary)
                $(cmake-utils_use_with qalculate)
                $(cmake-utils_use_with rss KdepimLibs)
                $(cmake-utils_use_with semantic-desktop Akonadi)