From d8f4e90504d2cbd7097f7140e06ee9ea187ded5e Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 20 Nov 2016 16:03:18 +0100 Subject: [PATCH] kde-base/kcminit -> kde-plasma/kcminit --- kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild | 2 +- kde-base/ksmserver/ksmserver-4.11.22.ebuild | 4 ++-- {kde-base => kde-plasma}/kcminit/Manifest | 0 {kde-base => kde-plasma}/kcminit/kcminit-4.11.22.ebuild | 4 ++-- {kde-base => kde-plasma}/kcminit/metadata.xml | 0 kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild | 2 +- kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild | 2 +- kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild | 2 +- kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild | 2 +- profiles/updates/4Q-2016 | 1 + 10 files changed, 10 insertions(+), 9 deletions(-) rename {kde-base => kde-plasma}/kcminit/Manifest (100%) rename {kde-base => kde-plasma}/kcminit/kcminit-4.11.22.ebuild (67%) rename {kde-base => kde-plasma}/kcminit/metadata.xml (100%) 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 1865b974ad432..3f3234a6f8910 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 @@ -53,12 +53,12 @@ RDEPEND=" $(add_kdeapps_dep plasma-runtime) $(add_kdeapps_dep renamedlg-plugins) $(add_kdeapps_dep solid-runtime) - $(add_kdebase_dep kcminit) $(add_kdebase_dep krunner) $(add_kdebase_dep ksmserver) $(add_kdebase_dep ksplash) $(add_kdebase_dep kstartupconfig) $(add_kdebase_dep plasma-workspace) + kde-plasma/kcminit:4 kde-plasma/kwin:4 kde-plasma/systemsettings:4 x11-apps/mkfontdir diff --git a/kde-base/ksmserver/ksmserver-4.11.22.ebuild b/kde-base/ksmserver/ksmserver-4.11.22.ebuild index 1081ea5cfee8a..528111fa5f1e3 100644 --- a/kde-base/ksmserver/ksmserver-4.11.22.ebuild +++ b/kde-base/ksmserver/ksmserver-4.11.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="debug" DEPEND=" - $(add_kdebase_dep kcminit) + kde-plasma/kcminit:4 $(add_kdebase_dep libkworkspace) media-libs/qimageblitz x11-libs/libICE diff --git a/kde-base/kcminit/Manifest b/kde-plasma/kcminit/Manifest similarity index 100% rename from kde-base/kcminit/Manifest rename to kde-plasma/kcminit/Manifest diff --git a/kde-base/kcminit/kcminit-4.11.22.ebuild b/kde-plasma/kcminit/kcminit-4.11.22.ebuild similarity index 67% rename from kde-base/kcminit/kcminit-4.11.22.ebuild rename to kde-plasma/kcminit/kcminit-4.11.22.ebuild index 480fa2a671448..3b63e53ebd086 100644 --- a/kde-base/kcminit/kcminit-4.11.22.ebuild +++ b/kde-plasma/kcminit/kcminit-4.11.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,7 +7,7 @@ EAPI=5 KMNAME="kde-workspace" inherit kde4-meta -DESCRIPTION="KCMInit - runs startups initialization for Control Modules" +DESCRIPTION="Runs startups initialization for KDE Plasma Control Modules" KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="debug" diff --git a/kde-base/kcminit/metadata.xml b/kde-plasma/kcminit/metadata.xml similarity index 100% rename from kde-base/kcminit/metadata.xml rename to kde-plasma/kcminit/metadata.xml 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 0c99320d519ee..a93dc09f8c297 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild @@ -108,7 +108,7 @@ RDEPEND="${COMMON_DEPEND} !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-base/libtaskmanager:4 - !kde-base/kcminit:4 + !kde-plasma/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild index 45bfcd9801a5e..033053ff12686 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild @@ -107,7 +107,7 @@ RDEPEND="${COMMON_DEPEND} !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-base/libtaskmanager:4 - !kde-base/kcminit:4 + !kde-plasma/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner: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 0823b1ac162bf..551020cb9ac43 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 @@ -108,7 +108,7 @@ RDEPEND="${COMMON_DEPEND} !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-base/libtaskmanager:4 - !kde-base/kcminit:4 + !kde-plasma/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild index 2f976ee0638f9..2f12dfa69c747 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild @@ -108,7 +108,7 @@ RDEPEND="${COMMON_DEPEND} !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-base/libtaskmanager:4 - !kde-base/kcminit:4 + !kde-plasma/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 index a4ee6f12a9c96..d89b83510f76c 100644 --- a/profiles/updates/4Q-2016 +++ b/profiles/updates/4Q-2016 @@ -30,3 +30,4 @@ move kde-base/freespacenotifier kde-plasma/freespacenotifier move kde-base/solid-actions-kcm kde-plasma/solid-actions-kcm move kde-base/kephal kde-plasma/kephal move kde-base/kcheckpass kde-plasma/kcheckpass +move kde-base/kcminit kde-plasma/kcminit