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

Package-Manager: portage-2.2.27

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

12 files changed, 13 insertions, 36 deletions

diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild
index a6ac242dc174..a2e247600568 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild
@@ -42,10 +42,7 @@ RDEPEND="
 	$(add_kdeapps_dep renamedlg-plugins)
 	$(add_kdeapps_dep solid-runtime)
 	crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
-	handbook? ( || (
-		kde-apps/khelpcenter:*
-		kde-plasma/khelpcenter:5[compat(+)]
-	) )
+	handbook? ( kde-apps/khelpcenter:* )
 	minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') )
 	!minimal? (
 		$(add_kdeapps_dep attica)
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index f52cca023dfa..1787006818dc 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1 +1,3 @@
 DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2
+DIST khelpcenter-5.5.5.tar.xz 1810236 SHA256 9790973be800fd52bf441f747cd7e6f19c8e8c3134f6be7ffb5820f48acc0513 SHA512 b2941e1cf6a122c1dad8c81519391879823bd69ddb0b67a5d4cdefe160283c8dd30991fd3dc13693324a8d1539db7f8bd271cef79055b7ab2a73660d252cb6bb WHIRLPOOL f641ed1f986451e07b419811683e98051311c364a1fceb15227d0e23e46e7e3f15683969d827be88e81dde703a896e730defa4dfbe15c6ef27d579d3840b3ef1
+DIST khelpcenter-5.6.2.tar.xz 1722960 SHA256 3cb80cccbb74d7ec7a7462c1a186260bd64c1f2b23cb833c8852ffd9022ba872 SHA512 7dd2d464260995685caea8d62aad2e27add95d6143df0235d352cf8fb5cb741b2e41b339a3fd074aff96bbe5f161d1bd8af576a6426dbde5c74cec7beee9c4b2 WHIRLPOOL 454915a3275b0400b123b4bce0b4b8ad18be71170b2abce18d87d92c634a0d7917d1904d31b995986efcf8ba2d574b772634237c75e7f2d4678a3739ebca67fb
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.5.5.ebuild b/kde-apps/khelpcenter/khelpcenter-5.5.5.ebuild
index 4209eb3729c0..d690b60c9525 100644
--- a/kde-plasma/khelpcenter/khelpcenter-5.5.5.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-5.5.5.ebuild
@@ -9,6 +9,8 @@ inherit kde5
 
 DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
+
 KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
@@ -38,5 +40,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khelpcenter:4
 "
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.6.2.ebuild b/kde-apps/khelpcenter/khelpcenter-5.6.2.ebuild
index 76ae567afe9e..e657f1d621eb 100644
--- a/kde-plasma/khelpcenter/khelpcenter-5.6.2.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-5.6.2.ebuild
@@ -9,6 +9,8 @@ inherit kde5
 
 DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
+
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
@@ -38,5 +40,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khelpcenter:4
 "
diff --git a/kde-base/kdelibs/kdelibs-4.14.16.ebuild b/kde-base/kdelibs/kdelibs-4.14.16.ebuild
index 221ce7119c9d..47b81e50d418 100644
--- a/kde-base/kdelibs/kdelibs-4.14.16.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.16.ebuild
@@ -114,12 +114,7 @@ PDEPEND="
 		$(add_kdeapps_dep kfmclient '' 4.14.3)
 		x11-misc/xdg-utils
 	)
-	handbook? (
-		|| (
-			kde-apps/khelpcenter:*
-			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-base/kdelibs/kdelibs-4.14.18.ebuild b/kde-base/kdelibs/kdelibs-4.14.18.ebuild
index b54244e77831..b44a85f24346 100644
--- a/kde-base/kdelibs/kdelibs-4.14.18.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.18.ebuild
@@ -114,12 +114,7 @@ PDEPEND="
 		$(add_kdeapps_dep kfmclient '' 4.14.3)
 		x11-misc/xdg-utils
 	)
-	handbook? (
-		|| (
-			kde-apps/khelpcenter:*
-			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-base/kdelibs/kdelibs-4.14.8.ebuild b/kde-base/kdelibs/kdelibs-4.14.8.ebuild
index 4fa9bfd4780c..68848971b02d 100644
--- a/kde-base/kdelibs/kdelibs-4.14.8.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.8.ebuild
@@ -110,12 +110,7 @@ PDEPEND="
 		$(add_kdeapps_dep kfmclient '' 4.14.3)
 		x11-misc/xdg-utils
 	)
-	handbook? (
-		|| (
-			kde-apps/khelpcenter:*
-			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/Manifest b/kde-plasma/khelpcenter/Manifest
deleted file mode 100644
index fe44cb30fa54..000000000000
--- a/kde-plasma/khelpcenter/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST khelpcenter-5.5.5.tar.xz 1810236 SHA256 9790973be800fd52bf441f747cd7e6f19c8e8c3134f6be7ffb5820f48acc0513 SHA512 b2941e1cf6a122c1dad8c81519391879823bd69ddb0b67a5d4cdefe160283c8dd30991fd3dc13693324a8d1539db7f8bd271cef79055b7ab2a73660d252cb6bb WHIRLPOOL f641ed1f986451e07b419811683e98051311c364a1fceb15227d0e23e46e7e3f15683969d827be88e81dde703a896e730defa4dfbe15c6ef27d579d3840b3ef1
-DIST khelpcenter-5.6.2.tar.xz 1722960 SHA256 3cb80cccbb74d7ec7a7462c1a186260bd64c1f2b23cb833c8852ffd9022ba872 SHA512 7dd2d464260995685caea8d62aad2e27add95d6143df0235d352cf8fb5cb741b2e41b339a3fd074aff96bbe5f161d1bd8af576a6426dbde5c74cec7beee9c4b2 WHIRLPOOL 454915a3275b0400b123b4bce0b4b8ad18be71170b2abce18d87d92c634a0d7917d1904d31b995986efcf8ba2d574b772634237c75e7f2d4678a3739ebca67fb
diff --git a/kde-plasma/khelpcenter/metadata.xml b/kde-plasma/khelpcenter/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- 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.5.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.5.5.ebuild
index 6467b3620056..2d83837688e3 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.5.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.5.5.ebuild
@@ -20,7 +20,6 @@ RDEPEND="
 	$(add_plasma_dep kdecoration)
 	$(add_plasma_dep kdeplasma-addons)
 	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khelpcenter)
 	$(add_plasma_dep khotkeys)
 	$(add_plasma_dep kinfocenter)
 	$(add_plasma_dep kmenuedit)
@@ -42,6 +41,7 @@ RDEPEND="
 	$(add_plasma_dep powerdevil)
 	$(add_plasma_dep systemsettings)
 	$(add_plasma_dep user-manager)
+	$(add_kdeapps_dep khelpcenter '' 5.5.5)
 	bluetooth? (
 		$(add_plasma_dep bluedevil)
 	)
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.6.2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.6.2.ebuild
index 06d0bc270bb0..64a091dd7a6f 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.6.2.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.6.2.ebuild
@@ -51,7 +51,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/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
index e773c0276bf6..4a91b1ce33ee 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -1,2 +1,3 @@
 move dev-perl/math-pari dev-perl/Math-Pari
 move kde-base/khelpcenter kde-apps/khelpcenter
+move kde-plasma/khelpcenter kde-apps/khelpcenter