Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde

26 files changed, 258 insertions, 60 deletions

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e4d2340dec0..fe447f873ed 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -32,7 +32,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.3.0_rc}
+: ${QT_MINIMAL:=5.3.0}
 
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
diff --git a/kde-base/krdc/files/krdc-4.13.1-freerdp.patch b/kde-base/krdc/files/krdc-4.13.1-freerdp.patch
new file mode 100644
index 00000000000..75b51468885
--- /dev/null
+++ b/kde-base/krdc/files/krdc-4.13.1-freerdp.patch
@@ -0,0 +1,184 @@
+Support >=free-rdp-1.1.0.
+
+https://git.reviewboard.kde.org/r/115059/
+
+diff --git a/rdp/rdpview.cpp b/rdp/rdpview.cpp
+index 0d14e04691549e084b58501cd10ca2382ef25c63..9062ba5fa060284a679f0c9bc211ab7dd6972c0a 100644
+--- a/rdp/rdpview.cpp
++++ b/rdp/rdpview.cpp
+@@ -158,71 +158,58 @@ bool RdpView::start()
+         width = this->parentWidget()->size().width();
+         height = this->parentWidget()->size().height();
+     }
+-    arguments << "-g" << QString::number(width) + 'x' + QString::number(height);
++    arguments << "-decorations";  // put this option first so we can detect xfreerdp < 1.1
++    arguments << "/w:" + QString::number(width);
++    arguments << "/h:" + QString::number(height);
+ 
+-    arguments << "-k" << keymapToXfreerdp(m_hostPreferences->keyboardLayout());
++    arguments << "/kbd:" + keymapToXfreerdp(m_hostPreferences->keyboardLayout());
+ 
+     if (!m_url.userName().isEmpty()) {
+         // if username contains a domain, it needs to be set with another parameter
+         if (m_url.userName().contains('\\')) {
+             const QStringList splittedName = m_url.userName().split('\\');
+-            arguments << "-d" << splittedName.at(0);
+-            arguments << "-u" << splittedName.at(1);
++            arguments << "/d:" + splittedName.at(0);
++            arguments << "/u:" + splittedName.at(1);
+         } else {
+-            arguments << "-u" << m_url.userName();
++            arguments << "/u:" + m_url.userName();
+         }
+     } else {
+-        arguments << "-u" << "";
++        arguments << "-u:";
+     }
+ 
+-    if (!m_url.password().isNull())
+-        arguments << "-p" << m_url.password();
+-
+-    arguments << "-D";  // request the window has no decorations
+-    arguments << "-X" << QString::number(m_container->winId());
+-    arguments << "-a" << QString::number((m_hostPreferences->colorDepth() + 1) * 8);
+-
+-    switch (m_hostPreferences->sound()) {
+-    case 1:
+-        arguments << "-o";
+-        break;
+-    case 0:
+-        arguments << "--plugin" << "rdpsnd";
+-        break;
+-    case 2:
+-    default:
+-        break;
+-    }
++    arguments << "/parent-window:" + QString::number(m_container->winId());
++    arguments << "/bpp:" + QString::number((m_hostPreferences->colorDepth() + 1) * 8);
++    arguments << "/audio-mode:" + m_hostPreferences->sound();
+ 
+     if (!m_hostPreferences->shareMedia().isEmpty()) {
+         QStringList shareMedia;
+-        shareMedia << "--plugin" << "rdpdr" << "--data" << "disk:media:" + m_hostPreferences->shareMedia() << "--";
++        shareMedia << "/drive:media," + m_hostPreferences->shareMedia();
+         arguments += shareMedia;
+     }
+ 
+     QString performance;
+     switch (m_hostPreferences->performance()) {
+     case 0:
+-        performance = 'm';
++        performance = "modem";
+         break;
+     case 1:
+-        performance = 'b';
++        performance = "broadband";
+         break;
+     case 2:
+-        performance = 'l';
++        performance = "lan";
+         break;
+     default:
+         break;
+     }
+ 
+-    arguments << "-x" << performance;
++    arguments << "/network:" + performance;
+ 
+     if (m_hostPreferences->console()) {
+-        arguments << "-0";
++        arguments << "/admin";
+     }
+ 
+     if (m_hostPreferences->remoteFX()) {
+-        arguments << "--rfx";
++        arguments << "/rfx";
+     }
+ 
+     if (!m_hostPreferences->extraOptions().isEmpty()) {
+@@ -233,16 +220,21 @@ bool RdpView::start()
+     // krdc has no support for certificate management yet; it would not be possbile to connect to any host:
+     // "The host key for example.com has changed" ...
+     // "Add correct host key in ~/.freerdp/known_hosts to get rid of this message."
+-    arguments << "--ignore-certificate";
++    arguments << "/cert-ignore";
+ 
+     // clipboard sharing is activated in KRDC; user can disable it at runtime
+-    arguments << "--plugin" << "cliprdr";
++    arguments << "/clipboard";
+ 
+-    arguments << "-t" << QString::number(m_port);
+-    arguments << m_host;
++    arguments << "/port:" + QString::number(m_port);
++    arguments << "/v:" + m_host;
+ 
+     kDebug(5012) << "Starting xfreerdp with arguments:" << arguments;
+ 
++    //avoid printing the password in debug
++    if (!m_url.password().isNull()) {
++        arguments << "/p:" + m_url.password();
++    }
++
+     setStatus(Connecting);
+ 
+     connect(m_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
+@@ -302,7 +294,7 @@ void RdpView::connectionError()
+ 
+ void RdpView::processError(QProcess::ProcessError error)
+ {
+-    kDebug(5012) << "processError:" << error;
++    kDebug(5012) << error;
+     if (m_quitFlag) // do not try to show error messages while quitting (prevent crashes)
+         return;
+ 
+@@ -319,33 +311,13 @@ void RdpView::processError(QProcess::ProcessError error)
+ void RdpView::receivedStandardError()
+ {
+     const QString output(m_process->readAllStandardError());
+-    kDebug(5012) << "receivedStandardError:" << output;
+-    QString line;
+-    int i = 0;
+-    while (!(line = output.section('\n', i, i)).isEmpty()) {
+-        
+-        // the following error is issued by freerdp because of a bug in freerdp 1.0.1 and below;
+-        // see: https://github.com/FreeRDP/FreeRDP/pull/576
+-        //"X Error of failed request:  BadWindow (invalid Window parameter)
+-        //   Major opcode of failed request:  7 (X_ReparentWindow)
+-        //   Resource id in failed request:  0x71303348
+-        //   Serial number of failed request:  36
+-        //   Current serial number in output stream:  36"
+-        if (line.contains(QLatin1String("X_ReparentWindow"))) {
+-            KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are using is too old.\n"
+-                                       "xfreerdp 1.0.2 or greater is required."),
+-                               i18n("RDP Failure"));
+-            connectionError();
+-            return;
+-        }
+-        i++;
+-    }
++    kDebug(5012) << output;
+ }
+ 
+ void RdpView::receivedStandardOutput()
+ {
+     const QString output(m_process->readAllStandardOutput());
+-    kDebug(5012) << "receivedStandardOutput:" << output;
++    kDebug(5012) << output;
+     QString line;
+     int i = 0;
+     while (!(line = output.section('\n', i, i)).isEmpty()) {
+@@ -373,6 +345,14 @@ void RdpView::receivedStandardOutput()
+             return;
+         }
+ 
++        // we no longer support freerdp < 1.1, we only support versions with the new interface
++        if (line.contains(QLatin1String("invalid option: -decorations"))) {
++            KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are using is too old.\n"
++                                       "xfreerdp 1.1 or greater is required."),
++                               i18n("RDP Failure"));
++            connectionError();
++            return;
++        }
+         i++;
+     }
+ }
diff --git a/kde-base/krdc/krdc-4.13.49.9999.ebuild b/kde-base/krdc/krdc-4.13.49.9999.ebuild
index 59390f4f0f6..8cf9bf373de 100644
--- a/kde-base/krdc/krdc-4.13.49.9999.ebuild
+++ b/kde-base/krdc/krdc-4.13.49.9999.ebuild
@@ -10,22 +10,24 @@ inherit kde4-base
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
 HOMEPAGE="http://www.kde.org/applications/internet/krdc/"
 KEYWORDS=""
