commit: a929f20d8736a062d52645a5a4f48fd6e17e4522
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Apr 4 00:41:57 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:06:21 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a929f20d
kde-plasma/khelpcenter -> kde-apps/khelpcenter
Package-Manager: portage-2.2.27
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
.../.kde-plasma-live/kde-plasma-live | 1 -
.../package.accept_keywords/kde-4.14.keywords | 2 +-
.../kde-plasma-5.5.keywords | 1 -
.../kde-plasma-5.6.keywords | 1 -
.../kde-plasma-live.keywords | 1 -
Documentation/package.mask/kde-4.14 | 2 +-
Documentation/package.mask/kde-plasma-5.5 | 1 -
Documentation/package.mask/kde-plasma-5.6 | 1 -
Documentation/package.mask/kde-plasma-live | 1 -
Documentation/package.unmask/kde-4.14 | 2 +-
Documentation/package.unmask/kde-plasma-5.5 | 1 -
Documentation/package.unmask/kde-plasma-5.6 | 1 -
Documentation/package.unmask/kde-plasma-live | 1 -
kde-base/kdelibs/kdelibs-4.9999.ebuild | 8 +---
.../khelpcenter/khelpcenter-5.6.49.9999.ebuild | 42 ---------------------
kde-plasma/khelpcenter/khelpcenter-9999.ebuild | 44 ----------------------
kde-plasma/khelpcenter/metadata.xml | 8 ----
.../plasma-meta/plasma-meta-5.6.49.9999.ebuild | 2 +-
kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 2 +-
profiles/updates/2Q-2016 | 2 +
sets/kde-plasma | 1 -
sets/kde-plasma-5.5 | 1 -
sets/kde-plasma-5.6 | 1 -
sets/kde-plasma-live | 1 -
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 1db0405..55da2c7 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 6de1456..dd5d40b 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 4ce3232..d373397 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 f087724..44c5a46 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 8d7658b..2964bc9 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 620d476..c64e670 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 5f7d587..21e34c5 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 0d0cb60..fbfada0 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 3a65f20..fb6e2ae 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 3a90a8e..55233d0 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 9f3b0e7..b645a53 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 0331771..29f0679 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 3a65f20..fb6e2ae 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 c868b9f..e97d9bd 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 53948f1..0000000
--- 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 067d716..0000000
--- 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 2fdbf33..0000000
--- 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>[email protected]</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 f6b33dc..2a6f33f 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 f6b33dc..9c4ef9b 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 0000000..9c080b6
--- /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 b9e2201..64ee088 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 4a43c86..b891246 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 59836c9..dd05104 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 2fb0049..21d9576 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
