From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6E4B2138CD0 for ; Sun, 10 May 2015 15:28:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7683E07D9; Sun, 10 May 2015 15:28:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C3E8E07D9 for ; Sun, 10 May 2015 15:28:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2EDE340FA5 for ; Sun, 10 May 2015 15:28:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C8019CC for ; Sun, 10 May 2015 15:28:00 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1431271658.520f6e8aa88ac33221a93597020e5c0c62d65e11.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 520f6e8aa88ac33221a93597020e5c0c62d65e11 X-VCS-Branch: master Date: Sun, 10 May 2015 15:28:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ad3c6c88-b3d4-413a-a12f-9672bb8329a1 X-Archives-Hash: 5c19c80fd6989b26b8061ada3b58400d commit: 520f6e8aa88ac33221a93597020e5c0c62d65e11 Author: Davide Pesavento gentoo org> AuthorDate: Sun May 10 15:27:38 2015 +0000 Commit: Davide Pesavento gentoo 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 \