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 47f9663979d8e..42b04b88ede39 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 libtaskmanager) kde-plasma/freespacenotifier:4 kde-plasma/kcheckpass:4 kde-plasma/kdebase-cursors:4 @@ -89,6 +88,7 @@ RDEPEND=" kde-plasma/liboxygenstyle:4 kde-plasma/libplasmaclock:4 kde-plasma/libplasmagenericshell:4 + kde-plasma/libtaskmanager:4 kde-plasma/powerdevil:4 kde-plasma/qguiplatformplugin_kde:4 kde-plasma/solid-actions-kcm:4 diff --git a/kde-base/klipper/klipper-4.11.22.ebuild b/kde-base/klipper/klipper-4.11.22.ebuild index acb62faa5fdad..9ef86ee327cab 100644 --- a/kde-base/klipper/klipper-4.11.22.ebuild +++ b/kde-base/klipper/klipper-4.11.22.ebuild @@ -15,7 +15,7 @@ IUSE="debug prison" DEPEND=" kde-plasma/libkworkspace:4 - $(add_kdebase_dep libtaskmanager) + kde-plasma/libtaskmanager:4 sys-libs/zlib x11-libs/libX11 prison? ( media-libs/prison:4 ) 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 c351a053d633f..21333767b9468 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 libtaskmanager) kde-plasma/kephal:4 kde-plasma/ksysguard:4 kde-plasma/libkworkspace:4 kde-plasma/libplasmaclock:4[kdepim?] kde-plasma/libplasmagenericshell:4 + kde-plasma/libtaskmanager:4 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage diff --git a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild index 3749ca43e4ac6..5507feea56add 100644 --- a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild +++ b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.26-r1.ebuild @@ -18,5 +18,5 @@ SLOT="4" KEYWORDS="amd64 x86" IUSE="debug" -DEPEND="$(add_kdebase_dep libtaskmanager)" +DEPEND="kde-plasma/libtaskmanager:4" RDEPEND="${DEPEND}" diff --git a/kde-misc/smooth-tasks/smooth-tasks-0_p20120130.ebuild b/kde-misc/smooth-tasks/smooth-tasks-0_p20120130.ebuild index d86a937ed8fe2..c1a9be16b8265 100644 --- a/kde-misc/smooth-tasks/smooth-tasks-0_p20120130.ebuild +++ b/kde-misc/smooth-tasks/smooth-tasks-0_p20120130.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" DEPEND=" - $(add_kdebase_dep libtaskmanager) + kde-plasma/libtaskmanager:4 " RDEPEND="${DEPEND} $(add_kdebase_dep plasma-workspace) diff --git a/kde-base/libtaskmanager/Manifest b/kde-plasma/libtaskmanager/Manifest similarity index 100% rename from kde-base/libtaskmanager/Manifest rename to kde-plasma/libtaskmanager/Manifest diff --git a/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild b/kde-plasma/libtaskmanager/libtaskmanager-4.11.22.ebuild similarity index 100% rename from kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild rename to kde-plasma/libtaskmanager/libtaskmanager-4.11.22.ebuild diff --git a/kde-base/libtaskmanager/metadata.xml b/kde-plasma/libtaskmanager/metadata.xml similarity index 55% rename from kde-base/libtaskmanager/metadata.xml rename to kde-plasma/libtaskmanager/metadata.xml index 0cf59224b0096..2fdbf33d963db 100644 --- a/kde-base/libtaskmanager/metadata.xml +++ b/kde-plasma/libtaskmanager/metadata.xml @@ -1,8 +1,8 @@ - - kde@gentoo.org - Gentoo KDE Project - + + kde@gentoo.org + Gentoo KDE Project + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild index 8fa3b4ea1a317..856aac27efa03 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild @@ -107,7 +107,7 @@ RDEPEND="${COMMON_DEPEND} x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 - !kde-base/libtaskmanager:4 + !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild index 4c8d829c271fb..6c3ac7a9c3264 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild @@ -107,7 +107,7 @@ RDEPEND="${COMMON_DEPEND} x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 - !kde-base/libtaskmanager:4 + !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild index f67827bbfb2fd..491a9a4209b88 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild @@ -106,7 +106,7 @@ RDEPEND="${COMMON_DEPEND} x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 - !kde-base/libtaskmanager:4 + !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 index 8f24363c64d07..be563846aae68 100644 --- a/profiles/updates/4Q-2016 +++ b/profiles/updates/4Q-2016 @@ -43,3 +43,4 @@ move kde-base/ksplash kde-plasma/ksplash move kde-base/libkworkspace kde-plasma/libkworkspace move kde-base/libplasmagenericshell kde-plasma/libplasmagenericshell move kde-base/libplasmaclock kde-plasma/libplasmaclock +move kde-base/libtaskmanager kde-plasma/libtaskmanager