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: 1619383047.18c5657a35a360c69942bd8fcfcfcdb57a2e1572.asturm@gentoo
1 commit: 18c5657a35a360c69942bd8fcfcfcdb57a2e1572
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 17 19:13:26 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 25 20:37:27 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=18c5657a
7
8 qt5-build.eclass: Rename MY_P to _QT5_P and fix eclassdoc warning
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/qt5-build.eclass | 12 +++++++++---
13 1 file changed, 9 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
16 index 1f2a20cb..dbbba44e 100644
17 --- a/eclass/qt5-build.eclass
18 +++ b/eclass/qt5-build.eclass
19 @@ -38,6 +38,13 @@ readonly QT5_BUILD_TYPE
20 # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
21 : ${QT5_MODULE:=${PN}}
22
23 +# @ECLASS-VARIABLE: _QT5_P
24 +# @INTERNAL
25 +# @DESCRIPTION:
26 +# The upstream package name of the module this package belongs to.
27 +# Used for SRC_URI and S.
28 +_QT5_P=${QT5_MODULE}-everywhere-src-${PV}
29 +
30 # @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
31 # @DEFAULT_UNSET
32 # @DESCRIPTION:
33 @@ -81,9 +88,8 @@ case ${PV} in
34 ;;
35 *)
36 # official stable release
37 - MY_P=${QT5_MODULE}-everywhere-src-${PV}
38 - SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
39 - S=${WORKDIR}/${MY_P}
40 + SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz"
41 + S=${WORKDIR}/${_QT5_P}
42 ;;
43 esac