commit: fe94b465bb1c6f74ab8e0c76e22ca892c21bb443
Author: Franz Fellner <alpine.art.de <AT> gmail <DOT> com>
AuthorDate: Thu Mar 5 12:11:11 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar 5 12:11:19 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe94b465
[kde-plasma/plasma-workspace] Introduce drkonqi and systemmonitor USE flags to
allow avoiding qtwebkit.
Package-Manager: portage-2.2.17
kde-plasma/plasma-workspace/metadata.xml | 4 +++-
.../plasma-workspace/plasma-workspace-5.2.1.ebuild | 20 +++++++++++++++++---
.../plasma-workspace-5.2.9999.ebuild | 21 ++++++++++++++++++---
.../plasma-workspace/plasma-workspace-9999.ebuild | 20 +++++++++++++++++---
4 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/kde-plasma/plasma-workspace/metadata.xml
b/kde-plasma/plasma-workspace/metadata.xml
index 10e6273..1e09a25 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -3,7 +3,9 @@
<pkgmetadata>
<herd>kde</herd>
<use>
+ <flag name="drkonqi">Enables DrKonqi, the KDE crash
handler</flag>
<flag name="prison">Enable support for barcodes/QRcodes</flag>
- <flag name="qalculate">Enable Qalculate runner using
<pkg>sci-libs/libqalculate</pkg></flag>
+ <flag name="systemmonitor">Enable support for
barcodes/QRcodes</flag>
+ <flag name="qalculate">Enables the system monitor dialog for
the Plasma workspace</flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.1.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-5.2.1.ebuild
index 7d89578..19bdb3f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.1.ebuild
@@ -10,7 +10,7 @@ inherit kde5 multilib
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=" ~amd64"
-IUSE="dbus gps prison qalculate X"
+IUSE="dbus +drkonqi gps prison qalculate +systemmonitor X"
COMMON_DEPEND="
$(add_plasma_dep baloo)
@@ -31,7 +31,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kdesu)
- $(add_frameworks_dep kdewebkit)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
@@ -62,16 +61,23 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5
dev-qt/qtscript:5
dev-qt/qtsql:5
- dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-libs/phonon[qt5]
sys-libs/pam
sys-libs/zlib
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+ drkonqi? (
+ $(add_frameworks_dep kdewebkit)
+ dev-qt/qtwebkit:5
+ )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
+ systemmonitor? (
+ $(add_plasma_dep libksysguard processui)
+ dev-qt/qtwebkit:5
+ )
X? (
dev-qt/qtx11extras:5
x11-libs/libICE
@@ -117,6 +123,14 @@ src_prepare() {
# bug 539922, moved to frameworks
comment_add_subdirectory kglobalaccel
+
+ if ! use drkonqi; then
+ comment_add_subdirectory drkonqi
+ fi
+
+ if ! use systemmonitor; then
+ comment_add_subdirectory systemmonitor
+ fi
}
src_configure() {
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
index 2b07ce4..33d2242 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5 multilib
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
-IUSE="dbus gps prison qalculate X"
+IUSE="dbus +drkonqi gps prison qalculate +systemmonitor X"
COMMON_DEPEND="
$(add_plasma_dep baloo)
@@ -31,7 +31,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kdesu)
- $(add_frameworks_dep kdewebkit)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
@@ -62,16 +61,24 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5
dev-qt/qtscript:5
dev-qt/qtsql:5
- dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-libs/phonon[qt5]
sys-libs/pam
sys-libs/zlib
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+ drkonqi? (
+ $(add_frameworks_dep kdewebkit)
+ dev-qt/qtwebkit:5
+ )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
+ systemmonitor? (
+ $(add_plasma_dep libksysguard processui)
+ dev-qt/qtwebkit:5
+ )
+
X? (
dev-qt/qtx11extras:5
x11-libs/libICE
@@ -118,6 +125,14 @@ src_prepare() {
# bug 539922, moved to frameworks
comment_add_subdirectory kglobalaccel
+
+ if ! use drkonqi; then
+ comment_add_subdirectory drkonqi
+ fi
+
+ if ! use systemmonitor; then
+ comment_add_subdirectory systemmonitor
+ fi
}
src_configure() {
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 2eb734f..af228e2 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5 multilib
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
-IUSE="dbus gps prison qalculate X"
+IUSE="dbus +drkonqi gps prison qalculate +systemmonitor X"
COMMON_DEPEND="
$(add_plasma_dep baloo)
@@ -31,7 +31,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kdesu)
- $(add_frameworks_dep kdewebkit)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
@@ -64,16 +63,23 @@ COMMON_DEPEND="
dev-qt/qtnetwork:5
dev-qt/qtscript:5
dev-qt/qtsql:5
- dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
media-libs/phonon[qt5]
sys-libs/pam
sys-libs/zlib
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+ drkonqi? (
+ $(add_frameworks_dep kdewebkit)
+ dev-qt/qtwebkit:5
+ )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
+ systemmonitor? (
+ $(add_plasma_dep libksysguard processui)
+ dev-qt/qtwebkit:5
+ )
X? (
dev-qt/qtx11extras:5
x11-libs/libICE
@@ -117,6 +123,14 @@ src_prepare() {
kde5_src_prepare
sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i
startkde/startkde.cmake || die
+
+ if ! use drkonqi; then
+ comment_add_subdirectory drkonqi
+ fi
+
+ if ! use systemmonitor; then
+ comment_add_subdirectory systemmonitor
+ fi
}
src_configure() {
