[gentoo-commits] repo/gentoo:master commit in: kde-base/kdebase-startkde/, kde-base/qguiplatformplugin_kde/, ...

[Johannes Huber]

commit:     0c1dff10915156013e0428d76c85cdf7eb843679
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 11:03:15 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 11:04:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1dff10

kde-base/qguiplatformplugin_kde -> kde-plasma/qguiplatformplugin_kde

 kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.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/plasma-desktop/plasma-desktop-5.8.4.ebuild             | 2 +-
 {kde-base => kde-plasma}/qguiplatformplugin_kde/Manifest          | 0
 {kde-base => kde-plasma}/qguiplatformplugin_kde/metadata.xml      | 8 ++++----
 .../qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild  | 4 ++--
 profiles/updates/4Q-2016                                          | 1 +
 8 files changed, 11 insertions(+), 10 deletions(-)

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 721d419..ef911b5 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
@@ -77,7 +77,6 @@ RDEPEND="
 		$(add_kdebase_dep libplasmaclock)
 		$(add_kdebase_dep libplasmagenericshell)
 		$(add_kdebase_dep libtaskmanager)
-		$(add_kdebase_dep qguiplatformplugin_kde)
 		kde-plasma/freespacenotifier:4
 		kde-plasma/kcheckpass:4
 		kde-plasma/kdebase-cursors:4
@@ -91,6 +90,7 @@ RDEPEND="
 		kde-plasma/kwrited:4
 		kde-plasma/liboxygenstyle:4
 		kde-plasma/powerdevil:4
+		kde-plasma/qguiplatformplugin_kde:4
 		kde-plasma/solid-actions-kcm:4
 	)
 	wallpapers? ( kde-plasma/plasma-workspace-wallpapers:5 )

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild
index 5bdb86f..13ac0e2 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 		qt4? ( dev-libs/sni-qt )
 	)
 	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	qt4? ( kde-base/qguiplatformplugin_kde )
+	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
 	!kde-apps/kcontrol
 	!kde-apps/kdepasswd:4
 	!kde-apps/knetattach[handbook]

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
index 30fdc9f..023719c 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 		qt4? ( dev-libs/sni-qt )
 	)
 	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	qt4? ( kde-base/qguiplatformplugin_kde )
+	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
 	!kde-apps/kcontrol
 	!kde-apps/kdepasswd:4
 	!kde-apps/knetattach[handbook]

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild
index 30fdc9f..023719c 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 		qt4? ( dev-libs/sni-qt )
 	)
 	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	qt4? ( kde-base/qguiplatformplugin_kde )
+	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
 	!kde-apps/kcontrol
 	!kde-apps/kdepasswd:4
 	!kde-apps/knetattach[handbook]

diff --git a/kde-base/qguiplatformplugin_kde/Manifest b/kde-plasma/qguiplatformplugin_kde/Manifest
similarity index 100%
rename from kde-base/qguiplatformplugin_kde/Manifest
rename to kde-plasma/qguiplatformplugin_kde/Manifest

diff --git a/kde-base/qguiplatformplugin_kde/metadata.xml b/kde-plasma/qguiplatformplugin_kde/metadata.xml
similarity index 55%
rename from kde-base/qguiplatformplugin_kde/metadata.xml
rename to kde-plasma/qguiplatformplugin_kde/metadata.xml
index 0cf5922..2fdbf33 100644
--- a/kde-base/qguiplatformplugin_kde/metadata.xml
+++ b/kde-plasma/qguiplatformplugin_kde/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>kde@g.o</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>kde@g.o</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild b/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
similarity index 83%
rename from kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
rename to kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
index 69e43d9..1962fb5 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
+++ b/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-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,6 +7,6 @@ EAPI=5
 KMNAME="kde-workspace"
 inherit kde4-meta
 
-DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
+DESCRIPTION="Helps integration of pure Qt applications with KDE Plasma"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index c0065d8..fbd60a3 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -38,3 +38,4 @@ move kde-base/liboxygenstyle kde-plasma/liboxygenstyle
 move kde-base/kstyles kde-plasma/kstyles
 move kde-base/ksystraycmd kde-plasma/ksystraycmd
 move kde-base/kstartupconfig kde-plasma/kstartupconfig
+move kde-base/qguiplatformplugin_kde kde-plasma/qguiplatformplugin_kde