kde-plasma/khelpcenter -> kde-apps/khelpcenter

Package-Manager: portage-2.2.27

Signed-off-by: Johannes Huber <johu@gentoo.org>

24 files changed, 8 insertions, 120 deletions

diff --git a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
index 1db04057aba..55da2c778bd 100644
--- a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
+++ b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
@@ -9,7 +9,6 @@
 ~kde-plasma/kdecoration-9999 **
 ~kde-plasma/kdeplasma-addons-9999 **
 ~kde-plasma/kgamma-9999 **
-~kde-plasma/khelpcenter-9999 **
 ~kde-plasma/khotkeys-9999 **
 ~kde-plasma/kinfocenter-9999 **
 ~kde-plasma/kmenuedit-9999 **
diff --git a/Documentation/package.accept_keywords/kde-4.14.keywords b/Documentation/package.accept_keywords/kde-4.14.keywords
index 6de14563cb2..dd5d40b45f1 100644
--- a/Documentation/package.accept_keywords/kde-4.14.keywords
+++ b/Documentation/package.accept_keywords/kde-4.14.keywords
@@ -54,7 +54,7 @@
 <kde-apps/keditfiletype-4.14.50
 <kde-apps/kfile-4.14.50
 <kde-apps/kglobalaccel-4.14.50
-<kde-base/khelpcenter-4.14.50
+<kde-apps/khelpcenter-4.14.50
 <kde-apps/kiconfinder-4.14.50
 <kde-apps/kimgio-4.14.50
 <kde-apps/kioclient-4.14.50
diff --git a/Documentation/package.accept_keywords/kde-plasma-5.5.keywords b/Documentation/package.accept_keywords/kde-plasma-5.5.keywords
index 4ce32329faa..d3733974e36 100644
--- a/Documentation/package.accept_keywords/kde-plasma-5.5.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-5.5.keywords
@@ -9,7 +9,6 @@
 <kde-plasma/kdecoration-5.5.50:5
 <kde-plasma/kdeplasma-addons-5.5.50:5
 <kde-plasma/kgamma-5.5.50:5
-<kde-plasma/khelpcenter-5.5.50:5
 <kde-plasma/khotkeys-5.5.50:5
 <kde-plasma/kinfocenter-5.5.50:5
 <kde-plasma/kmenuedit-5.5.50:5
diff --git a/Documentation/package.accept_keywords/kde-plasma-5.6.keywords b/Documentation/package.accept_keywords/kde-plasma-5.6.keywords
index f08772490f6..44c5a46a352 100644
--- a/Documentation/package.accept_keywords/kde-plasma-5.6.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-5.6.keywords
@@ -12,7 +12,6 @@
 <kde-plasma/kdecoration-5.6.50:5
 <kde-plasma/kdeplasma-addons-5.6.50:5
 <kde-plasma/kgamma-5.6.50:5
-<kde-plasma/khelpcenter-5.6.50:5
 <kde-plasma/khotkeys-5.6.50:5
 <kde-plasma/kinfocenter-5.6.50:5
 <kde-plasma/kmenuedit-5.6.50:5
diff --git a/Documentation/package.accept_keywords/kde-plasma-live.keywords b/Documentation/package.accept_keywords/kde-plasma-live.keywords
index 8d7658b4424..2964bc9f1af 100644
--- a/Documentation/package.accept_keywords/kde-plasma-live.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-live.keywords
@@ -12,7 +12,6 @@
 ~kde-plasma/kdecoration-9999 **
 ~kde-plasma/kdeplasma-addons-9999 **
 ~kde-plasma/kgamma-9999 **
-~kde-plasma/khelpcenter-9999 **
 ~kde-plasma/khotkeys-9999 **
 ~kde-plasma/kinfocenter-9999 **
 ~kde-plasma/kmenuedit-9999 **
diff --git a/Documentation/package.mask/kde-4.14 b/Documentation/package.mask/kde-4.14
index 620d476e6df..c64e6707cae 100644
--- a/Documentation/package.mask/kde-4.14
+++ b/Documentation/package.mask/kde-4.14
@@ -54,7 +54,7 @@
 <kde-apps/keditfiletype-4.14.50
 <kde-apps/kfile-4.14.50
 <kde-apps/kglobalaccel-4.14.50
->=kde-base/khelpcenter-4.14
+<kde-apps/khelpcenter-4.14.50
 <kde-apps/kiconfinder-4.14.50
 <kde-apps/kimgio-4.14.50
 <kde-apps/kioclient-4.14.50
diff --git a/Documentation/package.mask/kde-plasma-5.5 b/Documentation/package.mask/kde-plasma-5.5
index 5f7d5870cb9..21e34c50442 100644
--- a/Documentation/package.mask/kde-plasma-5.5
+++ b/Documentation/package.mask/kde-plasma-5.5
@@ -9,7 +9,6 @@
 >=kde-plasma/kdecoration-5.5:5
 >=kde-plasma/kdeplasma-addons-5.5:5
 >=kde-plasma/kgamma-5.5:5
