From 7d60189c96304004cde7c6dd9776df65f57d7ec6 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 6 Nov 2016 11:37:41 +0100 Subject: [PATCH] kde-base/systemsettings -> kde-plasma/systemsettings --- .../kdebase-startkde-4.11.22-r2.ebuild | 2 +- kde-base/legacy-icons/legacy-icons-4.11.22-r1.ebuild | 2 +- kde-base/systemsettings/Manifest | 1 - kde-base/systemsettings/metadata.xml | 11 ----------- kde-plasma/khotkeys/khotkeys-5.7.5.ebuild | 2 +- kde-plasma/khotkeys/khotkeys-5.8.3.ebuild | 2 +- kde-plasma/kwin/kwin-5.7.5.ebuild | 2 +- kde-plasma/kwin/kwin-5.8.3.ebuild | 2 +- kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild | 2 +- kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild | 2 +- kde-plasma/powerdevil/powerdevil-5.7.5.ebuild | 2 +- kde-plasma/powerdevil/powerdevil-5.8.3.ebuild | 2 +- kde-plasma/systemsettings/Manifest | 1 + .../files/systemsettings-4.11.22-strigi-removal.patch | 0 .../files/systemsettings-kcm-randr.patch | 0 kde-plasma/systemsettings/metadata.xml | 1 + .../systemsettings/systemsettings-4.11.22-r2.ebuild | 0 kde-plasma/systemsettings/systemsettings-5.7.5.ebuild | 2 +- kde-plasma/systemsettings/systemsettings-5.8.3.ebuild | 2 +- net-misc/knemo/knemo-0.7.7.ebuild | 2 +- profiles/arch/powerpc/package.use.stable.mask | 2 +- profiles/updates/4Q-2016 | 1 + 22 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 kde-base/systemsettings/Manifest delete mode 100644 kde-base/systemsettings/metadata.xml rename {kde-base => kde-plasma}/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch (100%) rename {kde-base => kde-plasma}/systemsettings/files/systemsettings-kcm-randr.patch (100%) rename {kde-base => kde-plasma}/systemsettings/systemsettings-4.11.22-r2.ebuild (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 9e2337dd13e0..ae913fb418e1 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 @@ -60,7 +60,7 @@ RDEPEND=" $(add_kdebase_dep kstartupconfig) $(add_kdebase_dep kwin) $(add_kdebase_dep plasma-workspace) - $(add_kdebase_dep systemsettings) + kde-plasma/systemsettings:4 x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop diff --git a/kde-base/legacy-icons/legacy-icons-4.11.22-r1.ebuild b/kde-base/legacy-icons/legacy-icons-4.11.22-r1.ebuild index e9a8cfe91ab7..670eb624c09d 100644 --- a/kde-base/legacy-icons/legacy-icons-4.11.22-r1.ebuild +++ b/kde-base/legacy-icons/legacy-icons-4.11.22-r1.ebuild @@ -25,7 +25,7 @@ RDEPEND=" !kde-apps/libkipi:5 ! - - - - kde@gentoo.org - Gentoo KDE Project - - - Use kde-plasma/kscreen for screen management - - diff --git a/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild index 9924b0cfa99f..abf6876d802c 100644 --- a/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild +++ b/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild @@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) $(add_plasma_dep kde-cli-tools) !kde-plasma/khotkeys:4 - !kde-base/systemsettings:4 + !kde-plasma/systemsettings:4 " DEPEND="${COMMON_DEPEND} x11-libs/libxcb diff --git a/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild index 2f45d7601273..41bdb50d08eb 100644 --- a/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild +++ b/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild @@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) $(add_plasma_dep kde-cli-tools) !kde-plasma/khotkeys:4 - !kde-base/systemsettings:4 + !kde-plasma/systemsettings:4 " DEPEND="${COMMON_DEPEND} x11-libs/libxcb diff --git a/kde-plasma/kwin/kwin-5.7.5.ebuild b/kde-plasma/kwin/kwin-5.7.5.ebuild index 9ee1027bca44..eb9dc605ddeb 100644 --- a/kde-plasma/kwin/kwin-5.7.5.ebuild +++ b/kde-plasma/kwin/kwin-5.7.5.ebuild @@ -79,7 +79,7 @@ RDEPEND="${COMMON_DEPEND} ) ! Enable classic mode plugin, requires kde-frameworks/khtml + Use kde-plasma/kscreen for screen management diff --git a/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild b/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild similarity index 100% rename from kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild rename to kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild diff --git a/kde-plasma/systemsettings/systemsettings-5.7.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.7.5.ebuild index 65ecc2e9c2e3..63c77882d35d 100644 --- a/kde-plasma/systemsettings/systemsettings-5.7.5.ebuild +++ b/kde-plasma/systemsettings/systemsettings-5.7.5.ebuild @@ -34,7 +34,7 @@ DEPEND=" " RDEPEND="${DEPEND} gtk? ( $(add_plasma_dep kde-gtk-config) ) - !kde-base/systemsettings:4 + !kde-plasma/systemsettings:4 " src_configure() { diff --git a/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild index e6043475c6da..177613b6e606 100644 --- a/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild +++ b/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild @@ -34,7 +34,7 @@ DEPEND=" " RDEPEND="${DEPEND} gtk? ( $(add_plasma_dep kde-gtk-config) ) - !kde-base/systemsettings:4 + !kde-plasma/systemsettings:4 " src_configure() { diff --git a/net-misc/knemo/knemo-0.7.7.ebuild b/net-misc/knemo/knemo-0.7.7.ebuild index 815bfe2a79cb..bac22afed173 100644 --- a/net-misc/knemo/knemo-0.7.7.ebuild +++ b/net-misc/knemo/knemo-0.7.7.ebuild @@ -18,10 +18,10 @@ KEYWORDS="amd64 x86" IUSE="debug wifi" DEPEND=" - $(add_kdebase_dep systemsettings) dev-libs/libnl:3 dev-qt/qtsql:4[sqlite] kde-plasma/ksysguard:4 + kde-plasma/systemsettings:4 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) " diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask index ce5ee306822d..1f0ebfb008b4 100644 --- a/profiles/arch/powerpc/package.use.stable.mask +++ b/profiles/arch/powerpc/package.use.stable.mask @@ -60,4 +60,4 @@ net-libs/aqbanking ofx # Michael Palimaka (11 Dec 2014) # Dependencies not yet stable -kde-base/systemsettings kscreen +kde-plasma/systemsettings kscreen diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 index d85f06288bcb..aa0d188f28ab 100644 --- a/profiles/updates/4Q-2016 +++ b/profiles/updates/4Q-2016 @@ -19,3 +19,4 @@ move dev-perl/google-api-adwords-perl dev-perl/Google-Ads-AdWords-Client move kde-misc/kscreen kde-plasma/kscreen move x11-libs/libkscreen kde-plasma/libkscreen slotmove media-sound/cantata 4 0 +move kde-base/systemsettings kde-plasma/systemsettings -- 2.26.2