1 |
commit: 424233be90bce92f59d7d41b9d4aabb6fff7f338 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 31 11:13:27 2012 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 31 11:13:27 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=424233be |
7 |
|
8 |
[kde-base/plasma-workspace] Fix python support, wrt bug #440362 and 440364. |
9 |
|
10 |
Package-Manager: portage-2.1.11.31 |
11 |
|
12 |
--- |
13 |
.../plasma-workspace-4.9.49.9999.ebuild | 9 +++++---- |
14 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 9 +++++---- |
15 |
2 files changed, 10 insertions(+), 8 deletions(-) |
16 |
|
17 |
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 |
18 |
index 55dcbc1..be2aa67 100644 |
19 |
--- a/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild |
20 |
+++ b/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild |
21 |
@@ -4,6 +4,7 @@ |
22 |
|
23 |
EAPI=4 |
24 |
|
25 |
+DECLARATIVE_REQUIRED="always" |
26 |
KDE_HANDBOOK="optional" |
27 |
KMNAME="kde-workspace" |
28 |
KMMODULE="plasma" |
29 |
@@ -70,7 +71,9 @@ KMEXTRACTONLY=" |
30 |
KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" |
31 |
|
32 |
pkg_setup() { |
33 |
- python_set_active_version 2 |
34 |
+ if use python ; then |
35 |
+ python_set_active_version 2 |
36 |
+ fi |
37 |
python_pkg_setup |
38 |
kde4-meta_pkg_setup |
39 |
} |
40 |
@@ -87,9 +90,7 @@ src_configure() { |
41 |
mycmakeargs=( |
42 |
$(cmake-utils_use_with google-gadgets Googlegadgets) |
43 |
$(cmake-utils_use_with gps libgps) |
44 |
- $(cmake-utils_use_with python SIP) |
45 |
- $(cmake-utils_use_with python PyQt4) |
46 |
- $(cmake-utils_use_with python PyKDE4) |
47 |
+ $(cmake-utils_use_with python PythonLibrary) |
48 |
$(cmake-utils_use_with qalculate) |
49 |
$(cmake-utils_use_with rss KdepimLibs) |
50 |
$(cmake-utils_use_with semantic-desktop Akonadi) |
51 |
|
52 |
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
53 |
index 55dcbc1..be2aa67 100644 |
54 |
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
55 |
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
56 |
@@ -4,6 +4,7 @@ |
57 |
|
58 |
EAPI=4 |
59 |
|
60 |
+DECLARATIVE_REQUIRED="always" |
61 |
KDE_HANDBOOK="optional" |
62 |
KMNAME="kde-workspace" |
63 |
KMMODULE="plasma" |
64 |
@@ -70,7 +71,9 @@ KMEXTRACTONLY=" |
65 |
KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" |
66 |
|
67 |
pkg_setup() { |
68 |
- python_set_active_version 2 |
69 |
+ if use python ; then |
70 |
+ python_set_active_version 2 |
71 |
+ fi |
72 |
python_pkg_setup |
73 |
kde4-meta_pkg_setup |
74 |
} |
75 |
@@ -87,9 +90,7 @@ src_configure() { |
76 |
mycmakeargs=( |
77 |
$(cmake-utils_use_with google-gadgets Googlegadgets) |
78 |
$(cmake-utils_use_with gps libgps) |
79 |
- $(cmake-utils_use_with python SIP) |
80 |
- $(cmake-utils_use_with python PyQt4) |
81 |
- $(cmake-utils_use_with python PyKDE4) |
82 |
+ $(cmake-utils_use_with python PythonLibrary) |
83 |
$(cmake-utils_use_with qalculate) |
84 |
$(cmake-utils_use_with rss KdepimLibs) |
85 |
$(cmake-utils_use_with semantic-desktop Akonadi) |