kde-base/libkworkspace -> kde-plasma/libkworkspace

11 files changed, 8 insertions, 51 deletions

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index 8e58260a2763..d249f8382e1d 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -73,7 +73,6 @@ RDEPEND="
 	!minimal? (
 		$(add_kdeapps_dep kdepasswd)
 		$(add_kdebase_dep klipper)
-		$(add_kdebase_dep libkworkspace)
 		$(add_kdebase_dep libplasmaclock)
 		$(add_kdebase_dep libplasmagenericshell)
 		$(add_kdebase_dep libtaskmanager)
@@ -88,6 +87,7 @@ RDEPEND="
 		kde-plasma/ksysguard:4
 		kde-plasma/ksystraycmd:4
 		kde-plasma/kwrited:4
+		kde-plasma/libkworkspace:4
 		kde-plasma/liboxygenstyle:4
 		kde-plasma/powerdevil:4
 		kde-plasma/qguiplatformplugin_kde:4
diff --git a/kde-base/kdm/kdm-4.11.22.ebuild b/kde-base/kdm/kdm-4.11.22.ebuild
index 3be99e485b6a..1ab6487d7516 100644
--- a/kde-base/kdm/kdm-4.11.22.ebuild
+++ b/kde-base/kdm/kdm-4.11.22.ebuild
@@ -15,7 +15,7 @@ IUSE="debug +consolekit kerberos pam systemd"
 REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
 
 DEPEND="
-	$(add_kdebase_dep libkworkspace)
+	kde-plasma/libkworkspace:4
 	media-libs/qimageblitz
 	x11-libs/libX11
 	x11-libs/libXau
diff --git a/kde-base/klipper/klipper-4.11.22.ebuild b/kde-base/klipper/klipper-4.11.22.ebuild
index 8aff3988f25d..acb62faa5fda 100644
--- a/kde-base/klipper/klipper-4.11.22.ebuild
+++ b/kde-base/klipper/klipper-4.11.22.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug prison"
 
 DEPEND="
-	$(add_kdebase_dep libkworkspace)
+	kde-plasma/libkworkspace:4
 	$(add_kdebase_dep libtaskmanager)
 	sys-libs/zlib
 	x11-libs/libX11
diff --git a/kde-base/krunner/krunner-4.11.22.ebuild b/kde-base/krunner/krunner-4.11.22.ebuild
index bee1ceed8106..82f9b49b120a 100644
--- a/kde-base/krunner/krunner-4.11.22.ebuild
+++ b/kde-base/krunner/krunner-4.11.22.ebuild
@@ -15,11 +15,11 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep libkworkspace)
 	$(add_kdebase_dep libplasmagenericshell)
 	kde-plasma/kcheckpass:4
 	kde-plasma/kephal:4
 	kde-plasma/ksysguard:4
+	kde-plasma/libkworkspace:4
 	!aqua? (
 		x11-libs/libX11
 		x11-libs/libXcursor
diff --git a/kde-base/ksmserver/ksmserver-4.11.22.ebuild b/kde-base/ksmserver/ksmserver-4.11.22.ebuild
index e71be42c5934..2f92cc895093 100644
--- a/kde-base/ksmserver/ksmserver-4.11.22.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.11.22.ebuild
@@ -14,7 +14,7 @@ IUSE="debug"
 
 DEPEND="
 	kde-plasma/kcminit:4
-	$(add_kdebase_dep libkworkspace)
+	kde-plasma/libkworkspace:4
 	media-libs/qimageblitz
 	x11-libs/libICE
 	x11-libs/libSM
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
deleted file mode 100644
index db5163f83985..000000000000
--- a/kde-base/libkworkspace/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/libkworkspace/libkworkspace-4.11.22.ebuild b/kde-base/libkworkspace/libkworkspace-4.11.22.ebuild
deleted file mode 100644
index 5e74252151dc..000000000000
--- a/kde-base/libkworkspace/libkworkspace-4.11.22.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
-	ksmserver/org.kde.KSMServerInterface.xml
-	kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-DEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXau
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
-		libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/libkworkspace/metadata.xml b/kde-base/libkworkspace/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/kde-base/libkworkspace/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild
index c00c81a62c0b..a5ff8beed9c0 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild
@@ -15,7 +15,7 @@ IUSE="debug test"
 
 DEPEND="
 	kde-plasma/kephal:4
-	$(add_kdebase_dep libkworkspace)
+	kde-plasma/libkworkspace:4
 	x11-libs/libX11
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild
index c5f000330cb3..504ce9db7001 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild
@@ -14,9 +14,9 @@ IUSE="debug"
 
 DEPEND="
 	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep libkworkspace)
 	kde-plasma/kephal:4
 	kde-plasma/ksysguard:4
+	kde-plasma/libkworkspace:4
 	x11-libs/libX11
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
index 2dd4d8f0e1b0..44e57e5d7d5f 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
@@ -24,12 +24,12 @@ COMMONDEPEND="
 	>=dev-qt/qtcore-4.8.4-r3:4
 	!kde-misc/ktouchpadenabler
 	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep libkworkspace)
 	$(add_kdebase_dep libplasmaclock 'kdepim?')
 	$(add_kdebase_dep libplasmagenericshell)
 	$(add_kdebase_dep libtaskmanager)
 	kde-plasma/kephal:4
 	kde-plasma/ksysguard:4
+	kde-plasma/libkworkspace:4
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage