commit: b30c3b5c81c723a8e705b05e4fef476011783c07
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun May 15 09:03:57 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May 19 14:16:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30c3b5c
kde4-base.eclass: Add exceptions to USE=+handbook
kde-apps/kcontrol and kde-apps/knetattach also collide with slot 5.
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
eclass/kde4-base.eclass | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 050f0c4..2d761f8 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -160,7 +160,7 @@ KDE_HANDBOOK="${KDE_HANDBOOK:-never}"
# translations. (Mostly all kde ebuilds does not ship documentation
# and translations in live ebuilds)
if [[ ${KDE_BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
- # Kdebase actualy provides the handbooks even for live stuff
+ # Kdebase actually provides the handbooks even for live stuff
[[ ${KDEBASE} == kde-base ]] || KDE_HANDBOOK=never
KDE_LINGUAS=""
fi
@@ -358,11 +358,14 @@ case ${KDE_HANDBOOK} in
[[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}"
;;
optional)
- if [[ ${PN} == kdesu ]] ; then
- IUSE+=" handbook"
- else
- IUSE+=" +handbook"
- fi
+ case ${PN} in
+ kcontrol | kdesu | knetattach)
+ _IUSE+=" handbook"
+ ;;
+ *)
+ IUSE+=" +handbook"
+ ;;
+ esac
kdedepend+=" handbook? ( ${kdehandbookdepend} )"
[[ ${PN} != kdelibs ]] && kderdepend+=" handbook? (
${kdehandbookrdepend} )"
;;
