summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka2012-10-31 11:13:27 (GMT)
committerMichael Palimaka2012-10-31 11:13:27 (GMT)
commit424233be90bce92f59d7d41b9d4aabb6fff7f338 (patch)
treee37161a9bc15f0a655f51d9c1520f6f4c2e066db
parenta8a7f2f2f745cefb61d27ebede5055fdaf1527ea (diff)
[kde-base/plasma-workspace] Fix python support, wrt bug #440362 and 440364.
Package-Manager: portage-2.1.11.31
-rw-r--r--kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild9
-rw-r--r--kde-base/plasma-workspace/plasma-workspace-9999.ebuild9
2 files changed, 10 insertions, 8 deletions
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
--- 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
--- 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)