From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-847604-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7DD101384B4 for <garchives@archives.gentoo.org>; Thu, 19 Nov 2015 16:52:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1374E07B3; Thu, 19 Nov 2015 16:52:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE8B9E07B3 for <gentoo-commits@lists.gentoo.org>; Thu, 19 Nov 2015 16:52:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B199D340976 for <gentoo-commits@lists.gentoo.org>; Thu, 19 Nov 2015 16:52:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BD08ABB for <gentoo-commits@lists.gentoo.org>; Thu, 19 Nov 2015 16:52:26 +0000 (UTC) From: "Michael Palimaka" <kensington@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org> Message-ID: <1447951932.c451b7e0440ea120cc376a9ac0812dfe806283c0.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: c451b7e0440ea120cc376a9ac0812dfe806283c0 X-VCS-Branch: master Date: Thu, 19 Nov 2015 16:52:26 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 502b6706-e692-449a-ac24-47830da26223 X-Archives-Hash: 1c87cd18347c51bd09d37c168bdacee9 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() {