Make khelpcenter dep optional again (depends on +handbook, enabled by default everywhere)

11 files changed, 25 insertions, 20 deletions

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 89019b91d36..9ce317333cb 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -20,6 +20,11 @@ if [[ -z ${KMNAME} ]]; then
 	die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
 fi
 
+# Add khelpcenter dependency when installing handbooks
+if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then
+       RDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter) )"
+fi
+
 # Add dependencies that all packages in a certain module share.
 case ${KMNAME} in
 	kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
diff --git a/kde-base/kdebase-runtime-meta/Manifest b/kde-base/kdebase-runtime-meta/Manifest
index 1bcbf65c09e..cdef4072cd7 100644
--- a/kde-base/kdebase-runtime-meta/Manifest
+++ b/kde-base/kdebase-runtime-meta/Manifest
@@ -1,5 +1,5 @@
-EBUILD kdebase-runtime-meta-4.3.77.ebuild 1531 RMD160 ca66113172e16a0c208361ed9c1f4528a93b69d6 SHA1 740535c891afb2aac01bca351d3be54e9229d07f SHA256 dd98b6f6340fe682915953db338c75069240c4990416307abc584e984c3308d8
-EBUILD kdebase-runtime-meta-4.3.80.ebuild 1468 RMD160 6dcd001943213dcb8f650f86e7568ceba106d047 SHA1 3a5201b43aa32dbed1c55a4a3e254a45a40cdfef SHA256 ccbe59aa27430d4348cc796f8f202060abfa926c9c3972b40861e615a64439f5
-EBUILD kdebase-runtime-meta-4.3.9999.ebuild 1489 RMD160 51e446122da3c3c8ce75a6108884765870315ba5 SHA1 f5dea0dd37bd577551c932a025f196b06f8109ca SHA256 c62bc14e4c5de8cbf899a83bb016685526de9f0baf64afbe1d84501ea52b767a
-EBUILD kdebase-runtime-meta-9999.ebuild 1420 RMD160 942a65f3605c54642a59ea68187415355d971887 SHA1 a024e7613c853a9f390187e01c0830b9fc326cfb SHA256 78db8574d47afb3fed58e2e38d972f2210d7b2fb48e57b1c79827560ba4a3cc3
+EBUILD kdebase-runtime-meta-4.3.77.ebuild 1555 RMD160 3f3d58292ba7facf8ae7446801916e89311a0195 SHA1 94920d1ead749ecd1eda07307b2a53074524feb8 SHA256 5fecba95866bd303b1b349b825bbc0efa2436243a5191ef2045fff070ed31f71
+EBUILD kdebase-runtime-meta-4.3.80.ebuild 1492 RMD160 50252886e7b90bcd2e210bdbd2abcbc683089294 SHA1 c5f68718aeda17062a0244bea78c9d560eedbfc6 SHA256 e2febea937e6ebfc87c644bef9bc07c32c197c0c68b9bfcdf0e5343131199056
+EBUILD kdebase-runtime-meta-4.3.9999.ebuild 1513 RMD160 6ea6d28e9ad4135f4c8eb974a4e5365919f0b36d SHA1 bf52226f3c90cd0dbc18db1bbbcc9db0dc50b5ba SHA256 ca65c819686ba4fc831f09424509c246755cb7f5bfd22bbe016bbc46578b7ba1
+EBUILD kdebase-runtime-meta-9999.ebuild 1444 RMD160 7c530819c1b2e50b8242f4f7107c14a34c8f34e7 SHA1 c6da51d07a70f2c816d5bbc805940b68b2f516f7 SHA256 be07dd04f1a392618b47d110b66c65dc3600c64151af29a21448a181caf08768
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.77.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.77.ebuild
index 7ecbea0e55c..ba7c48d7c6c 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.77.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.77.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="4.4"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="kdeprefix +semantic-desktop"
+IUSE="+handbook kdeprefix +semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep drkonqi)
@@ -27,7 +27,6 @@ RDEPEND="
 	$(add_kdebase_dep keditfiletype)
 	$(add_kdebase_dep kfile)
 	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep khelpcenter)
 	$(add_kdebase_dep kiconfinder)
 	$(add_kdebase_dep kioclient)
 	$(add_kdebase_dep kmimetypefinder)
@@ -47,6 +46,7 @@ RDEPEND="
 	$(add_kdebase_dep solid-hardware)
 	$(add_kdebase_dep solidautoeject)
 	$(add_kdebase_dep soliduiserver)
+	handbook? ( $(add_kdebase_dep khelpcenter) )
 	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.80.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.80.ebuild
