1 |
commit: a28709efa9b879c54517fe302980260ec9c7848c |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 8 14:57:46 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 8 16:48:22 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a28709ef |
7 |
|
8 |
kde5.eclass: Fix KDE_QTHELP, switch USE=qthelp -> doc |
9 |
|
10 |
eclass/kde5.eclass | 23 ++++++++++++----------- |
11 |
1 file changed, 12 insertions(+), 11 deletions(-) |
12 |
|
13 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
14 |
index e5e5fb2400..b4cfadc9df 100644 |
15 |
--- a/eclass/kde5.eclass |
16 |
+++ b/eclass/kde5.eclass |
17 |
@@ -82,10 +82,13 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_ |
18 |
# @ECLASS-VARIABLE: KDE_QTHELP |
19 |
# @DESCRIPTION: |
20 |
# If set to "false", do nothing. |
21 |
-# Otherwise, add "+qthelp" to IUSE, add the appropriate dependency, and |
22 |
-# generate and install Qt compressed help files. |
23 |
-# If set to "optional", config with -DBUILD_QCH=ON when USE=qthelp. |
24 |
-: ${KDE_QTHELP:=false} |
25 |
+# Otherwise, add "doc" to IUSE, add the appropriate dependency, generate |
26 |
+# and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc. |
27 |
+if [[ ${CATEGORY} = kde-frameworks && ( $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ) ]]; then |
28 |
+ : ${KDE_QTHELP:=true} |
29 |
+else |
30 |
+ : ${KDE_QTHELP:=false} |
31 |
+fi |
32 |
|
33 |
# @ECLASS-VARIABLE: KDE_TEST |
34 |
# @DESCRIPTION: |
35 |
@@ -152,8 +155,6 @@ SLOT=5 |
36 |
|
37 |
if [[ ${CATEGORY} = kde-frameworks ]]; then |
38 |
KDE_SUBSLOT=true |
39 |
- [[ $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ]] && \ |
40 |
- KDE_QTHELP=true |
41 |
fi |
42 |
|
43 |
case ${KDE_SUBSLOT} in |
44 |
@@ -236,9 +237,9 @@ esac |
45 |
case ${KDE_QTHELP} in |
46 |
false) ;; |
47 |
*) |
48 |
- IUSE+=" +qthelp" |
49 |
- COMMONDEPEND+=" qthelp? ( $(add_qt_dep qt-docs) )" |
50 |
- DEPEND+=" qthelp? ( |
51 |
+ IUSE+=" doc" |
52 |
+ COMMONDEPEND+=" doc? ( $(add_qt_dep qt-docs) )" |
53 |
+ DEPEND+=" doc? ( |
54 |
$(add_qt_dep qthelp) |
55 |
>=app-doc/doxygen-1.8.13-r1 |
56 |
)" |
57 |
@@ -669,8 +670,8 @@ kde5_src_configure() { |
58 |
cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) |
59 |
fi |
60 |
|
61 |
- if use_if_iuse qthelp ; then |
62 |
- cmakeargs+=( -DBUILD_QCH=ON ) |
63 |
+ if [[ ${KDE_QTHELP} != false ]]; then |
64 |
+ cmakeargs+=( -DBUILD_QCH=$(usex doc) ) |
65 |
fi |
66 |
|
67 |
# install mkspecs in the same directory as qt stuff |