-IUSE="debug jpeg rdesktop vnc zeroconf telepathy"
+IUSE="debug jpeg rdesktop telepathy vnc zeroconf"
 
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1
 
 DEPEND="
 	jpeg? ( virtual/jpeg:0 )
+	telepathy? ( >=net-libs/telepathy-qt-0.9 )
 	vnc? ( >=net-libs/libvncserver-0.9 )
 	zeroconf? ( net-dns/avahi )
-	telepathy? ( >=net-libs/telepathy-qt-0.9 )
 "
 RDEPEND="${DEPEND}
 	rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.13.1-freerdp.patch" )
+
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with telepathy TelepathyQt4)
 		$(cmake-utils_use_with vnc LibVNCServer)
diff --git a/kde-base/krdc/krdc-4.9999.ebuild b/kde-base/krdc/krdc-4.9999.ebuild
index 59390f4f0f6..8cf9bf373de 100644
--- a/kde-base/krdc/krdc-4.9999.ebuild
+++ b/kde-base/krdc/krdc-4.9999.ebuild
@@ -10,22 +10,24 @@ inherit kde4-base
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
 HOMEPAGE="http://www.kde.org/applications/internet/krdc/"
 KEYWORDS=""
-IUSE="debug jpeg rdesktop vnc zeroconf telepathy"
+IUSE="debug jpeg rdesktop telepathy vnc zeroconf"
 
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1
 
 DEPEND="
 	jpeg? ( virtual/jpeg:0 )
