commit: 141e69448a61fd13655cdd2936806509de135513
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 11:48:33 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Nov 4 11:49:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141e6944
kde-base/ksysguard -> kde-plasma/ksysguard
dev-util/kdevelop/kdevelop-4.7.2.ebuild | 2 +-
dev-util/kdevelop/kdevelop-4.7.3.ebuild | 2 +-
kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild | 2 +-
kde-base/krunner/krunner-4.11.22.ebuild | 2 +-
kde-base/ksysguard/Manifest | 1 -
kde-base/ksysguard/metadata.xml | 8 --------
kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild | 2 +-
kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild | 2 +-
kde-plasma/ksysguard/Manifest | 1 +
{kde-base => kde-plasma}/ksysguard/ksysguard-4.11.22.ebuild | 2 +-
kde-plasma/ksysguard/ksysguard-5.7.5.ebuild | 2 +-
kde-plasma/ksysguard/ksysguard-5.8.3.ebuild | 2 +-
kde-plasma/libksysguard/libksysguard-5.7.5.ebuild | 2 +-
kde-plasma/libksysguard/libksysguard-5.8.3.ebuild | 2 +-
net-misc/knemo/knemo-0.7.7.ebuild | 4 ++--
profiles/updates/4Q-2016 | 1 +
16 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/dev-util/kdevelop/kdevelop-4.7.2.ebuild
b/dev-util/kdevelop/kdevelop-4.7.2.ebuild
index fb36a9b..2d5df82 100644
--- 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 ca1eb2c..c73179e 100644
--- 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 8cd9e1e..9e2337d 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 96cbb92..aafbe36 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 db5163f..00000000
--- 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
index 0cf5922..00000000
--- 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>k...@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 1c12546..44f5e2b 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 900c1c7..60377be 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
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 961ca53..de22a8b 100644
--- 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 2f66deb..6e8c116 100644
--- 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 edeb31c..adc9bd5 100644
--- 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 4a1fd3a..6efbc0b 100644
--- 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 704758f..ad0b1c4 100644
--- 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 f575c93..36331c9 100644
--- 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 f974a70..815bfe2 100644
--- 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 32ae1ee..580c769 100644
--- 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
