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

diff --git a/dev-util/kdevelop/kdevelop-4.7.2.ebuild b/dev-util/kdevelop/kdevelop-4.7.2.ebuild
index fb36a9b3faf1f0b133aa139c9c5d40c761dc8106..2d5df824efcc3376dc1c421bb3df509b6abb3e1c 100644 (file)
--- a/dev-util/kdevelop/kdevelop-4.7.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.7.2.ebuild
@@ -22,8 +22,8 @@ DEPEND="
        dev-libs/qjson
        dev-qt/qtdeclarative:4[webkit]
        gdbui? (
-               $(add_kdebase_dep ksysguard)
                $(add_kdebase_dep libkworkspace)
+               kde-plasma/ksysguard:4
        )
        okteta? ( $(add_kdeapps_dep okteta) )
        qthelp? ( dev-qt/qthelp:4 )

diff --git a/dev-util/kdevelop/kdevelop-4.7.3.ebuild b/dev-util/kdevelop/kdevelop-4.7.3.ebuild
index ca1eb2c6bdf4ac0ba2d3932d1aef3cdfb5b34902..c73179e82eb9bdb11aa1f9f28757f6329752dc6d 100644 (file)
--- a/dev-util/kdevelop/kdevelop-4.7.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.7.3.ebuild
@@ -22,8 +22,8 @@ DEPEND="
        dev-libs/qjson
        dev-qt/qtdeclarative:4[webkit]
        gdbui? (
-               $(add_kdebase_dep ksysguard)
                $(add_kdebase_dep libkworkspace)
+               kde-plasma/ksysguard:4
        )
        okteta? ( $(add_kdeapps_dep okteta) )
        qthelp? ( dev-qt/qthelp:4 )

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 8cd9e1ee6ed4de56bc6f21ea8a052087dc8386e2..9e2337dd13e044949e0700a0b3ff6351e68c4353 100644 (file)
--- 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 96cbb92be2c20fe139d09ff95174d76d2ab29600..aafbe36a97b914fbe4e379bfe80076ba6a0dc10a 100644 (file)
--- 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 (file)
index db5163f..0000000
--- 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/metadata.xml b/kde-base/ksysguard/metadata.xml
deleted file mode 100644 (file)
index 0cf5922..0000000
--- 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 1c125464387d1395e660f90644b76a56f4491e05..44f5e2bd25ce309a3315049c836192f42bd47581 100644 (file)
--- 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 900c1c7bcb119dd6d9a9ccfb85aa0a804dc72ad2..60377be753c5be30e600a543a46a81660fb2b4aa 100644 (file)
--- 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

diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 961ca533a4cb8272d77f0d81e87b6cf4e222b509..de22a8b313286a322e41e9771264473bac0008f9 100644 (file)
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,2 +1,3 @@
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST ksysguard-5.7.5.tar.xz 487508 SHA256 4767872c282ffade3f113b9aeca95f0ec4d70fa7c3e8ef14e12ab341004a3e2d SHA512 b882d57d0fe5fc36d8d9d56819a3a9d002df1e60ec324e61ac9cc30f933b737658270a47c9482985724d8cac8c2c582ad494ac870df6e2c2ac9213966bf3ae21 WHIRLPOOL 3ae8b03e2666b69d6aea0043f5cc16dd7e90d1f7bcdb89e2c8ae42014630f80fd068d9271e6612e991cb4190ba9086fda7c1f9a0ab0d217e0d06576d709defe6
 DIST ksysguard-5.8.3.tar.xz 487732 SHA256 ed9bccff28f62aadf201ab6c88f35eda997bd1ccc2d4c3d259216af740753528 SHA512 2fa7251c1be8bc1dcd77530d4cdcba32227116bbdcda05e61c0e911a9a82ae2d73eb8316cc80fc9fb5f0015fde1f5c997ba2f7676d765e2750e95bb14bb89682 WHIRLPOOL 391b4b2d7665f4d3e358fe7754e3d68c24c145fb24e644c9490c53c2a68ebb13ef769e07f11b1a519c737707bc7028c8266878aa98b6f0cf41baf7313e424f86

diff --git a/kde-base/ksysguard/ksysguard-4.11.22.ebuild b/kde-plasma/ksysguard/ksysguard-4.11.22.ebuild
similarity index 91%
rename from kde-base/ksysguard/ksysguard-4.11.22.ebuild
rename to kde-plasma/ksysguard/ksysguard-4.11.22.ebuild
index 2f66deb9beefc73aefde8d8a390708ea248b770c..6e8c1163db82dffa82e34c6d9e1780c680c369f9 100644 (file)
--- a/kde-base/ksysguard/ksysguard-4.11.22.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-4.11.22.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 WEBKIT_REQUIRED="always"
 inherit kde4-meta
 
