[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/

[Michael Palimaka]

commit:     e6350f72851e5465e2a9cda6906e35fe3dbfcc14
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 16:25:33 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=e6350f72

kde-plasma/plasma-workspace: remove custom handling for KF5NetworkManagerQt

Upstream-commit: de5ed6c4cdded1f2ba2ce43022be1d1a9b475bf0

Package-Manager: portage-2.2.25

 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 719bfde..60f91b2 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -137,18 +137,12 @@ src_prepare() {
        if ! use drkonqi; then
                comment_add_subdirectory drkonqi
        fi
-
-       if ! use geolocation; then
-               punt_bogus_dep KF5 NetworkManagerQt
-               pushd dataengines > /dev/null || die
-                       comment_add_subdirectory geolocation
-               popd > /dev/null || die
-       fi
 }
 
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package dbus dbusmenu-qt5)
+               $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
                $(cmake-utils_use_find_package gps libgps)
                $(cmake-utils_use_find_package prison)
                $(cmake-utils_use_find_package qalculate Qalculate)