->=kde-plasma/khelpcenter-5.5:5
 >=kde-plasma/khotkeys-5.5:5
 >=kde-plasma/kinfocenter-5.5:5
 >=kde-plasma/kmenuedit-5.5:5
diff --git a/Documentation/package.mask/kde-plasma-5.6 b/Documentation/package.mask/kde-plasma-5.6
index 0d0cb6063fb..fbfada0e92d 100644
--- a/Documentation/package.mask/kde-plasma-5.6
+++ b/Documentation/package.mask/kde-plasma-5.6
@@ -12,7 +12,6 @@
 >=kde-plasma/kdecoration-5.6:5
 >=kde-plasma/kdeplasma-addons-5.6:5
 >=kde-plasma/kgamma-5.6:5
->=kde-plasma/khelpcenter-5.6:5
 >=kde-plasma/khotkeys-5.6:5
 >=kde-plasma/kinfocenter-5.6:5
 >=kde-plasma/kmenuedit-5.6:5
diff --git a/Documentation/package.mask/kde-plasma-live b/Documentation/package.mask/kde-plasma-live
index 3a65f20fa22..fb6e2ae548d 100644
--- a/Documentation/package.mask/kde-plasma-live
+++ b/Documentation/package.mask/kde-plasma-live
@@ -12,7 +12,6 @@
 ~kde-plasma/kdecoration-9999
 ~kde-plasma/kdeplasma-addons-9999
 ~kde-plasma/kgamma-9999
-~kde-plasma/khelpcenter-9999
 ~kde-plasma/khotkeys-9999
 ~kde-plasma/kinfocenter-9999
 ~kde-plasma/kmenuedit-9999
diff --git a/Documentation/package.unmask/kde-4.14 b/Documentation/package.unmask/kde-4.14
index 3a90a8e5d87..55233d0760e 100644
--- a/Documentation/package.unmask/kde-4.14
+++ b/Documentation/package.unmask/kde-4.14
@@ -54,7 +54,7 @@
 <kde-apps/keditfiletype-4.14.50
 <kde-apps/kfile-4.14.50
 <kde-apps/kglobalaccel-4.14.50
-<kde-base/khelpcenter-4.14.50
+<kde-apps/khelpcenter-4.14.50
 <kde-apps/kiconfinder-4.14.50
 <kde-apps/kimgio-4.14.50
 <kde-apps/kioclient-4.14.50
diff --git a/Documentation/package.unmask/kde-plasma-5.5 b/Documentation/package.unmask/kde-plasma-5.5
index 9f3b0e7ce54..b645a5390ec 100644
--- a/Documentation/package.unmask/kde-plasma-5.5
+++ b/Documentation/package.unmask/kde-plasma-5.5
@@ -9,7 +9,6 @@
 <kde-plasma/kdecoration-5.5.50:5
 <kde-plasma/kdeplasma-addons-5.5.50:5
 <kde-plasma/kgamma-5.5.50:5
-<kde-plasma/khelpcenter-5.5.50:5
 <kde-plasma/khotkeys-5.5.50:5
 <kde-plasma/kinfocenter-5.5.50:5
 <kde-plasma/kmenuedit-5.5.50:5
diff --git a/Documentation/package.unmask/kde-plasma-5.6 b/Documentation/package.unmask/kde-plasma-5.6
index 03317716d72..29f06795acc 100644
--- a/Documentation/package.unmask/kde-plasma-5.6
+++ b/Documentation/package.unmask/kde-plasma-5.6
@@ -12,7 +12,6 @@
 <kde-plasma/kdecoration-5.6.50:5
 <kde-plasma/kdeplasma-addons-5.6.50:5
 <kde-plasma/kgamma-5.6.50:5
-<kde-plasma/khelpcenter-5.6.50:5
 <kde-plasma/khotkeys-5.6.50:5
 <kde-plasma/kinfocenter-5.6.50:5
 <kde-plasma/kmenuedit-5.6.50:5
diff --git a/Documentation/package.unmask/kde-plasma-live b/Documentation/package.unmask/kde-plasma-live
index 3a65f20fa22..fb6e2ae548d 100644
--- a/Documentation/package.unmask/kde-plasma-live
+++ b/Documentation/package.unmask/kde-plasma-live
@@ -12,7 +12,6 @@
 ~kde-plasma/kdecoration-9999
 ~kde-plasma/kdeplasma-addons-9999
 ~kde-plasma/kgamma-9999
-~kde-plasma/khelpcenter-9999
 ~kde-plasma/khotkeys-9999
 ~kde-plasma/kinfocenter-9999
 ~kde-plasma/kmenuedit-9999
diff --git a/kde-base/kdelibs/kdelibs-4.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9999.ebuild
index c868b9fb5dd..e97d9bdf6d0 100644
--- a/kde-base/kdelibs/kdelibs-4.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.9999.ebuild
@@ -113,13 +113,7 @@ PDEPEND="
 		$(add_kdeapps_dep kfmclient '' 4.14.3)
 		x11-misc/xdg-utils
 	)
