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

[Michael Palimaka]

commit:     17a08d3fabff5761c159e2d613282bde625cfe70
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 19:39:06 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 19:39:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=17a08d3f

kde-plasma/plasma-workspace: introduce temporary subslot operator for 
kde-frameworks/plasma

Upstream-commit: 95d0631a439eb082fe460fc1228b56c1183dbdb5

Package-Manager: portage-2.3.0_rc1

 kde-plasma/plasma-workspace/plasma-workspace-5.7.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.7.49.9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.7.49.9999.ebuild
index 73f65f7..19720ff 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
@@ -13,6 +13,7 @@ DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
 IUSE="+geolocation gps prison qalculate"
 
+# drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0
 COMMON_DEPEND="
        $(add_frameworks_dep baloo)
        $(add_frameworks_dep kactivities)
@@ -52,7 +53,7 @@ COMMON_DEPEND="
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep kxmlrpcclient)
-       $(add_frameworks_dep plasma)
+       $(add_frameworks_dep plasma '' '' '5=')
        $(add_frameworks_dep solid)
        $(add_plasma_dep kscreenlocker)
        $(add_plasma_dep kwin)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 73f65f7..19720ff 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -13,6 +13,7 @@ DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
 IUSE="+geolocation gps prison qalculate"
 
+# drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0
 COMMON_DEPEND="
        $(add_frameworks_dep baloo)
        $(add_frameworks_dep kactivities)
@@ -52,7 +53,7 @@ COMMON_DEPEND="
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep kxmlrpcclient)
-       $(add_frameworks_dep plasma)
+       $(add_frameworks_dep plasma '' '' '5=')
        $(add_frameworks_dep solid)
        $(add_plasma_dep kscreenlocker)
        $(add_plasma_dep kwin)