Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Sun, 25 Apr 2021 20:53:50
Message-Id: 1619382983.04afc30cc7a44f7ae02f78b6f628e911e2feeca9.asturm@gentoo
1 commit: 04afc30cc7a44f7ae02f78b6f628e911e2feeca9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 17 19:19:25 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 25 20:36:23 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=04afc30c
7
8 qt5-build.eclass: Add eclassdoc for QT5_BUILD_TYPE
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/qt5-build.eclass | 13 ++++++++++---
13 1 file changed, 10 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
16 index 55be9e57..1f2a20cb 100644
17 --- a/eclass/qt5-build.eclass
18 +++ b/eclass/qt5-build.eclass
19 @@ -21,6 +21,16 @@ case ${EAPI} in
20 *) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
21 esac
22
23 +# @ECLASS-VARIABLE: QT5_BUILD_TYPE
24 +# @DESCRIPTION:
25 +# Default value is "release".
26 +# If PV matches "*9999*", this is automatically set to "live".
27 +QT5_BUILD_TYPE=release
28 +if [[ ${PV} = *9999* ]]; then
29 + QT5_BUILD_TYPE=live
30 +fi
31 +readonly QT5_BUILD_TYPE
32 +
33 # @ECLASS-VARIABLE: QT5_MODULE
34 # @PRE_INHERIT
35 # @DESCRIPTION:
36 @@ -67,18 +77,15 @@ case ${PV} in
37 5.15.9999)
38 # KDE upstream for 5.15 patches
39 HOMEPAGE+=" https://invent.kde.org/qt/qt/"
40 - QT5_BUILD_TYPE="live"
41 EGIT_BRANCH="kde/5.15"
42 ;;
43 *)
44 # official stable release
45 - QT5_BUILD_TYPE="release"
46 MY_P=${QT5_MODULE}-everywhere-src-${PV}
47 SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
48 S=${WORKDIR}/${MY_P}
49 ;;
50 esac
51 -readonly QT5_BUILD_TYPE
52
53 EGIT_REPO_URI=( "https://invent.kde.org/qt/qt/${QT5_MODULE}.git" )