Gentoo Archives: gentoo-commits

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