index 090ee08e460..58c4e481d45 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.80.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.80.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="4.4"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="kdeprefix +semantic-desktop"
+IUSE="+handbook kdeprefix +semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep drkonqi)
@@ -27,7 +27,6 @@ RDEPEND="
 	$(add_kdebase_dep keditfiletype)
 	$(add_kdebase_dep kfile)
 	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep khelpcenter)
 	$(add_kdebase_dep kiconfinder)
 	$(add_kdebase_dep kioclient)
 	$(add_kdebase_dep kmimetypefinder)
@@ -45,6 +44,7 @@ RDEPEND="
 	$(add_kdebase_dep plasma-runtime)
 	$(add_kdebase_dep renamedlg-plugins)
 	$(add_kdebase_dep solid-runtime)
+	handbook? ( $(add_kdebase_dep khelpcenter) )
 	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.9999.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.9999.ebuild
index bc9cf45b7ce..dd21b6ad98f 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.9999.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.3.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="4.3"
 KEYWORDS=""
-IUSE="kdeprefix +semantic-desktop"
+IUSE="+handbook kdeprefix +semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep drkonqi)
@@ -27,7 +27,6 @@ RDEPEND="
 	$(add_kdebase_dep keditfiletype)
 	$(add_kdebase_dep kfile)
 	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep khelpcenter)
 	$(add_kdebase_dep kiconfinder)
 	$(add_kdebase_dep kioclient)
 	$(add_kdebase_dep kmimetypefinder)
@@ -47,6 +46,7 @@ RDEPEND="
 	$(add_kdebase_dep solid-hardware)
 	$(add_kdebase_dep solidautoeject)
 	$(add_kdebase_dep soliduiserver)
+	handbook? ( $(add_kdebase_dep khelpcenter) )
 	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
index ee7d022d21a..c4daf24a4f2 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="live"
 KEYWORDS=""
-IUSE="kdeprefix +semantic-desktop"
+IUSE="+handbook kdeprefix +semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep drkonqi)
@@ -27,7 +27,6 @@ RDEPEND="
 	$(add_kdebase_dep keditfiletype)
 	$(add_kdebase_dep kfile)
 	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep khelpcenter)
 	$(add_kdebase_dep kiconfinder)
 	$(add_kdebase_dep kioclient)
 	$(add_kdebase_dep kmimetypefinder)
@@ -45,6 +44,7 @@ RDEPEND="
 	$(add_kdebase_dep plasma-runtime)
 	$(add_kdebase_dep renamedlg-plugins)
 	$(add_kdebase_dep solid-runtime)
+	handbook? ( $(add_kdebase_dep khelpcenter) )
 	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 42a68f30fa1..2da3cfbd009 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -3,8 +3,8 @@ AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa
 AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
 DIST kdelibs-4.3.77.tar.xz 10858972 RMD160 bb50e0e9d8efaaba2819ac6d8345013c2524dfd3 SHA1 82b94d65e63fda1d43b2085e1ca5721b479a3c43 SHA256 dee4d32fa0d7aa1bc3a9cd2721ecc39558deceb23e2deef19ff0dcb034dea4dd
 DIST kdelibs-4.3.80.tar.bz2 12788360 RMD160 20fbfe36881de93a4aca4a0fe2ada9d9bf145a63 SHA1 922018c43e24365660c12eaa2fff49ac7ca725b0 SHA256 520c84e4431af74919fc98ee9c9465259a10775d2471e0d997f3bc4e6ac45432
