Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Mon, 28 Dec 2015 01:42:08
Message-Id: 1451265513.79c446995b8aaacc6e14116763c9bb92dfe2d175.pesa@gentoo
1 commit: 79c446995b8aaacc6e14116763c9bb92dfe2d175
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 28 01:18:33 2015 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 28 01:18:33 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=79c44699
7
8 qt5-build.eclass: move VIRTUALX_REQUIRED definition before inherit
9
10 Otherwise it has no effect.
11
12 eclass/qt5-build.eclass | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
16 index 9eb17b3..d30cb98 100644
17 --- a/eclass/qt5-build.eclass
18 +++ b/eclass/qt5-build.eclass
19 @@ -17,6 +17,13 @@ case ${EAPI} in
20 *) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
21 esac
22
23 +# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
24 +# @DESCRIPTION:
25 +# For proper description see virtualx.eclass man page.
26 +# Here we redefine default value to be manual, if your package needs virtualx
27 +# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
28 +: ${VIRTUALX_REQUIRED:=manual}
29 +
30 [[ ${EAPI} == 5 ]] && inherit multilib
31 inherit eutils flag-o-matic toolchain-funcs versionator virtualx
32
33 @@ -130,13 +137,6 @@ esac
34 # definitions, which are then merged together with all other Qt5 packages
35 # installed on the system to obtain the global qconfig.{h,pri} files.
36
37 -# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
38 -# @DESCRIPTION:
39 -# For proper description see virtualx.eclass man page.
40 -# Here we redefine default value to be manual, if your package needs virtualx
41 -# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
42 -: ${VIRTUALX_REQUIRED:=manual}
43 -
44
45 ###### Phase functions ######