commit: 630d14b863e06a5957ddb6cf831741cda0a90860
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 08:31:33 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 08:33:42 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=630d14b8
kde-plasma/kwayland -> kde-frameworks/kwayland
See upstream commit 1b1ae307f2fa13e0a5e58228a9ca31758b649a82 in
repository repo-metadata.
.../.kde-applications-live/kdesdk-live | 3 ++-
.../.kde-frameworks-live/kde-frameworks-live | 1 +
.../.kde-plasma-live/kde-plasma-live | 1 -
.../kde-applications-live.keywords | 3 ++-
.../kde-frameworks-live.keywords | 1 +
.../kde-plasma-5.6.keywords | 1 -
.../kde-plasma-live.keywords | 1 -
Documentation/package.mask/kde-applications-live | 3 ++-
Documentation/package.mask/kde-frameworks-live | 1 +
Documentation/package.mask/kde-plasma-5.6 | 1 -
Documentation/package.mask/kde-plasma-live | 1 -
Documentation/package.unmask/kde-applications-live | 3 ++-
Documentation/package.unmask/kde-frameworks-live | 1 +
Documentation/package.unmask/kde-plasma-5.6 | 1 -
Documentation/package.unmask/kde-plasma-live | 1 -
.../kwayland/kwayland-9999.ebuild | 6 ++++--
.../kwayland/metadata.xml | 0
kde-misc/kdeconnect/kdeconnect-9999.ebuild | 2 +-
.../kinfocenter/kinfocenter-5.6.49.9999.ebuild | 2 +-
kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 2 +-
.../kscreenlocker/kscreenlocker-5.6.49.9999.ebuild | 2 +-
kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 2 +-
.../kwayland-integration-5.6.49.9999.ebuild | 2 +-
.../kwayland-integration-9999.ebuild | 2 +-
kde-plasma/kwayland/kwayland-5.6.49.9999.ebuild | 25 ----------------------
kde-plasma/kwin/kwin-5.6.49.9999.ebuild | 2 +-
kde-plasma/kwin/kwin-9999.ebuild | 2 +-
.../libkscreen/libkscreen-5.6.49.9999.ebuild | 2 +-
kde-plasma/libkscreen/libkscreen-9999.ebuild | 2 +-
.../plasma-integration-5.6.49.9999.ebuild | 2 +-
.../plasma-integration-9999.ebuild | 2 +-
.../plasma-meta/plasma-meta-5.6.49.9999.ebuild | 1 -
kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 1 -
.../plasma-workspace-5.6.49.9999.ebuild | 2 +-
.../plasma-workspace/plasma-workspace-9999.ebuild | 2 +-
.../powerdevil/powerdevil-5.6.49.9999.ebuild | 2 +-
kde-plasma/powerdevil/powerdevil-9999.ebuild | 2 +-
profiles/updates/2Q-2016 | 1 +
sets/kde-frameworks-live | 1 +
sets/kde-plasma-5.6 | 1 -
sets/kde-plasma-live | 1 -
41 files changed, 35 insertions(+), 59 deletions(-)
diff --git
a/Documentation/package.accept_keywords/.kde-applications-live/kdesdk-live
b/Documentation/package.accept_keywords/.kde-applications-live/kdesdk-live
index c8da976..57520ce 100644
--- a/Documentation/package.accept_keywords/.kde-applications-live/kdesdk-live
+++ b/Documentation/package.accept_keywords/.kde-applications-live/kdesdk-live
@@ -1,6 +1,7 @@
-
+~kde-apps/cervisia-9999 **
~kde-apps/dolphin-plugins-9999 **
~kde-apps/kapptemplate-9999 **
+~kde-apps/kcachegrind-9999 **
~kde-apps/kde-dev-scripts-9999 **
~kde-apps/kde-dev-utils-9999 **
~kde-apps/kdesdk-meta-9999 **
diff --git
a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
index 5477d85..22d32fe 100644
---
a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
+++
b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-live
@@ -58,6 +58,7 @@
~kde-frameworks/ktextwidgets-9999 **
~kde-frameworks/kunitconversion-9999 **
~kde-frameworks/kwallet-9999 **
+~kde-frameworks/kwayland-9999 **
~kde-frameworks/kwidgetsaddons-9999 **
~kde-frameworks/kwindowsystem-9999 **
~kde-frameworks/kxmlgui-9999 **
diff --git
a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
index 55da2c7..c4a7c86 100644
--- a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
+++ b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
@@ -17,7 +17,6 @@
~kde-plasma/ksshaskpass-9999 **
~kde-plasma/ksysguard-9999 **
~kde-plasma/kwallet-pam-9999 **
-~kde-plasma/kwayland-9999 **
~kde-plasma/kwayland-integration-9999 **
~kde-plasma/kwin-9999 **
~kde-plasma/kwrited-9999 **
diff --git
a/Documentation/package.accept_keywords/kde-applications-live.keywords
b/Documentation/package.accept_keywords/kde-applications-live.keywords
index 1b6228e..36e88ec 100644
--- a/Documentation/package.accept_keywords/kde-applications-live.keywords
+++ b/Documentation/package.accept_keywords/kde-applications-live.keywords
@@ -200,9 +200,10 @@
~kde-apps/messagelib-9999 **
~kde-apps/pimcommon-9999 **
~kde-apps/syndication-9999 **
-
+~kde-apps/cervisia-9999 **
~kde-apps/dolphin-plugins-9999 **
~kde-apps/kapptemplate-9999 **
+~kde-apps/kcachegrind-9999 **
~kde-apps/kde-dev-scripts-9999 **
~kde-apps/kde-dev-utils-9999 **
~kde-apps/kdesdk-meta-9999 **
diff --git a/Documentation/package.accept_keywords/kde-frameworks-live.keywords
b/Documentation/package.accept_keywords/kde-frameworks-live.keywords
index 0bff5e4..18e083d 100644
--- a/Documentation/package.accept_keywords/kde-frameworks-live.keywords
+++ b/Documentation/package.accept_keywords/kde-frameworks-live.keywords
@@ -61,6 +61,7 @@
~kde-frameworks/ktextwidgets-9999 **
~kde-frameworks/kunitconversion-9999 **
~kde-frameworks/kwallet-9999 **
+~kde-frameworks/kwayland-9999 **
~kde-frameworks/kwidgetsaddons-9999 **
~kde-frameworks/kwindowsystem-9999 **
~kde-frameworks/kxmlgui-9999 **
diff --git a/Documentation/package.accept_keywords/kde-plasma-5.6.keywords
b/Documentation/package.accept_keywords/kde-plasma-5.6.keywords
index 44c5a46..6c1db65 100644
--- a/Documentation/package.accept_keywords/kde-plasma-5.6.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-5.6.keywords
@@ -20,7 +20,6 @@
<kde-plasma/ksshaskpass-5.6.50:5
<kde-plasma/ksysguard-5.6.50:5
<kde-plasma/kwallet-pam-5.6.50:5
-<kde-plasma/kwayland-5.6.50:5
<kde-plasma/kwayland-integration-5.6.50:5
<kde-plasma/kwin-5.6.50:5
<kde-plasma/kwrited-5.6.50:5
diff --git a/Documentation/package.accept_keywords/kde-plasma-live.keywords
b/Documentation/package.accept_keywords/kde-plasma-live.keywords
index 2964bc9..b6c1e1d 100644
--- a/Documentation/package.accept_keywords/kde-plasma-live.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-live.keywords
@@ -20,7 +20,6 @@
~kde-plasma/ksshaskpass-9999 **
~kde-plasma/ksysguard-9999 **
~kde-plasma/kwallet-pam-9999 **
-~kde-plasma/kwayland-9999 **
~kde-plasma/kwayland-integration-9999 **
~kde-plasma/kwin-9999 **
~kde-plasma/kwrited-9999 **
diff --git a/Documentation/package.mask/kde-applications-live
b/Documentation/package.mask/kde-applications-live
index 61cf07b..e82d826 100644
--- a/Documentation/package.mask/kde-applications-live
+++ b/Documentation/package.mask/kde-applications-live
@@ -189,9 +189,10 @@
~kde-apps/messagelib-9999
~kde-apps/pimcommon-9999
~kde-apps/syndication-9999
-
+~kde-apps/cervisia-9999
~kde-apps/dolphin-plugins-9999
~kde-apps/kapptemplate-9999
+~kde-apps/kcachegrind-9999
~kde-apps/kde-dev-scripts-9999
~kde-apps/kde-dev-utils-9999
~kde-apps/kdesdk-meta-9999
diff --git a/Documentation/package.mask/kde-frameworks-live
b/Documentation/package.mask/kde-frameworks-live
index fce9a74..7db2662 100644
--- a/Documentation/package.mask/kde-frameworks-live
+++ b/Documentation/package.mask/kde-frameworks-live
@@ -61,6 +61,7 @@
~kde-frameworks/ktextwidgets-9999
~kde-frameworks/kunitconversion-9999
~kde-frameworks/kwallet-9999
+~kde-frameworks/kwayland-9999
~kde-frameworks/kwidgetsaddons-9999
~kde-frameworks/kwindowsystem-9999
~kde-frameworks/kxmlgui-9999
diff --git a/Documentation/package.mask/kde-plasma-5.6
b/Documentation/package.mask/kde-plasma-5.6
index fbfada0..1f8a329 100644
--- a/Documentation/package.mask/kde-plasma-5.6
+++ b/Documentation/package.mask/kde-plasma-5.6
@@ -20,7 +20,6 @@
>=kde-plasma/ksshaskpass-5.6:5
>=kde-plasma/ksysguard-5.6:5
>=kde-plasma/kwallet-pam-5.6:5
->=kde-plasma/kwayland-5.6:5
>=kde-plasma/kwayland-integration-5.6:5
>=kde-plasma/kwin-5.6:5
>=kde-plasma/kwrited-5.6:5
diff --git a/Documentation/package.mask/kde-plasma-live
b/Documentation/package.mask/kde-plasma-live
index fb6e2ae..f44f003 100644
--- a/Documentation/package.mask/kde-plasma-live
+++ b/Documentation/package.mask/kde-plasma-live
@@ -20,7 +20,6 @@
~kde-plasma/ksshaskpass-9999
~kde-plasma/ksysguard-9999
~kde-plasma/kwallet-pam-9999
-~kde-plasma/kwayland-9999
~kde-plasma/kwayland-integration-9999
~kde-plasma/kwin-9999
~kde-plasma/kwrited-9999
diff --git a/Documentation/package.unmask/kde-applications-live
b/Documentation/package.unmask/kde-applications-live
index 61cf07b..e82d826 100644
--- a/Documentation/package.unmask/kde-applications-live
+++ b/Documentation/package.unmask/kde-applications-live
@@ -189,9 +189,10 @@
~kde-apps/messagelib-9999
~kde-apps/pimcommon-9999
~kde-apps/syndication-9999
-
+~kde-apps/cervisia-9999
~kde-apps/dolphin-plugins-9999
~kde-apps/kapptemplate-9999
+~kde-apps/kcachegrind-9999
~kde-apps/kde-dev-scripts-9999
~kde-apps/kde-dev-utils-9999
~kde-apps/kdesdk-meta-9999
diff --git a/Documentation/package.unmask/kde-frameworks-live
b/Documentation/package.unmask/kde-frameworks-live
index fce9a74..7db2662 100644
--- a/Documentation/package.unmask/kde-frameworks-live
+++ b/Documentation/package.unmask/kde-frameworks-live
@@ -61,6 +61,7 @@
~kde-frameworks/ktextwidgets-9999
~kde-frameworks/kunitconversion-9999
~kde-frameworks/kwallet-9999
+~kde-frameworks/kwayland-9999
~kde-frameworks/kwidgetsaddons-9999
~kde-frameworks/kwindowsystem-9999
~kde-frameworks/kxmlgui-9999
diff --git a/Documentation/package.unmask/kde-plasma-5.6
b/Documentation/package.unmask/kde-plasma-5.6
index 29f0679..7048fd3 100644
--- a/Documentation/package.unmask/kde-plasma-5.6
+++ b/Documentation/package.unmask/kde-plasma-5.6
@@ -20,7 +20,6 @@
<kde-plasma/ksshaskpass-5.6.50:5
<kde-plasma/ksysguard-5.6.50:5
<kde-plasma/kwallet-pam-5.6.50:5
-<kde-plasma/kwayland-5.6.50:5
<kde-plasma/kwayland-integration-5.6.50:5
<kde-plasma/kwin-5.6.50:5
<kde-plasma/kwrited-5.6.50:5
diff --git a/Documentation/package.unmask/kde-plasma-live
b/Documentation/package.unmask/kde-plasma-live
index fb6e2ae..f44f003 100644
--- a/Documentation/package.unmask/kde-plasma-live
+++ b/Documentation/package.unmask/kde-plasma-live
@@ -20,7 +20,6 @@
~kde-plasma/ksshaskpass-9999
~kde-plasma/ksysguard-9999
~kde-plasma/kwallet-pam-9999
-~kde-plasma/kwayland-9999
~kde-plasma/kwayland-integration-9999
~kde-plasma/kwin-9999
~kde-plasma/kwrited-9999
diff --git a/kde-plasma/kwayland/kwayland-9999.ebuild
b/kde-frameworks/kwayland/kwayland-9999.ebuild
similarity index 91%
rename from kde-plasma/kwayland/kwayland-9999.ebuild
rename to kde-frameworks/kwayland/kwayland-9999.ebuild
index e4de6b3..e4278c1 100644
--- a/kde-plasma/kwayland/kwayland-9999.ebuild
+++ b/kde-frameworks/kwayland/kwayland-9999.ebuild
@@ -15,11 +15,13 @@ KEYWORDS=""
IUSE=""
DEPEND="
- >=dev-libs/wayland-1.7.0
$(add_qt_dep qtgui)
+ >=dev-libs/wayland-1.7.0
media-libs/mesa[egl]
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !kde-plasma/kwayland
+"
# All failing, i guess we need a virtual wayland server
RESTRICT="test"
diff --git a/kde-plasma/kwayland/metadata.xml
b/kde-frameworks/kwayland/metadata.xml
similarity index 100%
rename from kde-plasma/kwayland/metadata.xml
rename to kde-frameworks/kwayland/metadata.xml
diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild
b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
index 1f8a071..54be829 100644
--- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="
x11-libs/libXtst
app? ( $(add_frameworks_dep kdeclarative) )
telepathy? ( >=net-libs/telepathy-qt-0.9.7[qt5] )
- wayland? ( $(add_plasma_dep kwayland) )
+ wayland? ( $(add_frameworks_dep kwayland) )
"
RDEPEND="${DEPEND}
$(add_plasma_dep plasma-workspace)
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild
b/kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild
index ce14538..576858a 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild
@@ -52,7 +52,7 @@ COMMON_DEPEND="
)
pci? ( sys-apps/pciutils )
samba? ( net-fs/samba[server(+)] )
- wayland? ( $(add_plasma_dep kwayland) )
+ wayland? ( $(add_frameworks_dep kwayland) )
"
DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep plasma)
diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
index ce14538..576858a 100644
--- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
@@ -52,7 +52,7 @@ COMMON_DEPEND="
)
pci? ( sys-apps/pciutils )
samba? ( net-fs/samba[server(+)] )
- wayland? ( $(add_plasma_dep kwayland) )
+ wayland? ( $(add_frameworks_dep kwayland) )
"
DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep plasma)
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.6.49.9999.ebuild
b/kde-plasma/kscreenlocker/kscreenlocker-5.6.49.9999.ebuild
index 8f64bf4..847c03b 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.6.49.9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.6.49.9999.ebuild
@@ -24,10 +24,10 @@ COMMON_DEPEND="
$(add_frameworks_dep kidletime)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
- $(add_plasma_dep kwayland)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui)
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
index 35d12ec..d9c711e 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
@@ -24,10 +24,10 @@ COMMON_DEPEND="
$(add_frameworks_dep kidletime)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
- $(add_plasma_dep kwayland)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui)
diff --git
a/kde-plasma/kwayland-integration/kwayland-integration-5.6.49.9999.ebuild
b/kde-plasma/kwayland-integration/kwayland-integration-5.6.49.9999.ebuild
index de8ed75..6fbdbd4 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.6.49.9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.6.49.9999.ebuild
@@ -15,8 +15,8 @@ IUSE=""
DEPEND="
$(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwindowsystem)
- $(add_plasma_dep kwayland)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
"
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
index de8ed75..6fbdbd4 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
@@ -15,8 +15,8 @@ IUSE=""
DEPEND="
$(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwindowsystem)
- $(add_plasma_dep kwayland)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
"
diff --git a/kde-plasma/kwayland/kwayland-5.6.49.9999.ebuild
b/kde-plasma/kwayland/kwayland-5.6.49.9999.ebuild
deleted file mode 100644
index e4de6b3..0000000
--- a/kde-plasma/kwayland/kwayland-5.6.49.9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland";
-
-LICENSE="LGPL-2.1"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- >=dev-libs/wayland-1.7.0
- $(add_qt_dep qtgui)
- media-libs/mesa[egl]
-"
-RDEPEND="${DEPEND}"
-
-# All failing, i guess we need a virtual wayland server
-RESTRICT="test"
diff --git a/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
b/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
index 677a2cd..1c9623c 100644
--- a/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
@@ -34,13 +34,13 @@ COMMON_DEPEND="
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kpackage)
$(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem X)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep plasma)
$(add_plasma_dep kdecoration)
$(add_plasma_dep kscreenlocker)
- $(add_plasma_dep kwayland)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui 'gles2=,opengl(+)')
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 677a2cd..1c9623c 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -34,13 +34,13 @@ COMMON_DEPEND="
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kpackage)
$(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem X)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep plasma)
$(add_plasma_dep kdecoration)
$(add_plasma_dep kscreenlocker)
- $(add_plasma_dep kwayland)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui 'gles2=,opengl(+)')
diff --git a/kde-plasma/libkscreen/libkscreen-5.6.49.9999.ebuild
b/kde-plasma/libkscreen/libkscreen-5.6.49.9999.ebuild
index 4c82b1c..8e7b99c 100644
--- a/kde-plasma/libkscreen/libkscreen-5.6.49.9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.6.49.9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
IUSE="X"
DEPEND="
- $(add_plasma_dep kwayland)
+ $(add_frameworks_dep kwayland)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtx11extras)
diff --git a/kde-plasma/libkscreen/libkscreen-9999.ebuild
b/kde-plasma/libkscreen/libkscreen-9999.ebuild
index 4c82b1c..8e7b99c 100644
--- a/kde-plasma/libkscreen/libkscreen-9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
IUSE="X"
DEPEND="
- $(add_plasma_dep kwayland)
+ $(add_frameworks_dep kwayland)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtx11extras)
diff --git
a/kde-plasma/plasma-integration/plasma-integration-5.6.49.9999.ebuild
b/kde-plasma/plasma-integration/plasma-integration-5.6.49.9999.ebuild
index e3cb732..13374fd 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.6.49.9999.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.6.49.9999.ebuild
@@ -22,9 +22,9 @@ DEPEND="
$(add_frameworks_dep kio)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
- $(add_plasma_dep kwayland)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui '' '' '5=')
$(add_qt_dep qtwidgets)
diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
index e3cb732..13374fd 100644
--- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
@@ -22,9 +22,9 @@ DEPEND="
$(add_frameworks_dep kio)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
- $(add_plasma_dep kwayland)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui '' '' '5=')
$(add_qt_dep qtwidgets)
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
b/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
index 2a6f33f..9bd0fff 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep ksshaskpass)
$(add_plasma_dep ksysguard)
- $(add_plasma_dep kwayland)
$(add_plasma_dep kwayland-integration)
$(add_plasma_dep kwin)
$(add_plasma_dep kwrited)
diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
index 9c4ef9b..b2cdfec 100644
--- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep ksshaskpass)
$(add_plasma_dep ksysguard)
- $(add_plasma_dep kwayland)
$(add_plasma_dep kwayland-integration)
$(add_plasma_dep kwin)
$(add_plasma_dep kwrited)
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 648d32f..2cf7a83 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
@@ -47,6 +47,7 @@ COMMON_DEPEND="
$(add_frameworks_dep ktexteditor)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
@@ -54,7 +55,6 @@ COMMON_DEPEND="
$(add_frameworks_dep plasma)
$(add_frameworks_dep solid)
$(add_plasma_dep kscreenlocker)
- $(add_plasma_dep kwayland)
$(add_plasma_dep kwin)
$(add_plasma_dep libkscreen)
$(add_plasma_dep libksysguard)
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 1a57acf..4a612b9 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -47,6 +47,7 @@ COMMON_DEPEND="
$(add_frameworks_dep ktexteditor)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
@@ -54,7 +55,6 @@ COMMON_DEPEND="
$(add_frameworks_dep plasma)
$(add_frameworks_dep solid)
$(add_plasma_dep kscreenlocker)
- $(add_plasma_dep kwayland)
$(add_plasma_dep kwin)
$(add_plasma_dep libkscreen)
$(add_plasma_dep libksysguard)
diff --git a/kde-plasma/powerdevil/powerdevil-5.6.49.9999.ebuild
b/kde-plasma/powerdevil/powerdevil-5.6.49.9999.ebuild
index 259eef2..df85953 100644
--- a/kde-plasma/powerdevil/powerdevil-5.6.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.6.49.9999.ebuild
@@ -28,10 +28,10 @@ DEPEND="
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
- $(add_plasma_dep kwayland)
$(add_plasma_dep libkscreen)
$(add_plasma_dep plasma-workspace)
$(add_qt_dep qtdbus)
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild
b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index 259eef2..df85953 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -28,10 +28,10 @@ DEPEND="
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwayland)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
- $(add_plasma_dep kwayland)
$(add_plasma_dep libkscreen)
$(add_plasma_dep plasma-workspace)
$(add_qt_dep qtdbus)
diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
index 9c080b6..e2f52b9 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -1,2 +1,3 @@
move kde-plasma/khelpcenter kde-apps/khelpcenter
move kde-base/khelpcenter kde-apps/khelpcenter
+move kde-plasma/kwayland kde-frameworks/kwayland
diff --git a/sets/kde-frameworks-live b/sets/kde-frameworks-live
index 11c3052..9152313 100644
--- a/sets/kde-frameworks-live
+++ b/sets/kde-frameworks-live
@@ -58,6 +58,7 @@
~kde-frameworks/ktextwidgets-9999
~kde-frameworks/kunitconversion-9999
~kde-frameworks/kwallet-9999
+~kde-frameworks/kwayland-9999
~kde-frameworks/kwidgetsaddons-9999
~kde-frameworks/kwindowsystem-9999
~kde-frameworks/kxmlgui-9999
diff --git a/sets/kde-plasma-5.6 b/sets/kde-plasma-5.6
index dd05104..376e912 100644
--- a/sets/kde-plasma-5.6
+++ b/sets/kde-plasma-5.6
@@ -17,7 +17,6 @@
<kde-plasma/ksshaskpass-5.6.50:5
<kde-plasma/ksysguard-5.6.50:5
<kde-plasma/kwallet-pam-5.6.50:5
-<kde-plasma/kwayland-5.6.50:5
<kde-plasma/kwayland-integration-5.6.50:5
<kde-plasma/kwin-5.6.50:5
<kde-plasma/kwrited-5.6.50:5
diff --git a/sets/kde-plasma-live b/sets/kde-plasma-live
index 21d9576..9a8a562 100644
--- a/sets/kde-plasma-live
+++ b/sets/kde-plasma-live
@@ -17,7 +17,6 @@
~kde-plasma/ksshaskpass-9999
~kde-plasma/ksysguard-9999
~kde-plasma/kwallet-pam-9999
-~kde-plasma/kwayland-9999
~kde-plasma/kwayland-integration-9999
~kde-plasma/kwin-9999
~kde-plasma/kwrited-9999
