1 |
commit: 393fa008998e17fc523a66bf27d23b35ef136cfa |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 9 02:16:48 2021 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 9 02:16:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=393fa008 |
7 |
|
8 |
qt5-build.eclass: sync with gentoo.git |
9 |
|
10 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
11 |
|
12 |
eclass/qt5-build.eclass | 10 +++++----- |
13 |
1 file changed, 5 insertions(+), 5 deletions(-) |
14 |
|
15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
16 |
index dbbba44e..0b2b5518 100644 |
17 |
--- a/eclass/qt5-build.eclass |
18 |
+++ b/eclass/qt5-build.eclass |
19 |
@@ -10,15 +10,14 @@ |
20 |
# @BLURB: Eclass for Qt5 split ebuilds. |
21 |
# @DESCRIPTION: |
22 |
# This eclass contains various functions that are used when building Qt5. |
23 |
-# Requires EAPI 7. |
24 |
|
25 |
if [[ ${CATEGORY} != dev-qt ]]; then |
26 |
- die "qt5-build.eclass is only to be used for building Qt 5" |
27 |
+ die "${ECLASS} is only to be used for building Qt 5" |
28 |
fi |
29 |
|
30 |
case ${EAPI} in |
31 |
- 7) : ;; |
32 |
- *) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;; |
33 |
+ 7) ;; |
34 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
35 |
esac |
36 |
|
37 |
# @ECLASS-VARIABLE: QT5_BUILD_TYPE |
38 |
@@ -26,7 +25,7 @@ esac |
39 |
# Default value is "release". |
40 |
# If PV matches "*9999*", this is automatically set to "live". |
41 |
QT5_BUILD_TYPE=release |
42 |
-if [[ ${PV} = *9999* ]]; then |
43 |
+if [[ ${PV} == *9999* ]]; then |
44 |
QT5_BUILD_TYPE=live |
45 |
fi |
46 |
readonly QT5_BUILD_TYPE |
47 |
@@ -68,6 +67,7 @@ _QT5_P=${QT5_MODULE}-everywhere-src-${PV} |
48 |
# system to obtain the global qmodule.pri file. |
49 |
|
50 |
# @ECLASS-VARIABLE: VIRTUALX_REQUIRED |
51 |
+# @PRE_INHERIT |
52 |
# @DESCRIPTION: |
53 |
# For proper description see virtualx.eclass man page. |
54 |
# Here we redefine default value to be manual, if your package needs virtualx |