From ad6685fde299cc87b6d52950e628ffb612b3b6e9 Mon Sep 17 00:00:00 2001 From: Ingmar Vanhassel Date: Thu, 15 May 2008 12:33:53 +0000 Subject: qt4-build.eclass: Eclass changes for Qt 4.4.0. --- eclass/qt4-build.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'eclass') diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 082c702281f7..39aa762476a3 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 2007-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.12 2008/04/14 21:51:15 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.13 2008/05/15 12:33:53 ingmar Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -33,7 +33,7 @@ S=${WORKDIR}/${MY_P} SRC_URI="ftp://ftp.trolltech.com/qt/source/${MY_P}.tar.bz2" case "${PV}" in - 4.4.0_rc*) + 4.4.0|4.4.0_rc*) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;; *) @@ -69,7 +69,7 @@ qt4_unpack() { local target targets for target in configure LICENSE.{GPL2,GPL3,QPL} projects.pro \ src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ - ${QT4_EXTRACT_DIRECTORIES} ${QT4_TARGET_DIRECTORIES}; do + ${QT4_EXTRACT_DIRECTORIES}; do targets="${targets} ${MY_P}/${target}" done @@ -77,7 +77,7 @@ qt4_unpack() { tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets} case "${PV}" in - 4.4.0_rc*) + 4.4.0|4.4.0_rc*) echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2 tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2 ;; -- cgit v1.2.3-65-gdbad