1 |
commit: e6179be59c9a20be9dc0b81757459314544ff42e |
2 |
Author: Andreas K. Huettel <mail <AT> akhuettel <DOT> de> |
3 |
AuthorDate: Thu Mar 10 16:49:20 2011 +0000 |
4 |
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 10 16:49:20 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e6179be5 |
7 |
|
8 |
[eclass] Added updated sanity check for VIRTUALX |
9 |
|
10 |
--- |
11 |
eclass/kde4-base.eclass | 12 +++++++++++- |
12 |
1 files changed, 11 insertions(+), 1 deletions(-) |
13 |
|
14 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
15 |
index 88cfcb7..fa2154c 100644 |
16 |
--- a/eclass/kde4-base.eclass |
17 |
+++ b/eclass/kde4-base.eclass |
18 |
@@ -885,7 +885,17 @@ kde4-base_src_test() { |
19 |
unset DBUS_SESSION_BUS_ADDRESS |
20 |
|
21 |
if [[ ${VIRTUALX_REQUIRED} == always || ${VIRTUALX_REQUIRED} == test ]]; then |
22 |
- VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake |
23 |
+ # check for sanity if anyone already redefined VIRTUALX_COMMAND from the default |
24 |
+ if [[ ${VIRTUALX_COMMAND} != "emake" ]]; then |
25 |
+ # surprise- we are already INSIDE virtualmake!!! |
26 |
+ ewarn "QA Notice: This version of kde4-base.eclass includes the virtualx functionality." |
27 |
+ ewarn " You may NOT set VIRTUALX_COMMAND or call virtualmake from the ebuild." |
28 |
+ ewarn " Setting VIRTUALX_REQUIRED is completely sufficient. See the" |
29 |
+ ewarn " kde4-base.eclass docs for details... Applying workaround." |
30 |
+ cmake-utils_src_test |
31 |
+ else |
32 |
+ VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake |
33 |
+ fi |
34 |
else |
35 |
cmake-utils_src_test |
36 |
fi |