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

[Johannes Huber]

commit:     c74362d2738f10ff1968d24e86814723efec7e3f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 18:30:07 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 18:30:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74362d2

kde-base/kmenuedit -> kde-plasma/kmenuedit

 kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild | 2 +-
 kde-base/kmenuedit/Manifest                                  | 1 -
 kde-base/kmenuedit/metadata.xml                              | 8 --------
 kde-plasma/kmenuedit/Manifest                                | 1 +
 {kde-base => kde-plasma}/kmenuedit/kmenuedit-4.11.22.ebuild  | 4 ++--
 kde-plasma/kmenuedit/kmenuedit-5.7.5.ebuild                  | 2 +-
 kde-plasma/kmenuedit/kmenuedit-5.8.3.ebuild                  | 2 +-
 profiles/updates/4Q-2016                                     | 1 +
 8 files changed, 7 insertions(+), 14 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 da627b7..133d1fb 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
@@ -79,7 +79,6 @@ RDEPEND="
 		$(add_kdebase_dep khotkeys)
 		$(add_kdebase_dep kinfocenter)
 		$(add_kdebase_dep klipper)
-		$(add_kdebase_dep kmenuedit)
 		$(add_kdebase_dep kstyles)
 		$(add_kdebase_dep ksysguard)
 		$(add_kdebase_dep ksystraycmd)
@@ -90,6 +89,7 @@ RDEPEND="
 		$(add_kdebase_dep libtaskmanager)
 		$(add_kdebase_dep qguiplatformplugin_kde)
 		$(add_kdebase_dep solid-actions-kcm)
+		kde-plasma/kmenuedit:4
 		kde-plasma/kwrited:4
 		kde-plasma/powerdevil:4
 	)

diff --git a/kde-base/kmenuedit/Manifest b/kde-base/kmenuedit/Manifest
deleted file mode 100644
index db5163f..00000000
--- a/kde-base/kmenuedit/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/kmenuedit/metadata.xml b/kde-base/kmenuedit/metadata.xml
deleted file mode 100644
index 0cf5922..00000000
--- a/kde-base/kmenuedit/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/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index df02c78..bb285f0 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,3 @@
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST kmenuedit-5.7.5.tar.xz 652176 SHA256 a12f6160ba7b115cc5a23ef1e1579d742622e92e307ecf3ad13fad0d6ef42dd6 SHA512 10cf27a3addd360170f0179cb4df4f43b3b9abb6161f46eed1d4b4674be137e0bf1299ad80c7ea4abe247eba671eafcf07110406a37704ce0bfdeaeae3fffc36 WHIRLPOOL cffa0d38eaa9065bd00358ac3c0cac3d5898d6016bf99f8e768bfc35b4aadd1f4e5bb1f8057bdffb2c21c1ad1fff331eab5e2681ed504e2ecedbe84fa011c220
 DIST kmenuedit-5.8.3.tar.xz 652360 SHA256 8759bcd45ba0e4a8698ae33e975bc38a247c1a29b01fa49a45a1211e4589f21b SHA512 605495b5e85641eb2615443866d570d8ddc7361caa5e9068a8f08f89a4dabebf09c716d1345eb1e54ea30a3a8384617f0c20819a489a34370e9c5641a4e6f5d6 WHIRLPOOL ba87d26439da47bac4ada480ead7ff5534c896adff70469a879be291cc886f88d60353b4b2b294214e8c5a5668b1809cd6c49518308caa9e76a7ba330bb6f522

diff --git a/kde-base/kmenuedit/kmenuedit-4.11.22.ebuild b/kde-plasma/kmenuedit/kmenuedit-4.11.22.ebuild
similarity index 87%
rename from kde-base/kmenuedit/kmenuedit-4.11.22.ebuild
rename to kde-plasma/kmenuedit/kmenuedit-4.11.22.ebuild
index add9af7..24d766a 100644
--- a/kde-base/kmenuedit/kmenuedit-4.11.22.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-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$
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
 inherit kde4-meta
 
-DESCRIPTION="KDE menu editor"
+DESCRIPTION="KDE Plasma menu editor"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 

diff --git a/kde-plasma/kmenuedit/kmenuedit-5.7.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.7.5.ebuild
index 417092a..7f6ff0a 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.7.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.7.5.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	hotkeys? ( $(add_plasma_dep khotkeys) )
 "
 RDEPEND="${DEPEND}
-	!kde-base/kmenuedit:4
+	!kde-plasma/kmenuedit:4
 "
 
 src_configure() {

diff --git a/kde-plasma/kmenuedit/kmenuedit-5.8.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.8.3.ebuild
index 7efa299..d3331a9 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.8.3.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.8.3.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	hotkeys? ( $(add_plasma_dep khotkeys) )
 "
 RDEPEND="${DEPEND}
-	!kde-base/kmenuedit:4
+	!kde-plasma/kmenuedit:4
 "
 
 src_configure() {

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 43d9884..00282ef 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -11,3 +11,4 @@ move kde-misc/milou kde-plasma/milou
 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