summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2015-11-04 23:12:40 +1100
committerMichael Palimaka <kensington@gentoo.org>2015-11-04 23:18:56 +1100
commit35c7c3a79f37a032d2b02b1ed25d034cbaf32dce (patch)
tree1bbdcc129026a4567f65f8bbe8c43673397bfabb
parentf76a73fd6aa93cc79b9a7b2f62a18eece4c4b35e (diff)
downloadkde-35c7c3a79f37a032d2b02b1ed25d034cbaf32dce.tar.gz
kde-35c7c3a79f37a032d2b02b1ed25d034cbaf32dce.tar.bz2
kde-35c7c3a79f37a032d2b02b1ed25d034cbaf32dce.zip
kde-plasma/plasma-workspace: remove systemmonitor USE flag
systemmonitor was made optional because KF5ProcessUI from kde-plasma/libksysguard, and previously that was only built if Qt5WebKitWidgets was present. Due to an upstream change in libksysguard, KF5ProcessUI is now built unconditionally and just the features requiring Qt5WebKitWidgets are optional. Upstream-commit: 0d2cbb1390c2efcbc68b7d640d98f12cf5399cd1 (libksysguard) Package-Manager: portage-2.2.20.1
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild17
1 files changed, 2 insertions, 15 deletions
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 540f18f7764..79d81ae806b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5 multilib pam
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
-IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor"
+IUSE="dbus +drkonqi +geolocation gps prison qalculate"
COMMON_DEPEND="
$(add_plasma_dep kwayland)
@@ -90,13 +90,11 @@ COMMON_DEPEND="
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
- systemmonitor? (
- $(add_plasma_dep libksysguard processui)
- )
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
$(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
$(add_plasma_dep milou)
dev-qt/qdbus:5
dev-qt/qtpaths:5
@@ -107,7 +105,6 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/xrdb
x11-apps/xset
x11-apps/xsetroot
- systemmonitor? ( $(add_plasma_dep ksysguard) )
!kde-base/freespacenotifier:4
!kde-base/libtaskmanager:4
!kde-base/kcminit:4
@@ -144,16 +141,6 @@ src_prepare() {
comment_add_subdirectory geolocation
popd > /dev/null || die
fi
-
- if ! use systemmonitor; then
- comment_add_subdirectory systemmonitor
- pushd applets > /dev/null || die
- comment_add_subdirectory systemmonitor
- popd > /dev/null || die
- pushd dataengines > /dev/null || die
- comment_add_subdirectory systemmonitor
- popd > /dev/null || die
- fi
}
src_configure() {