+	telepathy? ( >=net-libs/telepathy-qt-0.9 )
 	vnc? ( >=net-libs/libvncserver-0.9 )
 	zeroconf? ( net-dns/avahi )
-	telepathy? ( >=net-libs/telepathy-qt-0.9 )
 "
 RDEPEND="${DEPEND}
 	rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.13.1-freerdp.patch" )
+
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with telepathy TelepathyQt4)
 		$(cmake-utils_use_with vnc LibVNCServer)
diff --git a/kde-misc/milou/Manifest b/kde-base/milou/Manifest
index a7d2f88cdc9..a7d2f88cdc9 100644
--- a/kde-misc/milou/Manifest
+++ b/kde-base/milou/Manifest
diff --git a/kde-misc/powerdevil/metadata.xml b/kde-base/milou/metadata.xml
index a23f444b67d..a23f444b67d 100644
--- a/kde-misc/powerdevil/metadata.xml
+++ b/kde-base/milou/metadata.xml
diff --git a/kde-misc/milou/milou-4.96.0.ebuild b/kde-base/milou/milou-4.96.0.ebuild
index e5d5cd15a5c..86b99592b83 100644
--- a/kde-misc/milou/milou-4.96.0.ebuild
+++ b/kde-base/milou/milou-4.96.0.ebuild
@@ -4,19 +4,14 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	EGIT_BRANCH="frameworks"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/unstable/plasma/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
+EGIT_BRANCH="frameworks"
 inherit kde5
 
 DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/milou"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -26,4 +21,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep baloo)
+	!kde-misc/milou
 "
diff --git a/kde-misc/milou/milou-9999.ebuild b/kde-base/milou/milou-9999.ebuild
index e5d5cd15a5c..7c55ba336ce 100644
--- a/kde-misc/milou/milou-9999.ebuild
+++ b/kde-base/milou/milou-9999.ebuild
@@ -4,19 +4,14 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	EGIT_BRANCH="frameworks"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/unstable/plasma/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
+EGIT_BRANCH="frameworks"
 inherit kde5
 
 DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/milou"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="
@@ -26,4 +21,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep baloo)
+	!kde-misc/milou
 "
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
index 778e2d751e5..66ab73482f9 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 	)
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_kdemisc_dep milou)
+	$(add_kdebase_dep milou)
 	dev-qt/qtquickcontrols:5
 	!kde-base/freespacenotifier:4
 	!kde-base/libkworkspace:4
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index b6ce84b7191..0ed1cfaee3c 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 	)
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_kdemisc_dep milou)
+	$(add_kdebase_dep milou)
 	dev-qt/qtquickcontrols:5[widgets]
 	!kde-base/freespacenotifier:4
 	!kde-base/libkworkspace:4