-DESCRIPTION="KSysguard is a network enabled task manager and system monitor application"
+DESCRIPTION="Network-enabled task manager and system monitor"
 HOMEPAGE+=" https://userbase.kde.org/KSysGuard"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug lm_sensors test"

diff --git a/kde-plasma/ksysguard/ksysguard-5.7.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.7.5.ebuild
index edeb31c0eec8be0819a1c49ed9f434855eb2f67f..adc9bd541eba359d2655ca3fb0da37298dacb3cf 100644 (file)
--- a/kde-plasma/ksysguard/ksysguard-5.7.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.7.5.ebuild
@@ -36,7 +36,7 @@ DEPEND="
        lm_sensors? ( sys-apps/lm_sensors )
 "
 RDEPEND="${DEPEND}
-       !kde-base/ksysguard:4
+       !kde-plasma/ksysguard:4
 "
 
 PATCHES=( "${FILESDIR}/${PN}-5.6.5-gui.patch" )

diff --git a/kde-plasma/ksysguard/ksysguard-5.8.3.ebuild b/kde-plasma/ksysguard/ksysguard-5.8.3.ebuild
index 4a1fd3a9a76765f87f503342bcfb1a6dc19bd23a..6efbc0b300f43e8b2414c36dfa582e6a8f91abd8 100644 (file)
--- a/kde-plasma/ksysguard/ksysguard-5.8.3.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.8.3.ebuild
@@ -36,7 +36,7 @@ DEPEND="
        lm_sensors? ( sys-apps/lm_sensors )
 "
 RDEPEND="${DEPEND}
-       !kde-base/ksysguard:4
+       !kde-plasma/ksysguard:4
 "
 
 src_configure() {

diff --git a/kde-plasma/libksysguard/libksysguard-5.7.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.7.5.ebuild
index 704758fa35120eb93279e66b59fede225b70596e..ad0b1c44142efabe7e49237572ebe423a6e23c3c 100644 (file)
--- a/kde-plasma/libksysguard/libksysguard-5.7.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.7.5.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
        )
 "
 RDEPEND="${COMMON_DEPEND}
-       !kde-base/ksysguard:4
+       !kde-plasma/ksysguard:4
        !kde-base/libksysguard:4
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-plasma/libksysguard/libksysguard-5.8.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.8.3.ebuild
index f575c931a5589b8d182b2c2e6f6381fbd3e43753..36331c990630c33275e20d1eb170a132b70b5580 100644 (file)
--- a/kde-plasma/libksysguard/libksysguard-5.8.3.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.8.3.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
        )
 "
 RDEPEND="${COMMON_DEPEND}
-       !kde-base/ksysguard:4
+       !kde-plasma/ksysguard:4
        !kde-base/libksysguard:4
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/net-misc/knemo/knemo-0.7.7.ebuild b/net-misc/knemo/knemo-0.7.7.ebuild
index f974a70e9e5857455f0baf3b08eee40dd8676dfa..815bfe2a79cb957c74acce79016c063b581b0608 100644 (file)
--- a/net-misc/knemo/knemo-0.7.7.ebuild
+++ b/net-misc/knemo/knemo-0.7.7.ebuild
@@ -18,11 +18,11 @@ KEYWORDS="amd64 x86"
 IUSE="debug wifi"
 
 DEPEND="
-       $(add_kdebase_dep ksysguard)
        $(add_kdebase_dep systemsettings)
        dev-libs/libnl:3
-       sys-apps/net-tools
        dev-qt/qtsql:4[sqlite]
+       kde-plasma/ksysguard:4
+       sys-apps/net-tools
        wifi? ( net-wireless/wireless-tools )
 "
 RDEPEND="${DEPEND}"

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 32ae1ee398f50819abc237039f071f32819598ac..580c769159263ae7849d9b0c43db99e4fd8145dd 100644 (file)
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -14,3 +14,4 @@ move kde-base/kwrited kde-plasma/kwrited
 move kde-base/kmenuedit kde-plasma/kmenuedit
 move kde-base/khotkeys kde-plasma/khotkeys
 move kde-base/kinfocenter kde-plasma/kinfocenter
+move kde-base/ksysguard kde-plasma/ksysguard