1 |
commit: 35c7c3a79f37a032d2b02b1ed25d034cbaf32dce |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 4 12:12:40 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 4 12:18:56 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=35c7c3a7 |
7 |
|
8 |
kde-plasma/plasma-workspace: remove systemmonitor USE flag |
9 |
|
10 |
systemmonitor was made optional because KF5ProcessUI from kde-plasma/libksysguard, |
11 |
and previously that was only built if Qt5WebKitWidgets was present. |
12 |
|
13 |
Due to an upstream change in libksysguard, KF5ProcessUI is now built |
14 |
unconditionally and just the features requiring Qt5WebKitWidgets are optional. |
15 |
|
16 |
Upstream-commit: 0d2cbb1390c2efcbc68b7d640d98f12cf5399cd1 (libksysguard) |
17 |
|
18 |
Package-Manager: portage-2.2.20.1 |
19 |
|
20 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 17 ++--------------- |
21 |
1 file changed, 2 insertions(+), 15 deletions(-) |
22 |
|
23 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
24 |
index 540f18f..79d81ae 100644 |
25 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
26 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
27 |
@@ -12,7 +12,7 @@ inherit kde5 multilib pam |
28 |
|
29 |
DESCRIPTION="KDE Plasma workspace" |
30 |
KEYWORDS="" |
31 |
-IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor" |
32 |
+IUSE="dbus +drkonqi +geolocation gps prison qalculate" |
33 |
|
34 |
COMMON_DEPEND=" |
35 |
$(add_plasma_dep kwayland) |
36 |
@@ -90,13 +90,11 @@ COMMON_DEPEND=" |
37 |
gps? ( sci-geosciences/gpsd ) |
38 |
prison? ( media-libs/prison:5 ) |
39 |
qalculate? ( sci-libs/libqalculate ) |
40 |
- systemmonitor? ( |
41 |
- $(add_plasma_dep libksysguard processui) |
42 |
- ) |
43 |
" |
44 |
RDEPEND="${COMMON_DEPEND} |
45 |
$(add_frameworks_dep kded) |
46 |
$(add_plasma_dep kde-cli-tools) |
47 |
+ $(add_plasma_dep ksysguard) |
48 |
$(add_plasma_dep milou) |
49 |
dev-qt/qdbus:5 |
50 |
dev-qt/qtpaths:5 |
51 |
@@ -107,7 +105,6 @@ RDEPEND="${COMMON_DEPEND} |
52 |
x11-apps/xrdb |
53 |
x11-apps/xset |
54 |
x11-apps/xsetroot |
55 |
- systemmonitor? ( $(add_plasma_dep ksysguard) ) |
56 |
!kde-base/freespacenotifier:4 |
57 |
!kde-base/libtaskmanager:4 |
58 |
!kde-base/kcminit:4 |
59 |
@@ -144,16 +141,6 @@ src_prepare() { |
60 |
comment_add_subdirectory geolocation |
61 |
popd > /dev/null || die |
62 |
fi |
63 |
- |
64 |
- if ! use systemmonitor; then |
65 |
- comment_add_subdirectory systemmonitor |
66 |
- pushd applets > /dev/null || die |
67 |
- comment_add_subdirectory systemmonitor |
68 |
- popd > /dev/null || die |
69 |
- pushd dataengines > /dev/null || die |
70 |
- comment_add_subdirectory systemmonitor |
71 |
- popd > /dev/null || die |
72 |
- fi |
73 |
} |
74 |
|
75 |
src_configure() { |