diff --git a/kde-misc/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index 8e81cf2a4a6..8e81cf2a4a6 100644
--- a/kde-misc/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
diff --git a/kde-base/powerdevil/metadata.xml b/kde-base/powerdevil/metadata.xml
index 94ce7b0aa16..4116ba03bac 100644
--- a/kde-base/powerdevil/metadata.xml
+++ b/kde-base/powerdevil/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<use>
-  <flag name="pm-utils">Adds support for suspend/resume the system through <pkg>sys-power/pm-utils</pkg></flag>
-</use>
+	<herd>kde</herd>
+	<use>
+		<flag name="pm-utils">Adds support for suspend/resume the system through <pkg>sys-power/pm-utils</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-misc/powerdevil/powerdevil-4.96.0.ebuild b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
index 335ce6cad6e..33bb71835f1 100644
--- a/kde-misc/powerdevil/powerdevil-4.96.0.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
@@ -4,19 +4,13 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	EGIT_BRANCH="frameworks"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/unstable/plasma/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
 inherit kde5
 
 DESCRIPTION="Manages the power consumption settings of a Plasma Shell"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/powerdevil"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
 
 LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-9999.ebuild
index 0635390f30d..9fcdef63329 100644
--- a/kde-misc/powerdevil/powerdevil-9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-9999.ebuild
@@ -4,18 +4,13 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/unstable/plasma/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
 inherit kde5
 
 DESCRIPTION="Manages the power consumption settings of a Plasma Shell"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/powerdevil"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
 
 LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="
diff --git a/net-libs/jreen/jreen-9999.ebuild b/net-libs/jreen/jreen-9999.ebuild
index 8c1ad348073..4303f90cabe 100644
--- a/net-libs/jreen/jreen-9999.ebuild
+++ b/net-libs/jreen/jreen-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI=( "git://github.com/euroelessar/${PN}" )
@@ -24,7 +24,6 @@ IUSE="debug +qt4 qt5"
 
 DEPEND="
 	media-libs/speex
