commit:     b1de8610d85c72a135cd83a20d5df5ef697b17af
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 18:57:53 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 18:57:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b1de8610

kde-plasma/plasma-workspace: remove dbus USE flag

Application icons fail to display in the system tray it the dbus USE flag is
disabled.

Gentoo-bug: 585138

Package-Manager: portage-2.3.0_rc1

 kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1.ebuild     | 5 ++---
 kde-plasma/plasma-workspace/plasma-workspace-5.7.49.9999.ebuild | 5 ++---
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild        | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1.ebuild
index ef49fe5..d21ded6 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1.ebuild
@@ -11,7 +11,7 @@ inherit kde5 multilib qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dbus +geolocation gps prison qalculate"
+IUSE="+geolocation gps prison qalculate"
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.6.0
 COMMON_DEPEND="
@@ -68,6 +68,7 @@ COMMON_DEPEND="
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtx11extras)
        $(add_qt_dep qtxml)
+       dev-libs/libdbusmenu-qt[qt5]
        media-libs/phonon[qt5]
        sys-libs/zlib
        x11-libs/libICE
@@ -79,7 +80,6 @@ COMMON_DEPEND="
        x11-libs/libXrender
        x11-libs/xcb-util
        x11-libs/xcb-util-image
-       dbus? ( dev-libs/libdbusmenu-qt[qt5] )
        geolocation? ( $(add_frameworks_dep networkmanager-qt) )
        gps? ( sci-geosciences/gpsd )
        prison? ( media-libs/prison:5 )
@@ -136,7 +136,6 @@ src_prepare() {
 
 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 KF5Prison)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.7.49.9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.7.49.9999.ebuild
index f87837c..dd70219 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.49.9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5 multilib qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
-IUSE="dbus +geolocation gps prison qalculate"
+IUSE="+geolocation gps prison qalculate"
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.6.0
 COMMON_DEPEND="
@@ -68,6 +68,7 @@ COMMON_DEPEND="
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtx11extras)
        $(add_qt_dep qtxml)
+       dev-libs/libdbusmenu-qt[qt5]
        media-libs/phonon[qt5]
        sys-libs/zlib
        x11-libs/libICE
@@ -79,7 +80,6 @@ COMMON_DEPEND="
        x11-libs/libXrender
        x11-libs/xcb-util
        x11-libs/xcb-util-image
-       dbus? ( dev-libs/libdbusmenu-qt[qt5] )
        geolocation? ( $(add_frameworks_dep networkmanager-qt) )
        gps? ( sci-geosciences/gpsd )
        prison? ( media-libs/prison:5 )
@@ -130,7 +130,6 @@ src_prepare() {
 
 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 KF5Prison)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index f87837c..dd70219 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5 multilib qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
-IUSE="dbus +geolocation gps prison qalculate"
+IUSE="+geolocation gps prison qalculate"
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.6.0
 COMMON_DEPEND="
@@ -68,6 +68,7 @@ COMMON_DEPEND="
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtx11extras)
        $(add_qt_dep qtxml)
+       dev-libs/libdbusmenu-qt[qt5]
        media-libs/phonon[qt5]
        sys-libs/zlib
        x11-libs/libICE
@@ -79,7 +80,6 @@ COMMON_DEPEND="
        x11-libs/libXrender
        x11-libs/xcb-util
        x11-libs/xcb-util-image
-       dbus? ( dev-libs/libdbusmenu-qt[qt5] )
        geolocation? ( $(add_frameworks_dep networkmanager-qt) )
        gps? ( sci-geosciences/gpsd )
        prison? ( media-libs/prison:5 )
@@ -130,7 +130,6 @@ src_prepare() {
 
 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 KF5Prison)

Reply via email to