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

[Johannes Huber]

commit:     04985ea78e6be429f4131c4c9b560c31b8c16615
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 18:51:57 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 18:51:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04985ea7

kde-base/khotkeys -> kde-plasma/khotkeys

 kde-apps/kcontrol/kcontrol-16.04.3.ebuild                    | 2 +-
 kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild | 2 +-
 kde-base/khotkeys/Manifest                                   | 1 -
 kde-base/khotkeys/metadata.xml                               | 8 --------
 kde-plasma/khotkeys/Manifest                                 | 1 +
 {kde-base => kde-plasma}/khotkeys/khotkeys-4.11.22.ebuild    | 4 ++--
 kde-plasma/khotkeys/khotkeys-5.7.5.ebuild                    | 2 +-
 kde-plasma/khotkeys/khotkeys-5.8.3.ebuild                    | 2 +-
 kde-plasma/kmenuedit/kmenuedit-4.11.22.ebuild                | 2 +-
 profiles/updates/4Q-2016                                     | 1 +
 10 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/kde-apps/kcontrol/kcontrol-16.04.3.ebuild b/kde-apps/kcontrol/kcontrol-16.04.3.ebuild
index 2f6a34f..d957db1 100644
--- a/kde-apps/kcontrol/kcontrol-16.04.3.ebuild
+++ b/kde-apps/kcontrol/kcontrol-16.04.3.ebuild
@@ -14,7 +14,7 @@ IUSE="debug"
 
 RDEPEND="
 	$(add_kdeapps_dep zeroconf-ioslave)
-	|| ( $(add_kdebase_dep khotkeys '' 4.11) kde-plasma/khotkeys )
+	|| ( kde-plasma/khotkeys:4 kde-plasma/khotkeys:5 )
 "
 
 src_prepare() {

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 133d1fb..be8a632 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
@@ -76,7 +76,6 @@ RDEPEND="
 		$(add_kdebase_dep kcheckpass)
 		$(add_kdebase_dep kdebase-cursors)
 		$(add_kdebase_dep kephal)
-		$(add_kdebase_dep khotkeys)
 		$(add_kdebase_dep kinfocenter)
 		$(add_kdebase_dep klipper)
 		$(add_kdebase_dep kstyles)
@@ -89,6 +88,7 @@ RDEPEND="
 		$(add_kdebase_dep libtaskmanager)
 		$(add_kdebase_dep qguiplatformplugin_kde)
 		$(add_kdebase_dep solid-actions-kcm)
+		kde-plasma/khotkeys:4
 		kde-plasma/kmenuedit:4
 		kde-plasma/kwrited:4
 		kde-plasma/powerdevil:4

diff --git a/kde-base/khotkeys/Manifest b/kde-base/khotkeys/Manifest
deleted file mode 100644
index db5163f..00000000
--- a/kde-base/khotkeys/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/khotkeys/metadata.xml b/kde-base/khotkeys/metadata.xml
deleted file mode 100644
index 0cf5922..00000000
--- a/kde-base/khotkeys/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>kde@g.o</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index b96e23d..9de01fa 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,3 @@
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST khotkeys-5.7.5.tar.xz 604704 SHA256 efca5ead90388e3ef8ad0612e7c035414340da5273dd486918af25b3e2fca430 SHA512 c6ce53a05277dc8ab579b75cd4b93758b789881e7918a18f44f8c9dbdfc4f8b242e6fd7f5c9e5751479e04858671adbbd50af5e4985eba242a9f8cab487ced6a WHIRLPOOL 09dc9022463eda08a2608325e282a70d9f685e5e138684e14f99bc35e8a8d48ca6829ae1ff274f4bfcfe1ca8f73b0c0aceb16e0214befe9dd6a33ecf3deeebeb
 DIST khotkeys-5.8.3.tar.xz 604784 SHA256 c97f533f64d500ed3eb3b0a2bd88f6c681d3f9a8e3b5a7d3f910a39157d31c53 SHA512 492d2157741ce0d51a49f79f3c3efe5c748f3c0405d19332f24f9e6757b17e29915e0c2e5f3019fe52d4511d7f3588c5b32e9bf8026eba6ed61ad772025f6038 WHIRLPOOL fc9a16f71db33e13734028070740ae46f9619e8c7e9e1a600d0e3f17a52beed11c9f8c75c38d87573783468d45a68aa59485bbf657909ed3593f4039726b145c

diff --git a/kde-base/khotkeys/khotkeys-4.11.22.ebuild b/kde-plasma/khotkeys/khotkeys-4.11.22.ebuild
similarity index 78%
rename from kde-base/khotkeys/khotkeys-4.11.22.ebuild
rename to kde-plasma/khotkeys/khotkeys-4.11.22.ebuild
index fe45499..f884f8f 100644
--- a/kde-base/khotkeys/khotkeys-4.11.22.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-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="KDE: hotkey daemon"
+DESCRIPTION="KDE Plasma workspace hotkey module"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 

diff --git a/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild
index bef7ac9..9924b0c 100644
--- a/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
 	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khotkeys:4
+	!kde-plasma/khotkeys:4
 	!kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild
index 6d2e892..2f45d76 100644
--- a/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
 	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khotkeys:4
+	!kde-plasma/khotkeys:4
 	!kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-plasma/kmenuedit/kmenuedit-4.11.22.ebuild b/kde-plasma/kmenuedit/kmenuedit-4.11.22.ebuild
index 24d766a..6e2286e 100644
--- a/kde-plasma/kmenuedit/kmenuedit-4.11.22.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-4.11.22.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep khotkeys)
+	kde-plasma/khotkeys:4
 "
 DEPEND=${RDEPEND}
 

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 00282ef..d58d527 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -12,3 +12,4 @@ move kde-misc/kde-gtk-config kde-plasma/kde-gtk-config
 move kde-base/powerdevil kde-plasma/powerdevil
 move kde-base/kwrited kde-plasma/kwrited
 move kde-base/kmenuedit kde-plasma/kmenuedit
+move kde-base/khotkeys kde-plasma/khotkeys