diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-10 13:22:11 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-10 13:22:11 +0100 |
| commit | 5c7c9e11ad54ae892b44451b3dcdb727fb26d86c (patch) | |
| tree | 9439981945f44022ebe6840a79f0a0b0d5147b9c /eclass | |
| parent | ed43e8d092296a284482621df400c3943741e994 (diff) | |
| download | kde-5c7c9e11ad54ae892b44451b3dcdb727fb26d86c.tar.gz kde-5c7c9e11ad54ae892b44451b3dcdb727fb26d86c.tar.bz2 kde-5c7c9e11ad54ae892b44451b3dcdb727fb26d86c.zip | |
Fixup virtualx.eclass usage in both ebuilds and eclass.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 829061e27b5..a1ee468d0de 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -15,15 +15,9 @@ # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: -# Do we need an X server? Valid values are "always", "optional", and "manual". -# "tests" is a synonym for "optional". While virtualx.eclass supports in principle -# also the use of an X server during other ebuild phases, we only use it in -# src_test here. Most likely you'll want to set "optional", which introduces the -# use-flag "test" (if not already present), adds dependencies conditional on that -# use-flag, and automatically runs (only) the ebuild test phase with a virtual X server -# present. This makes things a lot more comfortable than the bare virtualx eclass. - -# In case the variable is not set in the ebuild, let virtualx eclass not do anything +# For proper description see virtualx.eclass manpage. +# Here we redefine default value to be manual, if your package needs virtualx +# for tests you should proceed with setting VIRTUALX_REQUIRED=test. : ${VIRTUALX_REQUIRED:=manual} inherit kde4-functions base virtualx eutils @@ -891,17 +885,8 @@ kde4-base_src_test() { unset DBUS_SESSION_BUS_ADDRESS if [[ ${VIRTUALX_REQUIRED} == always ]] || - ( [[ ${VIRTUALX_REQUIRED} != manual ]] && use test ); then - - if [[ ${maketype} ]]; then - # surprise- we are already INSIDE virtualmake!!! - ewarn "QA Notice: This version of kde4-base.eclass includes the virtualx functionality." - ewarn " You may NOT set maketype or call virtualmake from the ebuild. Applying workaround." - cmake-utils_src_test - else - export maketype="cmake-utils_src_test" - virtualmake - fi + ( [[ ${VIRTUALX_REQUIRED} != manual ]] && use test ); then + VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake else cmake-utils_src_test fi |