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

[Davide Pesavento]

commit:     520f6e8aa88ac33221a93597020e5c0c62d65e11
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 15:27:38 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 10 15:27:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=520f6e8a

[eclass] Sync again.

 eclass/qmake-utils.eclass | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index ff8b352..c2da6d9 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -20,6 +20,8 @@ inherit eutils multilib toolchain-funcs
 # @DESCRIPTION:
 # Echoes the directory where Qt4 binaries are installed.
 qt4_get_bindir() {
+       has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+
        local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
        if [[ -d ${qtbindir} ]]; then
                echo ${qtbindir}
@@ -31,36 +33,42 @@ qt4_get_bindir() {
 # @FUNCTION: qt4_get_headerdir
 # @DESCRIPTION:
 # Echoes the directory where Qt4 headers are installed.
+# Does not take EPREFIX into account.
 qt4_get_headerdir() {
-       echo ${EPREFIX}/usr/include/qt4
+       echo /usr/include/qt4
 }
 
 # @FUNCTION: qt4_get_mkspecsdir
 # @DESCRIPTION:
 # Echoes the directory where Qt4 mkspecs are installed.
+# Does not take EPREFIX into account.
 qt4_get_mkspecsdir() {
-       echo ${EPREFIX}/usr/share/qt4/mkspecs
+       echo /usr/share/qt4/mkspecs
 }
 
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 binaries are installed.
 qt5_get_bindir() {
+       has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+
        echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
 }
 
 # @FUNCTION: qt5_get_headerdir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 headers are installed.
+# Does not take EPREFIX into account.
 qt5_get_headerdir() {
-       echo ${EPREFIX}/usr/include/qt5
+       echo /usr/include/qt5
 }
 
 # @FUNCTION: qt5_get_mkspecsdir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 mkspecs are installed.
+# Does not take EPREFIX into account.
 qt5_get_mkspecsdir() {
-       echo ${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs
+       echo /usr/$(get_libdir)/qt5/mkspecs
 }
 
 # @FUNCTION: qmake-utils_find_pro_file
@@ -252,8 +260,6 @@ eqmake4() {
 eqmake5() {
        debug-print-function ${FUNCNAME} "$@"
 
-       has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
        ebegin "Running qmake"
 
        "$(qt5_get_bindir)"/qmake \