-EBUILD kdelibs-4.3.77.ebuild 6353 RMD160 565a801091f80011f3c96bd661338ba71759967d SHA1 5ec5bc42d5b0480f736dea3c850e133d8545c43f SHA256 0c9d3cd9b01230c60b9d303365bae3c19ac12a39f15e891b91578203c383900c
-EBUILD kdelibs-4.3.80.ebuild 6412 RMD160 66e2d55b1a86b2cd53c745db28c1a415fb9bfc13 SHA1 1a49a23a3884a6ef827126a6f9107dcaab5b2887 SHA256 7f2e14ea04ff76a0f7d25b53eef52a9a1be086849b769bb9728b9add74d3894a
-EBUILD kdelibs-4.3.9999.ebuild 6243 RMD160 effa95bbbc2cde617a91e4275976871de643cd46 SHA1 a1c9492c8461553657ff40776666525e0c639bf3 SHA256 ef759573630fa57ba5aa8b088e3eb1143c56952b92a5330539b133d99efee00f
-EBUILD kdelibs-9999.ebuild 6363 RMD160 e30b84ec908a36c13ece2d45273eb48f93da0831 SHA1 614e3d7e7f628e6c03029a79dc5ab8ebdac6efbd SHA256 57b0380ff9487aab5e56a16c68ccb89e18f7a8e6143b07c8b4eb296863af8ef7
+EBUILD kdelibs-4.3.77.ebuild 6363 RMD160 6a12f0857e22004590ee4ca480c5487b17abbd07 SHA1 4ddcf40de52dce9f1b0567ebe33807368886aa0a SHA256 e8d69b27e4d7f401295ff6d28db8cc91723d41cb4dbda91d5448bf07267412b7
+EBUILD kdelibs-4.3.80.ebuild 6422 RMD160 1dc15d05b578b50c1b4ceed650350cded31f49ee SHA1 61655c175643de0a953948c23b70e8c57a0e3a5f SHA256 c2ccf6553e1bbd929b9b29c1d2797a9267915decdd56e909658d38204e2bc25a
+EBUILD kdelibs-4.3.9999.ebuild 6253 RMD160 c816f4dda51b7dac956bc83162863d07636bb14d SHA1 158c265fe23acdf9c8770dd1621359a9f8b70d74 SHA256 bc1c466c5da3b6a11a557de59334a7649e2f33dad916d6e1ec06864db24ae4a4
+EBUILD kdelibs-9999.ebuild 6373 RMD160 0b4458ad1b87a847f00f8cf957c41de2fe1cf96e SHA1 1fd05ae7ca1edf36558b4fdfd94a9fe7d6c4fc89 SHA256 40e0bf3d90eb4d660532627fd4dc46110030df2628a643d1c64944d3c8b3843c
 MISC metadata.xml 374 RMD160 18c1efe3720891a6e37eea57b1a3ea5d31353174 SHA1 0a4b4de13c94ad5bcd7e9790f023f0274f979ca0 SHA256 1d1a0ee494881f69a23c3416e04de031e504bb84f0886095668396c7a1a4625a
diff --git a/kde-base/kdelibs/kdelibs-4.3.77.ebuild b/kde-base/kdelibs/kdelibs-4.3.77.ebuild
index cfdb1ad5784..bf549e07184 100644
--- a/kde-base/kdelibs/kdelibs-4.3.77.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.77.ebuild
@@ -93,7 +93,7 @@ RDEPEND="${COMMONDEPEND}
 "
 PDEPEND="
 	$(add_kdebase_dep kde-env)
-	$(add_kdebase_dep kdebase-runtime-meta 'semantic-desktop?')
+	$(add_kdebase_dep kdebase-runtime-meta 'handbook?,semantic-desktop?')
 "
 
 # Blockers added due to packages from old versions, removed in the meanwhile
diff --git a/kde-base/kdelibs/kdelibs-4.3.80.ebuild b/kde-base/kdelibs/kdelibs-4.3.80.ebuild
index d317247faac..721761020da 100644
--- a/kde-base/kdelibs/kdelibs-4.3.80.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.80.ebuild
@@ -94,7 +94,7 @@ RDEPEND="${COMMONDEPEND}
 "
 PDEPEND="
 	$(add_kdebase_dep kde-env)
-	$(add_kdebase_dep kdebase-runtime-meta 'semantic-desktop?')
+	$(add_kdebase_dep kdebase-runtime-meta 'handbook?,semantic-desktop?')
 "
 
 # Blockers added due to packages from old versions, removed in the meanwhile
diff --git a/kde-base/kdelibs/kdelibs-4.3.9999.ebuild b/kde-base/kdelibs/kdelibs-4.3.9999.ebuild
index e6711b4627b..4142e8301b6 100644
--- a/kde-base/kdelibs/kdelibs-4.3.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.9999.ebuild
@@ -87,7 +87,7 @@ RDEPEND="${COMMONDEPEND}
 "
 PDEPEND="
 	$(add_kdebase_dep kde-env)
-	$(add_kdebase_dep kdebase-runtime-meta 'semantic-desktop?')
+	$(add_kdebase_dep kdebase-runtime-meta 'handbook?,semantic-desktop?')
 "
 
 # Blockers added due to packages from old versions, removed in the meanwhile
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 1941a95aa6d..5483dd1fa6a 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -94,7 +94,7 @@ RDEPEND="${COMMONDEPEND}
 "
 PDEPEND="
 	$(add_kdebase_dep kde-env)
-	$(add_kdebase_dep kdebase-runtime-meta 'semantic-desktop?')
+	$(add_kdebase_dep kdebase-runtime-meta 'handbook?,semantic-desktop?')
 "
 
 # Blockers added due to packages from old versions, removed in the meanwhile