diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2010-01-14 21:15:22 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2010-01-14 21:15:22 +0000 |
| commit | 5654fda58e09f797fd8532b6441183e075833a19 (patch) | |
| tree | 5babfbd169a117cb80ba2f1b7ec1b7b76583114d | |
| parent | amd64/x86 stable, bug #299037 (diff) | |
| download | gentoo-2-5654fda58e09f797fd8532b6441183e075833a19.tar.gz gentoo-2-5654fda58e09f797fd8532b6441183e075833a19.tar.bz2 gentoo-2-5654fda58e09f797fd8532b6441183e075833a19.zip | |
Add EAPI=3 & prefix support to qt4.eclass
| -rw-r--r-- | eclass/qt4.eclass | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/eclass/qt4.eclass b/eclass/qt4.eclass index 47255f4616eb..5d55931ea565 100644 --- a/eclass/qt4.eclass +++ b/eclass/qt4.eclass @@ -1,6 +1,6 @@ # Copyright 2005-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.60 2009/11/21 11:44:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.61 2010/01/14 21:15:22 abcd Exp $ # @ECLASS: qt4.eclass # @MAINTAINER: @@ -203,6 +203,8 @@ qt4_src_prepare() { # right arguments on every directory specified inside the top-level # project file by the SUBDIRS variable. eqmake4() { + has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= + local projectfile="${1:-${PN}.pro}" shift @@ -264,9 +266,9 @@ eqmake4() { fi done < <(find "$(dirname "${projectfile}")" -type f -name "*.pr[io]" 2>/dev/null) - /usr/bin/qmake -makefile -nocache \ - QTDIR=/usr/$(get_libdir) \ - QMAKE=/usr/bin/qmake \ + "${EPREFIX}"/usr/bin/qmake -makefile -nocache \ + QTDIR="${EPREFIX}"/usr/$(get_libdir) \ + QMAKE="${EPREFIX}"/usr/bin/qmake \ QMAKE_CC=$(tc-getCC) \ QMAKE_CXX=$(tc-getCXX) \ QMAKE_LINK=$(tc-getCXX) \ @@ -294,7 +296,7 @@ eqmake4() { } case ${EAPI:-0} in - 2) + 2|3) EXPORT_FUNCTIONS pkg_setup src_prepare ;; 0|1) |