[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     394586c3d4717c1abb6cfde3322c3b0554e41295
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  9 20:38:02 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun  9 20:38:02 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=394586c3

[qt5-build.eclass] Adapt to new branching scheme (stable -> 5.x)

---
 eclass/qt5-build.eclass | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b017b7d..99ba8df 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -38,20 +38,19 @@ case ${PV} in
        5.?.9999)
                # git stable branch
                QT5_BUILD_TYPE="live"
-               EGIT_BRANCH="stable"
+               EGIT_BRANCH=${PV%.9999}
                ;;
        *_alpha*|*_beta*|*_rc*)
                # pre-releases
                QT5_BUILD_TYPE="release"
-               MY_PV="${PV/rc/RC}"
-               MY_P="${QT5_MODULE}-opensource-src-${MY_PV/_/-}"
+               MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
                
SRC_URI="http://download.qt-project.org/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz";
                S=${WORKDIR}/${MY_P}
                ;;
        *)
                # official stable releases
                QT5_BUILD_TYPE="release"
-               MY_P="${QT5_MODULE}-opensource-src-${PV}"
+               MY_P=${QT5_MODULE}-opensource-src-${PV}
                
SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz";
                S=${WORKDIR}/${MY_P}
                ;;