-	>=net-dns/libidn-1.20
 	net-libs/libgsasl
 	sys-libs/zlib
 	qt4? (
@@ -43,22 +42,24 @@ DOCS=( AUTHORS ChangeLog README )
 pkg_setup() {
 	MULTIBUILD_VARIANTS=()
 	if use qt4; then
-		MULTIBUILD_VARIANTS+=(qt4)
+		MULTIBUILD_VARIANTS+=( qt4 )
 	fi
 	if use qt5; then
-		MULTIBUILD_VARIANTS+=(qt5)
+		MULTIBUILD_VARIANTS+=( qt5 )
 	fi
 }
 
 src_configure() {
 	myconfigure() {
 		local mycmakeargs=()
+
 		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=(-DJREEN_FORCE_QT4=ON)
+			mycmakeargs+=( -DJREEN_FORCE_QT4=ON )
 		fi
 		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(-DJREEN_FORCE_QT4=OFF)
+			mycmakeargs+=( -DJREEN_FORCE_QT4=OFF )
 		fi
+
 		cmake-utils_src_configure
 	}
 
diff --git a/profiles/package.mask/kde5-extra b/profiles/package.mask/kde5-extra
index b77b3f68f69..b9e807b2836 100644
--- a/profiles/package.mask/kde5-extra
+++ b/profiles/package.mask/kde5-extra
@@ -1,5 +1,3 @@
 # Michael Palimaka <kensington@gentoo.org> (18 May 2014)
 # Cross-overlay dependencies.
-~kde-misc/milou-4.96.0
-~kde-misc/powerdevil-4.96.0
 ~x11-libs/libkscreen2-1.71
diff --git a/profiles/package.mask/plasma-next b/profiles/package.mask/plasma-next
index 0793b3f4496..52cdb72e976 100644
--- a/profiles/package.mask/plasma-next
+++ b/profiles/package.mask/plasma-next
@@ -14,7 +14,9 @@
 ~kde-base/kwin-4.96.0
 ~kde-base/kwrited-4.96.0
 ~kde-base/libksysguard-4.96.0
+~kde-base/milou-4.96.0
 ~kde-base/oxygen-4.96.0
 ~kde-base/plasma-desktop-4.96.0
 ~kde-base/plasma-workspace-4.96.0
+~kde-base/powerdevil-4.96.0
 ~kde-base/systemsettings-4.96.0
diff --git a/profiles/updates/2Q-2014 b/profiles/updates/2Q-2014
index 7db99a8b8d9..8851f439d1c 100644
--- a/profiles/updates/2Q-2014
+++ b/profiles/updates/2Q-2014
@@ -1 +1,2 @@
 move kde-frameworks/kde4support kde-frameworks/kdelibs4support
+move kde-misc/powerdevil kde-base/powerdevil
diff --git a/sets/kde-applications b/sets/kde-applications
new file mode 100644
index 00000000000..faf6ee9da42
--- /dev/null
+++ b/sets/kde-applications
@@ -0,0 +1,3 @@
+# Autogenerated by regenerate-files, DO NOT EDIT.
+# sort them later to the appropriate sets
+x11-libs/libkscreen2
diff --git a/sets/kde-applications-5.0 b/sets/kde-applications-5.0
index 337026a5a6d..f87a5bf9d47 100644
--- a/sets/kde-applications-5.0
+++ b/sets/kde-applications-5.0
@@ -1,4 +1,2 @@
 # sort them later to the appropriate sets
-<kde-misc/milou-5.0.50
-<kde-misc/powerdevil-5.0.50
 x11-libs/libkscreen2
diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index d96366ad9d5..da1143abdd9 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -1,7 +1,6 @@
 # sort them later to the appropriate sets
+~kde-base/konsole-9999
 ~kde-misc/plasma-nm-9999
-~kde-misc/milou-9999
-~kde-misc/powerdevil-9999
 ~net-libs/libmm-qt-9999
 ~net-libs/libnm-qt-9999
 ~x11-libs/libkscreen2-9999
diff --git a/sets/kde-workspaces b/sets/kde-workspaces
new file mode 100644
index 00000000000..0d8b8857f3d
--- /dev/null
+++ b/sets/kde-workspaces
@@ -0,0 +1,19 @@
+# Autogenerated by regenerate-files, DO NOT EDIT.
+kde-base/baloo-5.0.50
+kde-base/breeze-5.0.50
+kde-base/kde-cli-tools-5.0.50
+kde-base/khelpcenter-5.0.50
+kde-base/khotkeys-5.0.50
+kde-base/kinfocenter-5.0.50
+kde-base/kio-extras-5.0.50
+kde-base/kmenuedit-5.0.50
+kde-base/ksysguard-5.0.50
+kde-base/kwin-5.0.50
+kde-base/kwrited-5.0.50
+kde-base/libksysguard-5.0.50
+kde-base/milou-5.0.50
+kde-base/oxygen-5.0.50
+kde-base/plasma-desktop-5.0.50
+kde-base/plasma-workspace-5.0.50
+kde-base/powerdevil-5.0.50
+kde-base/systemsettings-5.0.50
diff --git a/sets/kde-workspaces-5.0 b/sets/kde-workspaces-5.0
index 67d2700d37c..2029d2c97b4 100644
--- a/sets/kde-workspaces-5.0
+++ b/sets/kde-workspaces-5.0
@@ -10,7 +10,9 @@
 <kde-base/kwin-5.0.50
 <kde-base/kwrited-5.0.50
 <kde-base/libksysguard-5.0.50
+<kde-base/milou-5.0.50
 <kde-base/oxygen-5.0.50
 <kde-base/plasma-desktop-5.0.50
 <kde-base/plasma-workspace-5.0.50
+<kde-base/powerdevil-5.0.50
 <kde-base/systemsettings-5.0.50
diff --git a/sets/kde-workspaces-live b/sets/kde-workspaces-live
index d5cd96b6207..842e2772fa6 100644
--- a/sets/kde-workspaces-live
+++ b/sets/kde-workspaces-live
@@ -10,7 +10,9 @@
 ~kde-base/kwin-9999
 ~kde-base/kwrited-9999
 ~kde-base/libksysguard-9999
+~kde-base/milou-9999
 ~kde-base/oxygen-9999
 ~kde-base/plasma-desktop-9999
 ~kde-base/plasma-workspace-9999
+~kde-base/powerdevil-9999
 ~kde-base/systemsettings-9999
diff --git a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
index 212b325cc48..4b92a5d1b4b 100644
--- a/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-1.71.ebuild
@@ -31,4 +31,6 @@ DEPEND="
 	x11-libs/libxcb
 	x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"
diff --git a/x11-libs/libkscreen2/libkscreen2-9999.ebuild b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
index 212b325cc48..4b92a5d1b4b 100644
--- a/x11-libs/libkscreen2/libkscreen2-9999.ebuild
+++ b/x11-libs/libkscreen2/libkscreen2-9999.ebuild
@@ -31,4 +31,6 @@ DEPEND="
 	x11-libs/libxcb
 	x11-libs/libXrandr
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"