commit: c451b7e0440ea120cc376a9ac0812dfe806283c0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 16:31:29 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 16:52:12 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c451b7e0
kde-plasma/plasma-workspace: remove drkonqi USE flag
It was only ever implemented to avoid Qt5WebKit, and that's no longer required.
Upstream-commit: 9c1d4f889d32a1b54938709c8c5dd9ca975532a2
Upstream-commit: 6aedc9534f76f9fb0d5d9560f81a704bda1e8df7
Package-Manager: portage-2.2.25
.../plasma-workspace/plasma-workspace-5.5.49.9999.ebuild | 10 +---------
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 10 +---------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
index 719bfde..b941393 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5 multilib qmake-utils
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
-IUSE="dbus +drkonqi +geolocation gps prison qalculate"
+IUSE="dbus +geolocation gps prison qalculate"
COMMON_DEPEND="
$(add_plasma_dep kscreenlocker)
@@ -83,10 +83,6 @@ COMMON_DEPEND="
x11-libs/libXfixes
x11-libs/libXrender
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
- drkonqi? (
- $(add_frameworks_dep kdewebkit)
- dev-qt/qtwebkit:5
- )
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
@@ -134,10 +130,6 @@ src_prepare() {
sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-i startkde/startkde.cmake startkde/startplasmacompositor.cmake
|| die
- if ! use drkonqi; then
- comment_add_subdirectory drkonqi
- fi
-
if ! use geolocation; then
punt_bogus_dep KF5 NetworkManagerQt
pushd dataengines > /dev/null || die
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 60f91b2..f8a078f 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 qmake-utils
DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
-IUSE="dbus +drkonqi +geolocation gps prison qalculate"
+IUSE="dbus +geolocation gps prison qalculate"
COMMON_DEPEND="
$(add_plasma_dep kscreenlocker)
@@ -83,10 +83,6 @@ COMMON_DEPEND="
x11-libs/libXfixes
x11-libs/libXrender
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
- drkonqi? (
- $(add_frameworks_dep kdewebkit)
- dev-qt/qtwebkit:5
- )
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
@@ -133,10 +129,6 @@ src_prepare() {
sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-i startkde/startkde.cmake startkde/startplasmacompositor.cmake
|| die
-
- if ! use drkonqi; then
- comment_add_subdirectory drkonqi
- fi
}
src_configure() {