Gentoo Archives: gentoo-commits

From:	Jimi Huotari <chiitoo@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/qt:master commit in: eclass/
Date:	Sat, 09 Dec 2017 11:55:20
Message-Id:	`1512820171.12a98e5265ea65c6e604eb1a0d8cf7d78cfc8589.chiitoo@gentoo`

1	commit: 12a98e5265ea65c6e604eb1a0d8cf7d78cfc8589
2	Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3	AuthorDate: Sat Dec 9 11:49:31 2017 +0000
4	Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
5	CommitDate: Sat Dec 9 11:49:31 2017 +0000
6	URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=12a98e52
7
8	qt5-build.eclass: add support for 5.10 URIs
9
10	eclass/qt5-build.eclass \| 16 ++++++++++++++--
11	1 file changed, 14 insertions(+), 2 deletions(-)
12
13	diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
14	index 7462ab20..8728acc2 100644
15	--- a/eclass/qt5-build.eclass
16	+++ b/eclass/qt5-build.eclass
17	@@ -73,14 +73,26 @@ case ${PV} in
18	_alpha\|_beta\|_rc)
19	# development release
20	QT5_BUILD_TYPE="release"
21	- MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
22	+
23	+ if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
24	+ MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
25	+ else
26	+ MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
27	+ fi
28	+
29	SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
30	S=${WORKDIR}/${MY_P}
31	;;
32	*)
33	# official stable release
34	QT5_BUILD_TYPE="release"
35	- MY_P=${QT5_MODULE}-opensource-src-${PV}
36	+
37	+ if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
38	+ MY_P=${QT5_MODULE}-everywhere-src-${PV}
39	+ else
40	+ MY_P=${QT5_MODULE}-opensource-src-${PV}
41	+ fi
42	+
43	SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
44	S=${WORKDIR}/${MY_P}
45	;;