Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Wed, 04 Nov 2015 17:23:40
Message-Id: 1446657774.a987517f8c83ba8028d8dae005f11b0466a32a55.kensington@gentoo
1 commit: a987517f8c83ba8028d8dae005f11b0466a32a55
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 4 17:20:02 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 4 17:22:54 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a987517f
7
8 kde5.eclass: introduce "forceoptional" value for KDE_HANDBOOK
9
10 eclass/kde5.eclass | 10 +++++++++-
11 1 file changed, 9 insertions(+), 1 deletion(-)
12
13 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
14 index 315779f..4ddcea7 100644
15 --- a/eclass/kde5.eclass
16 +++ b/eclass/kde5.eclass
17 @@ -80,6 +80,8 @@ fi
18 # If set to "false", do nothing.
19 # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and
20 # generate and install KDE handbook.
21 +# If set to "forceoptional", remove a KF5DocTools dependency from the root
22 +# CMakeLists.txt in addition to the above.
23 : ${KDE_HANDBOOK:=false}
24
25 # @ECLASS-VARIABLE: KDE_DOC_DIR
26 @@ -471,7 +473,7 @@ kde5_src_prepare() {
27 popd > /dev/null || die
28 fi
29
30 - if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
31 + if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
32 pushd ${KDE_DOC_DIR} > /dev/null || die
33 for lang in *; do
34 if ! has ${lang} ${LINGUAS} ; then
35 @@ -511,6 +513,12 @@ kde5_src_prepare() {
36 ;;
37 esac
38
39 + if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
40 + if ! use_if_iuse handbook ; then
41 + punt_bogus_dep KF5 DocTools
42 + fi
43 + fi
44 +
45 cmake-utils_src_prepare
46 }