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

[Davide Pesavento]

commit:     822004baf837315f4dede14a54df286a21cf4067
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Aug 31 06:59:20 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 06:59:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=822004ba

[qt5-build.eclass] Updates for Qt 5.0.0-beta1.

---
 eclass/qt5-build.eclass |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a513854..d13cb37 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -40,14 +40,13 @@ case ${PN#qt-} in
 esac
 case ${QT5_BUILD_TYPE} in
 	live)
+		MY_P=${P}
 		EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
 			https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
 		;;
 	release)
-		MY_PN="qt-everywhere-opensource-src"
-		MY_P=${MY_PN}-${PV/_/-}
-		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/beta-snapshots/latest/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_PN}-${PV%%_*}/${EGIT_PROJECT}
+		MY_P=${EGIT_PROJECT}-opensource-src-${PV/_/-}
+		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/${PV#*_}/split_sources/${MY_P}.tar.xz"
 		;;
 esac
 
@@ -64,6 +63,8 @@ if [[ ${PN} != "qt-test" ]]; then
 	DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )"
 fi
 
+S=${WORKDIR}/${MY_P}
+
 # @ECLASS-VARIABLE: PATCHES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -88,7 +89,7 @@ fi
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-: ${QT5_BUILD_DIR:=${WORKDIR}/${P}_build}
+: ${QT5_BUILD_DIR:=${WORKDIR}/${MY_P}_build}
 
 # @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
 # @DESCRIPTION: