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

[Davide Pesavento]

commit:     8d7f7f9428e4ccddf0defc051c7067d509fefcdb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 19 17:58:15 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 19 17:58:15 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8d7f7f94

[qt5-build.eclass] Add workaround for bug 497312.

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

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0765c60..988eea1 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -103,7 +103,10 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare 
src_configure src_compile src_
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-: ${QT5_BUILD_DIR:=${S}_build}
+case ${QT5_BUILD_TYPE} in
+       live)    : ${QT5_BUILD_DIR:=${S}_build} ;;
+       release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
+esac
 
 # @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
 # @DESCRIPTION:
@@ -169,12 +172,8 @@ qt5-build_src_unpack() {
        fi
 
        case ${QT5_BUILD_TYPE} in
-               live)
-                       git-r3_src_unpack
-                       ;;
-               release)
-                       default
-                       ;;
+               live)    git-r3_src_unpack ;;
+               release) default ;;
        esac
 }