[gentoo-commits] repo/gentoo:master commit in: kde-base/kinfocenter/, kde-plasma/kinfocenter/, profiles/updates/, ...

[Johannes Huber]

commit:     f8905348859f69d372ba719bbf91d4b5babb7958
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 19:13:07 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 19:13:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8905348

kde-base/kinfocenter -> kde-plasma/kinfocenter

 kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild    | 2 +-
 kde-base/kinfocenter/Manifest                                   | 1 -
 kde-base/kinfocenter/metadata.xml                               | 8 --------
 kde-plasma/kinfocenter/Manifest                                 | 1 +
 {kde-base => kde-plasma}/kinfocenter/kinfocenter-4.11.22.ebuild | 4 ++--
 kde-plasma/kinfocenter/kinfocenter-5.7.5.ebuild                 | 2 +-
 kde-plasma/kinfocenter/kinfocenter-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 be8a632..8cd9e1e 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 kinfocenter)
 		$(add_kdebase_dep klipper)
 		$(add_kdebase_dep kstyles)
 		$(add_kdebase_dep ksysguard)
@@ -89,6 +88,7 @@ RDEPEND="
 		$(add_kdebase_dep qguiplatformplugin_kde)
 		$(add_kdebase_dep solid-actions-kcm)
 		kde-plasma/khotkeys:4
+		kde-plasma/kinfocenter:4
 		kde-plasma/kmenuedit:4
 		kde-plasma/kwrited:4
 		kde-plasma/powerdevil:4

diff --git a/kde-base/kinfocenter/Manifest b/kde-base/kinfocenter/Manifest
deleted file mode 100644
index db5163f..00000000
--- a/kde-base/kinfocenter/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/kinfocenter/metadata.xml b/kde-base/kinfocenter/metadata.xml
deleted file mode 100644
index 0cf5922..00000000
--- a/kde-base/kinfocenter/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/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index ed6825c..260f55f 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,4 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST kinfocenter-5.7.5.tar.xz 1248860 SHA256 f9cdf5575d332c4bd7f46238d3cd957a27b534a0e163d58fc7844bbc65115238 SHA512 3e08f2782004b56440395a5643f42b56a4adf6380eab15711a2397d20539e9116724f846f93a0db8bea9526f76db8c656fbda750e9742f5c9e0e33c060f0de1d WHIRLPOOL 5444078909e720501042aafc5420f60a2611d95f7cf578eee638d3f9a1d048830fcc2b66b607afa2a1c098a7cee70ea32eacb7e7604ccd7654ec0aca0a871618
 DIST kinfocenter-5.8.3.tar.xz 1250572 SHA256 fb06f1eb28aab68a4659b999a6b991ea28165cc25c1ca2321515c25cc2f349c3 SHA512 849f7ae522ff5b195e4f983c1f3b7c9ba980522dc1836a1a80755ddd93dca441552c53a088019d3725ec44bbf07c94269d7be1a466528e8fb268ff93bb6a714b WHIRLPOOL 44ee4424d4fe107cd1c62fa91463c88b720ffb489785d99ade7108e921b579c5f252050fab9eb215f14bd37df537d54f0797b10a570ceffb5e2c8ae66e6909ef

diff --git a/kde-base/kinfocenter/kinfocenter-4.11.22.ebuild b/kde-plasma/kinfocenter/kinfocenter-4.11.22.ebuild
similarity index 84%
rename from kde-base/kinfocenter/kinfocenter-4.11.22.ebuild
rename to kde-plasma/kinfocenter/kinfocenter-4.11.22.ebuild
index ba2fd4f..e2737a8 100644
--- a/kde-base/kinfocenter/kinfocenter-4.11.22.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-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$
 
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
-DESCRIPTION="The KDE Info Center"
+DESCRIPTION="A utility that provides information about a computer system"
 HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug ieee1394"

diff --git a/kde-plasma/kinfocenter/kinfocenter-5.7.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.7.5.ebuild
index dd35b4b..d53aa26 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.7.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.7.5.ebuild
@@ -52,7 +52,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	!kde-base/kcontrol:4
-	!kde-base/kinfocenter:4
+	!kde-plasma/kinfocenter:4
 	!kde-misc/about-distro
 "
 

diff --git a/kde-plasma/kinfocenter/kinfocenter-5.8.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.8.3.ebuild
index cc6f217..c904881 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.8.3.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.8.3.ebuild
@@ -52,7 +52,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	!kde-base/kcontrol:4
-	!kde-base/kinfocenter:4
+	!kde-plasma/kinfocenter:4
 	!kde-misc/about-distro
 "
 

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index d58d527..32ae1ee 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -13,3 +13,4 @@ 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
+move kde-base/kinfocenter kde-plasma/kinfocenter