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

[Michael Palimaka]

commit:     d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 12:07:39 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 11 12:07:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1bc5ac3

kde-plasma/plasma-workspace: introduce temporary subslot operator on 
dev-qt/qtgui

There are a few code paths that are built conditionally depending on which
version of Qt is installed.

Package-Manager: portage-2.2.28

 kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild | 3 ++-
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild
index 3e9b16d..9815161 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild
@@ -14,6 +14,7 @@ DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
 IUSE="dbus +geolocation gps prison qalculate"
 
+# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0
 COMMON_DEPEND="
        $(add_frameworks_dep baloo)
        $(add_frameworks_dep kactivities)
@@ -62,7 +63,7 @@ COMMON_DEPEND="
        $(add_qt_dep qtconcurrent)
        $(add_qt_dep qtdbus)
        $(add_qt_dep qtdeclarative 'widgets')
-       $(add_qt_dep qtgui 'jpeg')
+       $(add_qt_dep qtgui 'jpeg' '' '' '5=')
        $(add_qt_dep qtnetwork)
        $(add_qt_dep qtscript)
        $(add_qt_dep qtsql)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 5365e9c..9393e80 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -14,6 +14,7 @@ DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
 IUSE="dbus +geolocation gps prison qalculate"
 
+# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0
 COMMON_DEPEND="
        $(add_frameworks_dep baloo)
        $(add_frameworks_dep kactivities)
@@ -62,7 +63,7 @@ COMMON_DEPEND="
        $(add_qt_dep qtconcurrent)
        $(add_qt_dep qtdbus)
        $(add_qt_dep qtdeclarative 'widgets')
-       $(add_qt_dep qtgui 'jpeg')
+       $(add_qt_dep qtgui 'jpeg' '' '' '5=')
        $(add_qt_dep qtnetwork)
        $(add_qt_dep qtscript)
        $(add_qt_dep qtsql)