| 1 |
commit: 5fe4b852ed90c8fc137386b5e0c8d3dff47f212e |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Nov 22 15:15:16 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 22 15:53:47 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5fe4b852 |
| 7 |
|
| 8 |
kde5.eclass: Extend KDE_TEST=forceoptional functionality, simplify |
| 9 |
|
| 10 |
If KDE_TEST=forceoptional, it makes sense to disable test subdirs also |
| 11 |
outside KDE categories. No change for misc ebuilds using kde5.eclass. |
| 12 |
|
| 13 |
eclass/kde5.eclass | 35 ++++++++++++++++------------------- |
| 14 |
1 file changed, 16 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 17 |
index 4253da9..ae5f394 100644 |
| 18 |
--- a/eclass/kde5.eclass |
| 19 |
+++ b/eclass/kde5.eclass |
| 20 |
@@ -455,6 +455,10 @@ kde5_src_prepare() { |
| 21 |
# only enable handbook when required |
| 22 |
if ! use_if_iuse handbook ; then |
| 23 |
comment_add_subdirectory ${KDE_DOC_DIR} |
| 24 |
+ |
| 25 |
+ if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then |
| 26 |
+ punt_bogus_dep KF5 DocTools |
| 27 |
+ fi |
| 28 |
fi |
| 29 |
|
| 30 |
# enable only the requested translations |
| 31 |
@@ -488,21 +492,11 @@ kde5_src_prepare() { |
| 32 |
rm -rf po |
| 33 |
fi |
| 34 |
|
| 35 |
- # in frameworks, tests = manual tests so never |
| 36 |
- # build them |
| 37 |
+ # in frameworks, tests = manual tests so never build them |
| 38 |
if [[ ${CATEGORY} = kde-frameworks ]]; then |
| 39 |
comment_add_subdirectory tests |
| 40 |
fi |
| 41 |
|
| 42 |
- if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then |
| 43 |
- # only build unit tests when required |
| 44 |
- if ! use_if_iuse test ; then |
| 45 |
- comment_add_subdirectory autotests |
| 46 |
- comment_add_subdirectory test |
| 47 |
- comment_add_subdirectory tests |
| 48 |
- fi |
| 49 |
- fi |
| 50 |
- |
| 51 |
case ${KDE_PUNT_BOGUS_DEPS} in |
| 52 |
false) ;; |
| 53 |
*) |
| 54 |
@@ -515,15 +509,18 @@ kde5_src_prepare() { |
| 55 |
;; |
| 56 |
esac |
| 57 |
|
| 58 |
- if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then |
| 59 |
- if ! use_if_iuse handbook ; then |
| 60 |
- punt_bogus_dep KF5 DocTools |
| 61 |
- fi |
| 62 |
- fi |
| 63 |
- |
| 64 |
- if [[ ${KDE_TEST} = forceoptional ]] ; then |
| 65 |
- if ! use_if_iuse test ; then |
| 66 |
+ # only build unit tests when required |
| 67 |
+ if ! use_if_iuse test ; then |
| 68 |
+ if [[ ${KDE_TEST} = forceoptional ]] ; then |
| 69 |
punt_bogus_dep Qt5 Test |
| 70 |
+ # if forceoptional, also cover non-kde categories |
| 71 |
+ comment_add_subdirectory autotests |
| 72 |
+ comment_add_subdirectory test |
| 73 |
+ comment_add_subdirectory tests |
| 74 |
+ elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then |
| 75 |
+ comment_add_subdirectory autotests |
| 76 |
+ comment_add_subdirectory test |
| 77 |
+ comment_add_subdirectory tests |
| 78 |
fi |
| 79 |
fi |
Archives