[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     03484f8df11f36983d7a00409b0b42f326355806
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 17:20:02 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 17:18:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03484f8d

kde5.eclass: introduce "forceoptional" value for KDE_HANDBOOK

 eclass/kde5.eclass | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e76a969..7a5d222 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -80,6 +80,8 @@ fi
 # If set to "false", do nothing.
 # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and
 # generate and install KDE handbook.
+# If set to "forceoptional", remove a KF5DocTools dependency from the root
+# CMakeLists.txt in addition to the above.
 : ${KDE_HANDBOOK:=false}
 
 # @ECLASS-VARIABLE: KDE_DOC_DIR
@@ -418,7 +420,7 @@ kde5_src_prepare() {
                        popd > /dev/null || die
                fi
 
-               if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} && 
${CATEGORY} != kde-apps ]] ; then
+               if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && 
${CATEGORY} != kde-apps ]] ; then
                        pushd ${KDE_DOC_DIR} > /dev/null || die
                        for lang in *; do
                                if ! has ${lang} ${LINGUAS} ; then
@@ -458,6 +460,12 @@ kde5_src_prepare() {
                        ;;
        esac
 
+       if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
+               if ! use_if_iuse handbook ; then
+                       punt_bogus_dep KF5 DocTools
+               fi
+       fi
+
        cmake-utils_src_prepare
 }