kde-base/ksysguard -> kde-plasma/ksysguard

7 files changed, 4 insertions, 60 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 8cd9e1ee6ed4..9e2337dd13e0 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
@@ -78,7 +78,6 @@ RDEPEND="
 		$(add_kdebase_dep kephal)
 		$(add_kdebase_dep klipper)
 		$(add_kdebase_dep kstyles)
-		$(add_kdebase_dep ksysguard)
 		$(add_kdebase_dep ksystraycmd)
 		$(add_kdebase_dep libkworkspace)
 		$(add_kdebase_dep liboxygenstyle)
@@ -90,6 +89,7 @@ RDEPEND="
 		kde-plasma/khotkeys:4
 		kde-plasma/kinfocenter:4
 		kde-plasma/kmenuedit:4
+		kde-plasma/ksysguard:4
 		kde-plasma/kwrited:4
 		kde-plasma/powerdevil:4
 	)
diff --git a/kde-base/krunner/krunner-4.11.22.ebuild b/kde-base/krunner/krunner-4.11.22.ebuild
index 96cbb92be2c2..aafbe36a97b9 100644
--- a/kde-base/krunner/krunner-4.11.22.ebuild
+++ b/kde-base/krunner/krunner-4.11.22.ebuild
@@ -17,9 +17,9 @@ DEPEND="
 	$(add_kdebase_dep kcheckpass)
 	$(add_kdebase_dep kephal)
 	$(add_kdebase_dep ksmserver)
-	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
 	$(add_kdebase_dep libplasmagenericshell)
+	kde-plasma/ksysguard:4
 	!aqua? (
 		x11-libs/libX11
 		x11-libs/libXcursor
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
deleted file mode 100644
index db5163f83985..000000000000
--- a/kde-base/ksysguard/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/ksysguard/ksysguard-4.11.22.ebuild b/kde-base/ksysguard/ksysguard-4.11.22.ebuild
deleted file mode 100644
index 2f66deb9beef..000000000000
--- a/kde-base/ksysguard/ksysguard-4.11.22.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="optional"
-VIRTUALX_REQUIRED="test"
-WEBKIT_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="KSysguard is a network enabled task manager and system monitor application"
-HOMEPAGE+=" https://userbase.kde.org/KSysGuard"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug lm_sensors test"
-
-DEPEND="
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXres
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-# bug 393091
-
-KMEXTRA="
-	libs/ksysguard/
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with lm_sensors Sensors)
-	)
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	ewarn "Note that ksysguard has powerful features; one of these is the executing of arbitrary"
-	ewarn "programs with elevated privileges (as data sources). So be careful opening worksheets"
-	ewarn "from untrusted sources!"
-}
diff --git a/kde-base/ksysguard/metadata.xml b/kde-base/ksysguard/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/kde-base/ksysguard/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/libtaskmanager/libtaskmanager-4.11.22.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild
index 1c125464387d..44f5e2bd25ce 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild
@@ -15,8 +15,8 @@ IUSE="debug"
 DEPEND="
 	$(add_kdebase_dep kactivities)
 	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
+	kde-plasma/ksysguard: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 900c1c7bcb11..60377be753c5 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
@@ -25,11 +25,11 @@ COMMONDEPEND="
 	!kde-misc/ktouchpadenabler
 	$(add_kdebase_dep kactivities)
 	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
 	$(add_kdebase_dep libplasmaclock 'kdepim?')
 	$(add_kdebase_dep libplasmagenericshell)
 	$(add_kdebase_dep libtaskmanager)
+	kde-plasma/ksysguard:4
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage