1 |
commit: 3cca528b88b3c2e9bea7a060e7fcfcca8274eb0b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 16 19:58:51 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 3 17:30:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cca528b |
7 |
|
8 |
kde5.eclass: Drop use_if_iuse |
9 |
|
10 |
eclass/kde5.eclass | 12 ++++++------ |
11 |
1 file changed, 6 insertions(+), 6 deletions(-) |
12 |
|
13 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
14 |
index b1a8b064b9b..47988cc5d42 100644 |
15 |
--- a/eclass/kde5.eclass |
16 |
+++ b/eclass/kde5.eclass |
17 |
@@ -506,12 +506,12 @@ kde5_src_prepare() { |
18 |
cmake-utils_src_prepare |
19 |
|
20 |
# only build examples when required |
21 |
- if ! use_if_iuse examples || ! use examples ; then |
22 |
+ if ! (in_iuse examples && use examples) ; then |
23 |
cmake_comment_add_subdirectory examples |
24 |
fi |
25 |
|
26 |
# only enable handbook when required |
27 |
- if ! use_if_iuse handbook ; then |
28 |
+ if in_iuse handbook && ! use handbook ; then |
29 |
cmake_comment_add_subdirectory ${KDE_DOC_DIR} |
30 |
|
31 |
if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then |
32 |
@@ -571,7 +571,7 @@ kde5_src_prepare() { |
33 |
fi |
34 |
|
35 |
# only build unit tests when required |
36 |
- if ! use_if_iuse test ; then |
37 |
+ if ! (in_iuse test && use test) ; then |
38 |
if [[ ${KDE_TEST} = forceoptional ]] ; then |
39 |
punt_bogus_dep Qt5 Test |
40 |
# if forceoptional, also cover non-kde categories |
41 |
@@ -615,7 +615,7 @@ kde5_src_configure() { |
42 |
debug-print-function ${FUNCNAME} "$@" |
43 |
|
44 |
# we rely on cmake-utils.eclass to append -DNDEBUG too |
45 |
- if ! use_if_iuse debug; then |
46 |
+ if in_iuse debug && ! use debug; then |
47 |
append-cppflags -DQT_NO_DEBUG |
48 |
fi |
49 |
|
50 |
@@ -629,11 +629,11 @@ kde5_src_configure() { |
51 |
fi |
52 |
fi |
53 |
|
54 |
- if ! use_if_iuse handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then |
55 |
+ if in_iuse handbook && ! use handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then |
56 |
cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON ) |
57 |
fi |
58 |
|
59 |
- if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then |
60 |
+ if in_iuse designer && ! use designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then |
61 |
cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) |
62 |
fi |