Gentoo Archives: gentoo-commits

From:	Davide Pesavento <pesa@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/qt:master commit in: eclass/
Date:	Mon, 09 Jun 2014 20:39:16
Message-Id:	`1402346282.394586c3d4717c1abb6cfde3322c3b0554e41295.pesa@gentoo`

1	commit: 394586c3d4717c1abb6cfde3322c3b0554e41295
2	Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3	AuthorDate: Mon Jun 9 20:38:02 2014 +0000
4	Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5	CommitDate: Mon Jun 9 20:38:02 2014 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=394586c3
7
8	[qt5-build.eclass] Adapt to new branching scheme (stable -> 5.x)
9
10	---
11	eclass/qt5-build.eclass \| 7 +++----
12	1 file changed, 3 insertions(+), 4 deletions(-)
13
14	diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
15	index b017b7d..99ba8df 100644
16	--- a/eclass/qt5-build.eclass
17	+++ b/eclass/qt5-build.eclass
18	@@ -38,20 +38,19 @@ case ${PV} in
19	5.?.9999)
20	# git stable branch
21	QT5_BUILD_TYPE="live"
22	- EGIT_BRANCH="stable"
23	+ EGIT_BRANCH=${PV%.9999}
24	;;
25	_alpha\|_beta\|_rc)
26	# pre-releases
27	QT5_BUILD_TYPE="release"
28	- MY_PV="${PV/rc/RC}"
29	- MY_P="${QT5_MODULE}-opensource-src-${MY_PV/_/-}"
30	+ MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
31	SRC_URI="http://download.qt-project.org/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
32	S=${WORKDIR}/${MY_P}
33	;;
34	*)
35	# official stable releases
36	QT5_BUILD_TYPE="release"
37	- MY_P="${QT5_MODULE}-opensource-src-${PV}"
38	+ MY_P=${QT5_MODULE}-opensource-src-${PV}
39	SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
40	S=${WORKDIR}/${MY_P}
41	;;