summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2010-01-14 21:15:22 +0000
committerJonathan Callen <jcallen@gentoo.org>2010-01-14 21:15:22 +0000
commited9a46bcfb3e415c3458e5f6df10b130d1ba1267 (patch)
tree646fe725617e3612a4e784993b7d8300a76c0a07 /eclass
parentamd64/x86 stable, bug #299037 (diff)
downloadhistorical-ed9a46bcfb3e415c3458e5f6df10b130d1ba1267.tar.gz
historical-ed9a46bcfb3e415c3458e5f6df10b130d1ba1267.tar.bz2
historical-ed9a46bcfb3e415c3458e5f6df10b130d1ba1267.zip
Add EAPI=3 & prefix support to qt4.eclass
Diffstat (limited to 'eclass')
-rw-r--r--eclass/qt4.eclass12
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)