-	handbook? (
-		|| (
-			$(add_kdebase_dep khelpcenter '' 4.14.3)
-			kde-apps/khelpcenter:5
-			kde-plasma/khelpcenter:5[compat(+)]
-		)
-	)
+	handbook? ( kde-apps/khelpcenter:* )
 	policykit? ( || (
 		>=sys-auth/polkit-kde-agent-0.99
 		kde-plasma/polkit-kde-agent
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.6.49.9999.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.6.49.9999.ebuild
deleted file mode 100644
index 53948f173e1..00000000000
--- a/kde-plasma/khelpcenter/khelpcenter-5.6.49.9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="The KDE Help Center"
-HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khelpcenter:4
-"
diff --git a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild b/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
deleted file mode 100644
index 067d7165dd4..00000000000
--- a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="The KDE Help Center"
-HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxml2
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khelpcenter:4
-"
diff --git a/kde-plasma/khelpcenter/metadata.xml b/kde-plasma/khelpcenter/metadata.xml
deleted file mode 100644
index 2fdbf33d963..00000000000
--- a/kde-plasma/khelpcenter/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@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
index f6b33dc88fb..2a6f33f279c 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.6.49.9999.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 		$(add_plasma_dep breeze-gtk)
 		$(add_plasma_dep kde-gtk-config)
 	)
-	handbook? ( || ( $(add_kdeapps_dep khelpcenter) $(add_plasma_dep khelpcenter) ) )
+	handbook? ( $(add_kdeapps_dep khelpcenter '' '5.6.2') )
 	mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
 	networkmanager? ( $(add_plasma_dep plasma-nm) )
 	pam? ( $(add_plasma_dep kwallet-pam) )
diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
index f6b33dc88fb..9c4ef9b9665 100644
--- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 		$(add_plasma_dep breeze-gtk)
 		$(add_plasma_dep kde-gtk-config)
 	)
-	handbook? ( || ( $(add_kdeapps_dep khelpcenter) $(add_plasma_dep khelpcenter) ) )
+	handbook? ( $(add_kdeapps_dep khelpcenter) )
 	mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
 	networkmanager? ( $(add_plasma_dep plasma-nm) )
 	pam? ( $(add_plasma_dep kwallet-pam) )
diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
new file mode 100644
index 00000000000..9c080b6d080
--- /dev/null
+++ b/profiles/updates/2Q-2016
@@ -0,0 +1,2 @@
+move kde-plasma/khelpcenter kde-apps/khelpcenter
+move kde-base/khelpcenter kde-apps/khelpcenter
diff --git a/sets/kde-plasma b/sets/kde-plasma
index b9e2201bbb0..64ee088088f 100644
--- a/sets/kde-plasma
+++ b/sets/kde-plasma
@@ -7,7 +7,6 @@ kde-plasma/kde-gtk-config:5
 kde-plasma/kdecoration:5
 kde-plasma/kdeplasma-addons:5
 kde-plasma/kgamma:5
-kde-plasma/khelpcenter:5
 kde-plasma/khotkeys:5
 kde-plasma/kinfocenter:5
 kde-plasma/kmenuedit:5
diff --git a/sets/kde-plasma-5.5 b/sets/kde-plasma-5.5
index 4a43c86de45..b891246ccae 100644
--- a/sets/kde-plasma-5.5
+++ b/sets/kde-plasma-5.5
@@ -6,7 +6,6 @@
 <kde-plasma/kdecoration-5.5.50:5
 <kde-plasma/kdeplasma-addons-5.5.50:5
 <kde-plasma/kgamma-5.5.50:5
-<kde-plasma/khelpcenter-5.5.50:5
 <kde-plasma/khotkeys-5.5.50:5
 <kde-plasma/kinfocenter-5.5.50:5
 <kde-plasma/kmenuedit-5.5.50:5
diff --git a/sets/kde-plasma-5.6 b/sets/kde-plasma-5.6
index 59836c902ca..dd05104df1b 100644
--- a/sets/kde-plasma-5.6
+++ b/sets/kde-plasma-5.6
@@ -9,7 +9,6 @@
 <kde-plasma/kdecoration-5.6.50:5
 <kde-plasma/kdeplasma-addons-5.6.50:5
 <kde-plasma/kgamma-5.6.50:5
-<kde-plasma/khelpcenter-5.6.50:5
 <kde-plasma/khotkeys-5.6.50:5
 <kde-plasma/kinfocenter-5.6.50:5
 <kde-plasma/kmenuedit-5.6.50:5
diff --git a/sets/kde-plasma-live b/sets/kde-plasma-live
index 2fb0049492f..21d95768995 100644
--- a/sets/kde-plasma-live
+++ b/sets/kde-plasma-live
@@ -9,7 +9,6 @@
 ~kde-plasma/kdecoration-9999
 ~kde-plasma/kdeplasma-addons-9999
 ~kde-plasma/kgamma-9999
-~kde-plasma/khelpcenter-9999
 ~kde-plasma/khotkeys-9999
 ~kde-plasma/kinfocenter-9999
 ~kde-plasma/kmenuedit-9999